October 2018 - Wine-commits

Francois Gouget : testbot: Adopt the missions syntax for Reconfig.pl.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: tools Branch: master Commit: e0cfdc0c5df9dba373b8342b92f36d43c68ab07e URL: https://source.winehq.org/git/tools.git/?a=commit;h=e0cfdc0c5df9dba373b8342… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 03:05:28 2018 +0200 testbot: Adopt the missions syntax for Reconfig.pl. This makes it possible to specify the mission options on the command line if necessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 62 ++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f2d63fa..8e50e2f 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -42,6 +42,7 @@ sub BEGIN use Build::Utils; use WineTestBot::Config; +use WineTestBot::Missions; # @@ -81,9 +82,9 @@ sub BuildNative($) sub BuildCross($$$) { - my ($Targets, $NoRm, $Build) = @_; + my ($TaskMissions, $NoRm, $Build) = @_; - return 1 if (!$Targets->{$Build}); + return 1 if (!$TaskMissions->{Builds}->{$Build}); # FIXME Temporary code to ensure compatibility during the transition my $OldDir = $Build eq "exe32" ? "build-mingw32" : "build-mingw64"; if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") @@ -113,11 +114,11 @@ sub BuildCross($$$) sub UpdateWineBuilds($$) { - my ($Targets, $NoRm) = @_; + my ($TaskMissions, $NoRm) = @_; return BuildNative($NoRm) && - BuildCross($Targets, $NoRm, "exe32") && - BuildCross($Targets, $NoRm, "exe64"); + BuildCross($TaskMissions, $NoRm, "exe32") && + BuildCross($TaskMissions, $NoRm, "exe64"); } @@ -128,10 +129,7 @@ sub UpdateWineBuilds($$) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -my %AllTargets; -map { $AllTargets{$_} = 1 } qw(exe32 exe64); - -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $TargetList); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); while (@ARGV) { my $Arg = shift @ARGV; @@ -158,9 +156,9 @@ while (@ARGV) $Usage = 2; last; } - elsif (!defined $TargetList) + elsif (!defined $MissionStatement) { - $TargetList = $Arg; + $MissionStatement = $Arg; } else { @@ -171,23 +169,33 @@ while (@ARGV) } # Check and untaint parameters -my $Targets; +my $TaskMissions; if (!defined $Usage) { if (!$OptUpdate and !$OptBuild) { $OptUpdate = $OptBuild = 1; } - $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /,/, $TargetList) + $MissionStatement ||= "exe32:exe64"; + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $Usage = 2; + } + elsif (!@$Missions) + { + Error "Empty mission statement\n"; + $Usage = 2; + } + elsif (@$Missions > 1) + { + Error "Cannot specify missions for multiple tasks\n"; + $Usage = 2; + } + else { - if (!$AllTargets{$Target}) - { - Error "invalid target name $Target\n"; - $Usage = 2; - last; - } - $Targets->{$Target} = 1; + $TaskMissions = $Missions->[0]; } } if (defined $Usage) @@ -198,17 +206,17 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--update] [--build [--no-rm]] [--help] [TARGETS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--help] [MISSIONS]\n"; print "\n"; print "Updates Wine to the latest version and recompiles it so the host is ready to build executables for the Windows tests.\n"; print "\n"; print "Where:\n"; print " --update Update Wine's source code.\n"; print " --build Update the Wine builds.\n"; - print " TARGETS Is a comma-separated list of reconfiguration targets. By default\n"; - print " every target is run.\n"; - print " - exe32: Rebuild the 32 bit Windows test executables.\n"; - print " - exe64: Rebuild the 64 bit Windows test executables.\n"; + print " MISSIONS Is a colon-separated list of missions. By default the following\n"; + print " missions are run.\n"; + print " - exe32: Build the 32 bit Windows test executables.\n"; + print " - exe64: Build the 64 bit Windows test executables.\n"; print " --no-rm Don't rebuild from scratch.\n"; print " --help Shows this usage message.\n"; exit 0; @@ -233,7 +241,7 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") exit(1) if (!BuildNativeTestAgentd() or !BuildWindowsTestAgentd()); exit(1) if (!BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); -exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); LogMsg "ok\n"; exit;

1 0

Francois Gouget : testbot: Adopt the missions syntax for WineReconfig.pl.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: tools Branch: master Commit: 79b14119076c211fef634e5dfd752b9f5e7c5da2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79b14119076c211fef634e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 03:05:20 2018 +0200 testbot: Adopt the missions syntax for WineReconfig.pl. This makes it possible to specify the mission options on the command line if necessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 72 ++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 63d72e8..74fe4ea 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -42,6 +42,7 @@ use File::Path; use Build::Utils; use WineTestBot::Config; +use WineTestBot::Missions; # @@ -50,9 +51,9 @@ use WineTestBot::Config; sub BuildWine($$$$) { - my ($Targets, $NoRm, $Build, $Extras) = @_; + my ($TaskMissions, $NoRm, $Build, $Extras) = @_; - return 1 if (!$Targets->{$Build}); + return 1 if (!$TaskMissions->{Builds}->{$Build}); # FIXME Temporary code to ensure compatibility during the transition my $OldDir = "build-$Build"; if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") @@ -82,11 +83,11 @@ sub BuildWine($$$$) sub UpdateWineBuilds($$) { - my ($Targets, $NoRm) = @_; + my ($TaskMissions, $NoRm) = @_; - return BuildWine($Targets, $NoRm, "win32", "") && - BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && - BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); + return BuildWine($TaskMissions, $NoRm, "win32", "") && + BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && + BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); } @@ -96,7 +97,7 @@ sub UpdateWineBuilds($$) sub UpdateWinePrefixes($) { - my ($Targets) = @_; + my ($TaskMissions) = @_; # Make sure no obsolete wineprefix is left behind in case WineReconfig # is called with a different set of targets @@ -113,7 +114,7 @@ sub UpdateWinePrefixes($) # time. Note that this requires using a different wineprefix for each build. foreach my $Build ("win32", "wow64", "wow32") { - next if (!$Targets->{$Build}); + next if (!$TaskMissions->{Builds}->{$Build}); # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. @@ -136,10 +137,7 @@ sub UpdateWinePrefixes($) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -my %AllTargets; -map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); - -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $TargetList); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) { my $Arg = shift @ARGV; @@ -174,9 +172,9 @@ while (@ARGV) $Usage = 2; last; } - elsif (!defined $TargetList) + elsif (!defined $MissionStatement) { - $TargetList = $Arg; + $MissionStatement = $Arg; } else { @@ -187,23 +185,33 @@ while (@ARGV) } # Check and untaint parameters -my $Targets; +my $TaskMissions; if (!defined $Usage) { if (!$OptUpdate and !$OptBuild and !$OptAddOns and !$OptWinePrefix) { $OptUpdate = $OptBuild = $OptAddOns = $OptWinePrefix = 1; } - $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /,/, $TargetList) + $MissionStatement ||= "win32:wow32:wow64"; + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) { - if (!$AllTargets{$Target}) - { - Error "invalid target name $Target\n"; - $Usage = 2; - last; - } - $Targets->{$Target} = 1; + Error "$ErrMessage\n"; + $Usage = 2; + } + elsif (!@$Missions) + { + Error "Empty mission statement\n"; + $Usage = 2; + } + elsif (@$Missions > 1) + { + Error "Cannot specify missions for multiple tasks\n"; + $Usage = 2; + } + else + { + $TaskMissions = $Missions->[0]; } } if (defined $Usage) @@ -215,7 +223,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--wineprefix]\n"; - print " [--help] [TARGETS]\n"; + print " [--help] [MISSIONS]\n"; print "\n"; print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; @@ -225,11 +233,11 @@ if (defined $Usage) print " --addons Update the Gecko and Mono Wine addons.\n"; print " --wineprefix Update the wineprefixes.\n"; print "If none of the above actions is specified they are all performed.\n"; - print " TARGETS Is a comma-separated list of targets to process. By default all\n"; - print " targets are processed.\n"; - print " - win32: Apply the above to the regular 32 bit Wine.\n"; - print " - wow32: Apply the above to the 32 bit WoW Wine.\n"; - print " - wow64: Apply the above to the 64 bit WoW Wine.\n"; + print " MISSIONS Is a colon-separated list of missions. By default the\n"; + print " following missions are run.\n"; + print " - win32: Build the regular 32 bit Wine.\n"; + print " - wow32: Build the 32 bit WoW Wine.\n"; + print " - wow64: Build the 64 bit WoW Wine.\n"; print " --no-rm Don't rebuild from scratch.\n"; print " --help Shows this usage message.\n"; exit 0; @@ -255,8 +263,8 @@ if ($DataDir =~ /'/) exit(1) if (!BuildNativeTestAgentd()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); -exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); -exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($Targets)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); +exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($TaskMissions)); LogMsg "ok\n"; exit;

1 0

Byeongsik Jeon : gdi32: Support the gamma correction for the subpixel rendering.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 649dd1292d7e6a834de3009275f0208970552c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=649dd1292d7e6a834de30092… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Oct 17 10:00:53 2018 +0900 gdi32: Support the gamma correction for the subpixel rendering. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 8 ++++++- dlls/gdi32/dibdrv/graphics.c | 18 +++++++++------- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++++++++----------- dlls/gdi32/font.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 10 +++++++++ 6 files changed, 108 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=649dd1292d7e6a834de3…

1 0

Andrew Wesie : wined3d: Implement D3D11_STANDARD_MULTISAMPLE_PATTERN.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: b3b91ea51d7e2f03be470408abc19be8c3737822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b91ea51d7e2f03be470408… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Oct 22 14:15:21 2018 +0330 wined3d: Implement D3D11_STANDARD_MULTISAMPLE_PATTERN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45197 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 +++++--- include/wine/wined3d.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b8e7ef0..15492cd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -627,6 +627,8 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture unsigned int samples = wined3d_texture_get_gl_sample_count(texture); GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); + GLboolean standard_pattern = texture->resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE + && texture->resource.multisample_quality == WINED3D_STANDARD_MULTISAMPLE_PATTERN; switch (texture->target) { @@ -640,11 +642,11 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture break; case GL_TEXTURE_2D_MULTISAMPLE: GL_EXTCALL(glTexStorage2DMultisample(texture->target, samples, - gl_internal_format, width, height, GL_FALSE)); + gl_internal_format, width, height, standard_pattern)); break; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, - gl_internal_format, width, height, texture->layer_count, GL_FALSE)); + gl_internal_format, width, height, texture->layer_count, standard_pattern)); break; case GL_TEXTURE_1D_ARRAY: GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, @@ -3604,7 +3606,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } if (desc->multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE && (!(format->multisample_types & 1u << (desc->multisample_type - 1)) - || desc->multisample_quality)) + || (desc->multisample_quality && desc->multisample_quality != WINED3D_STANDARD_MULTISAMPLE_PATTERN))) { WARN("Unsupported multisample type %u quality %u requested.\n", desc->multisample_type, desc->multisample_quality); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 95549e9..1b3a46e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1571,6 +1571,8 @@ enum wined3d_shader_type #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 #define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 +#define WINED3D_STANDARD_MULTISAMPLE_PATTERN 0xffffffff + #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff #define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff

1 0

Andrew Wesie : d3d11/tests: Add a test for D3D11_STANDARD_MULTISAMPLE_PATTERN.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: a93334638b73ee425711d2f7e8e5aafce245a1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a93334638b73ee425711d2f7… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Oct 22 14:15:22 2018 +0330 d3d11/tests: Add a test for D3D11_STANDARD_MULTISAMPLE_PATTERN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45197 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 010139c..632ef4f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28529,6 +28529,127 @@ static void test_render_a8(void) release_test_context(&test_context); } +static void test_standard_pattern(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + struct swapchain_desc swapchain_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + D3D11_BUFFER_DESC buffer_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Buffer *buffer; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_samplepos[] = + { +#if 0 + Texture2DMS<float> t; + RWByteAddressBuffer u; + + float4 main() : SV_Target + { + u.Store2(0, asuint(t.GetSamplePosition(0))); + u.Store2(8, asuint(t.GetSamplePosition(1))); + u.Store2(16, asuint(t.GetSamplePosition(2))); + u.Store2(24, asuint(t.GetSamplePosition(3))); + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xa1db77e8, 0x804d8862, 0x0e3c213d, 0x2703dec6, 0x00000001, 0x00000190, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000118, 0x00000050, 0x00000046, + 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800006e, 0x00100032, 0x00000000, + 0x00107046, 0x00000000, 0x00004001, 0x00000000, 0x00000000, 0x0800006e, 0x001000c2, 0x00000000, + 0x00107406, 0x00000000, 0x00004001, 0x00000001, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000001, + 0x00004001, 0x00000000, 0x00100e46, 0x00000000, 0x0800006e, 0x00100032, 0x00000000, 0x00107046, + 0x00000000, 0x00004001, 0x00000002, 0x00000000, 0x0800006e, 0x001000c2, 0x00000000, 0x00107406, + 0x00000000, 0x00004001, 0x00000003, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000001, 0x00004001, + 0x00000010, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const unsigned int zero[4] = {0}; + static const float standard_pos4[] = + { + -2 / 16.0f, -6 / 16.0f, + 6 / 16.0f, -2 / 16.0f, + -6 / 16.0f, 2 / 16.0f, + 2 / 16.0f, 6 / 16.0f, + }; + + swapchain_desc.windowed = TRUE; + swapchain_desc.buffer_count = 1; + swapchain_desc.width = 32; + swapchain_desc.height = 32; + swapchain_desc.swap_effect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.flags = 0; + if (!init_test_context_ext(&test_context, &feature_level, &swapchain_desc)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = D3D11_STANDARD_MULTISAMPLE_PATTERN; + texture_desc.BindFlags |= D3D11_BIND_SHADER_RESOURCE; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = 256; + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_samplepos, sizeof(ps_samplepos), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + 1, &test_context.backbuffer_rtv, NULL, 1, 1, &uav, NULL); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + get_buffer_readback(buffer, &rb); + for (i = 0; i < ARRAY_SIZE(standard_pos4); ++i) + { + float data = get_readback_float(&rb, i, 0); + /* Wine does not support GetSamplePosition. */ + todo_wine ok(data == standard_pos4[i], "Got sample position %.8e, expected %.8e.\n", data, standard_pos4[i]); + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11Buffer_Release(buffer); + ID3D11UnorderedAccessView_Release(uav); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -28679,6 +28800,7 @@ START_TEST(d3d11) queue_test(test_depth_clip); queue_test(test_staging_buffers); queue_test(test_render_a8); + queue_test(test_standard_pattern); run_queued_tests(); }

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for IDirect3DRMTexture*_InitFromFile().
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: f1dab9ff8008e8cc68634150799c838b23a3e00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1dab9ff8008e8cc68634150… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Oct 22 14:15:23 2018 +0330 d3drm/tests: Add tests for IDirect3DRMTexture*_InitFromFile(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 83 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098..a2ea182 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5569,10 +5569,11 @@ static void test_load_texture(void) IDirect3DRM3 *d3drm3; IDirect3DRM2 *d3drm2; IDirect3DRM *d3drm1; + ULONG ref1, ref2; + unsigned int i; char *filename; HRESULT hr; BOOL ret; - int i; static const struct { @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,26 +5604,80 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */ + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, + NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, + NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a * change in the loading behavior. */ hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); @@ -5629,9 +5685,26 @@ static void test_load_texture(void) d3drm_img = IDirect3DRMTexture_GetImage(texture1); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, + NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename);

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for IDirect3DRM*_LoadTexture().
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 96f6e262377106ddfab25e43dc26890d5685e251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f6e262377106ddfab25e43… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Oct 22 14:15:24 2018 +0330 d3drm/tests: Add tests for IDirect3DRM*_LoadTexture(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a2ea182..9bc9a84 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5598,6 +5598,49 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); ref1 = get_refcount((IUnknown *)d3drm1); + /* Test all failures together. */ + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1); + todo_wine ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); + if (hr == D3DRMERR_FILENOTFOUND) + { + hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + } + + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); + if (hr == D3DRMERR_FILENOTFOUND) + { + hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + } + + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); + if (hr == D3DRMERR_FILENOTFOUND) + { + hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized);

1 0

Nikolay Sivov : gdiplus: Implement GdipMultiplyPenTransform().
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: e52a20f5bf86d156e1130e8268c65e04032e8caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e52a20f5bf86d156e1130e82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 19 20:02:39 2018 +0300 gdiplus: Implement GdipMultiplyPenTransform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 35 +++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 1f18f3f..ad45bcb 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -496,17 +496,12 @@ GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%p,%u)\n", pen, matrix, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipMultiplyMatrix(&pen->transform, matrix, order); } GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 6f69c3b..530967a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -553,6 +553,41 @@ static void test_transform(void) expectf(1.0, values[4]); expectf(-2.0, values[5]); + /* Multiply */ + status = GdipResetPenTransform(pen); + expect(Ok, status); + + status = GdipSetMatrixElements(matrix, 2.0, 1.0, 1.0, 4.0, 1.0, 2.0); + expect(Ok, status); + + status = GdipMultiplyPenTransform(NULL, matrix, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipMultiplyPenTransform(pen, matrix, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.0, values[0]); + expectf(1.0, values[1]); + expectf(1.0, values[2]); + expectf(4.0, values[3]); + expectf(1.0, values[4]); + expectf(2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipMultiplyPenTransform(pen, matrix, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(-2.0, values[0]); + expectf(-36.0, values[1]); + expectf(-36.0, values[2]); + expectf(-158.0, values[3]); + expectf(-15.0, values[4]); + expectf(-76.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 628db82..5593ac5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -629,6 +629,7 @@ GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); +GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *,GDIPCONST GpMatrix *,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);

1 0

Jacek Caban : kernel32/tests: Add more PeekNamedPipe tests.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 0fe08b794d9029acf36c724a198724077b6257b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe08b794d9029acf36c724a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:18:12 2018 +0200 kernel32/tests: Add more PeekNamedPipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 10c971b..b85e6ee 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2721,7 +2721,7 @@ static void test_readfileex_pending(void) static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail, DWORD expected_message_length) { DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef, left = 0xdeadbeed; - char buf[4000]; + char buf[12000]; FILE_PIPE_PEEK_BUFFER *peek_buf = (void*)buf; IO_STATUS_BLOCK io; NTSTATUS status; @@ -2939,39 +2939,53 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* write more data than needed for read */ overlapped_write_sync(writer, buf, 4000); test_overlapped_result(reader, &read_overlapped, 1000, msg_read); + test_peek_pipe(reader, 3000, 3000, msg_mode ? 3000 : 0); /* test pending write with overlapped event */ overlapped_write_async(writer, buf, buf_size, &write_overlapped); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size), 3000 + buf_size, msg_mode ? 3000 : 0); /* write one more byte */ overlapped_write_async(writer, buf, 1, &write_overlapped2); flush_thread = test_flush_async(writer, ERROR_SUCCESS); test_not_signaled(write_overlapped.hEvent); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size + 1), 3000 + buf_size + 1, + msg_mode ? 3000 : 0); /* empty write will not block */ overlapped_write_sync(writer, buf, 0); test_not_signaled(write_overlapped.hEvent); test_not_signaled(write_overlapped2.hEvent); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size + 1), 3000 + buf_size + 1, + msg_mode ? 3000 : 0); /* read remaining data from the first write */ overlapped_read_sync(reader, read_buf, 3000, 3000, FALSE); test_overlapped_result(writer, &write_overlapped, buf_size, FALSE); test_not_signaled(write_overlapped2.hEvent); test_not_signaled(flush_thread); + test_peek_pipe(reader, buf_size + (msg_mode ? 0 : 1), buf_size + 1, msg_mode ? buf_size : 0); /* read one byte so that the next write fits the buffer */ overlapped_read_sync(reader, read_buf, 1, 1, msg_read); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, buf_size + (msg_mode ? -1 : 0), buf_size, msg_mode ? buf_size - 1 : 0); /* read the whole buffer */ overlapped_read_sync(reader, read_buf, buf_size, buf_size-msg_read, FALSE); + test_peek_pipe(reader, msg_read ? 1 : 0, msg_read ? 1 : 0, msg_read ? 1 : 0); if(msg_read) + { overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); + } - if(msg_mode) { + if(msg_mode) + { /* we still have an empty message in queue */ overlapped_read_sync(reader, read_buf, 1000, 0, FALSE); + test_peek_pipe(reader, 0, 0, 0); } test_flush_done(flush_thread); @@ -2983,23 +2997,29 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL overlapped_write_sync(writer, buf, 1); test_overlapped_result(reader, &read_overlapped, 0, msg_read); test_overlapped_result(reader, &read_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* write a message larger than buffer */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); + test_peek_pipe(reader, buf_size + 2000, buf_size + 2000, msg_mode ? buf_size + 2000 : 0); /* read so that pending write is still larger than the buffer */ overlapped_read_sync(reader, read_buf, 1999, 1999, msg_read); test_not_signaled(write_overlapped.hEvent); + test_peek_pipe(reader, buf_size + 1, buf_size + 1, msg_mode ? buf_size + 1 : 0); /* read one more byte */ overlapped_read_sync(reader, read_buf, 1, 1, msg_read); test_overlapped_result(writer, &write_overlapped, buf_size+2000, FALSE); + test_peek_pipe(reader, buf_size, buf_size, msg_mode ? buf_size : 0); /* read remaining data */ overlapped_read_sync(reader, read_buf, buf_size+1, buf_size, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* simple pass of empty message */ overlapped_write_sync(writer, buf, 0); + test_peek_pipe(reader, 0, 0, 0); if(msg_mode) overlapped_read_sync(reader, read_buf, 1, 0, FALSE); @@ -3044,24 +3064,33 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* make two async writes, cancel the first one and make sure that we read from the second one */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); + test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), + buf_size + 2001, msg_mode ? buf_size + 2000 : 0); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 1, 1, msg_mode ? 1 : 0); overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* same as above, but parially read written data before canceling */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); + test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), + buf_size + 2001, msg_mode ? buf_size + 2000 : 0); overlapped_read_sync(reader, read_buf, 10, 10, msg_read); test_not_signaled(write_overlapped.hEvent); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 1, 1, msg_mode ? 1 : 0); overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* empty queue by canceling write and make sure that flush is signaled */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); flush_thread = test_flush_async(writer, ERROR_SUCCESS); test_not_signaled(flush_thread); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 0, 0, 0); test_flush_done(flush_thread); }

1 0

Jacek Caban : server: Improve error handling of disconnected named pipe clients.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: dd1769a16a8977f2eb106d04f6530a590a77fdd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1769a16a8977f2eb106d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:18:37 2018 +0200 server: Improve error handling of disconnected named pipe clients. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 1 - dlls/ntdll/tests/pipe.c | 4 ---- server/named_pipe.c | 10 ++++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b85e6ee..7f77df1 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1506,7 +1506,6 @@ static int test_DisconnectNamedPipe(void) ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ret = PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "PeekNamedPipe returned %x (%u)\n", ret, GetLastError()); ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 51024a2..798df53 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1348,7 +1348,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_PIPE_BROKEN; break; } - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) @@ -1363,7 +1362,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) buf, 1, buf+1, 1); if (!status || status == STATUS_PENDING) status = io.Status; - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); @@ -1373,7 +1371,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) status = NtFlushBuffersFile(pipe, &io); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) { - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "status = %x in %s state %u\n", status, is_server ? "server" : "client", state); } @@ -1472,7 +1469,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_BUFFER_OVERFLOW; break; } - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (status == STATUS_BUFFER_OVERFLOW) diff --git a/server/named_pipe.c b/server/named_pipe.c index 0d98bf8..ebd8c4f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -501,6 +501,12 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); + if (!pipe_end->pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + } + if (pipe_end->connection && !list_empty( &pipe_end->connection->message_queue )) { fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); @@ -888,7 +894,7 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) set_error( STATUS_PIPE_BROKEN ); return 0; default: - set_error( STATUS_INVALID_PIPE_STATE ); + set_error( pipe_end->pipe ? STATUS_INVALID_PIPE_STATE : STATUS_PIPE_DISCONNECTED ); return 0; } @@ -932,7 +938,7 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) if (!pipe_end->connection) { - set_error( STATUS_INVALID_PIPE_STATE ); + set_error( pipe_end->pipe ? STATUS_INVALID_PIPE_STATE : STATUS_PIPE_DISCONNECTED ); return 0; }

1 0