March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Move the cull mode to wined3d_rasterizer_state.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 6045fe027b861f109ac4b6c40cdd7f51929218e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6045fe027b861f109ac4b6c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 19:28:10 2020 -0600 wined3d: Move the cull mode to wined3d_rasterizer_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 1 + dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 14 +++++++------- include/wine/wined3d.h | 1 + 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c42fa284c..63d7f1dc2b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); @@ -954,7 +953,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d63a1bc699..47d42fd6c5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1077,6 +1077,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.fill_mode = desc->FillMode; + wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index af2b00f88e..28e0d262a5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3150,7 +3150,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glDisable(GL_BLEND); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CULLMODE)); + context_invalidate_state(context, STATE_RASTERIZER); gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_STENCILENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 69ff7dd0cd..34482d8ea2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3599,6 +3599,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; case WINED3D_RS_FILLMODE: + case WINED3D_RS_CULLMODE: set_rasterizer_state = TRUE; break; @@ -3616,6 +3617,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wine_rb_entry *entry; desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; + desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; desc.front_ccw = FALSE; desc.depth_bias_clamp = 0.0f; desc.depth_clip = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 388116bc66..5cf425f0a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -255,13 +255,13 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ context_apply_state(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } -static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void cullmode(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + enum wined3d_cull mode = r ? r->desc.cull_mode : WINED3D_CULL_BACK; /* glFrontFace() is set in context.c at context init and on an * offscreen / onscreen rendering switch. */ - switch (state->render_states[WINED3D_RS_CULLMODE]) + switch (mode) { case WINED3D_CULL_NONE: gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); @@ -280,8 +280,7 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d checkGLcall("glCullFace(GL_BACK)"); break; default: - FIXME("Unrecognized cull mode %#x.\n", - state->render_states[WINED3D_RS_CULLMODE]); + FIXME("Unrecognized cull mode %#x.\n", mode); } } @@ -4335,6 +4334,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); fillmode(r, gl_info); + cullmode(r, gl_info); depth_clip(r, gl_info); } @@ -4351,6 +4351,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); fillmode(r, gl_info); + cullmode(r, gl_info); depth_clip(r, gl_info); } @@ -4598,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwriteenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_CULLMODE), { STATE_RENDER(WINED3D_RS_CULLMODE), state_cullmode }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZFUNC), { STATE_RENDER(WINED3D_RS_ZFUNC), state_zfunc }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, @@ -5430,7 +5430,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 3, 3}, { 8, 8}, { 17, 18}, - { 21, 21}, + { 21, 22}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2370ca469f..bfdd1b9ca3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2034,6 +2034,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { enum wined3d_fill_mode fill_mode; + enum wined3d_cull cull_mode; BOOL front_ccw; float depth_bias_clamp; BOOL depth_clip;

1 0

Francois Gouget : testbot: Add the exe32 and exe64 mission capabilities.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: tools Branch: master Commit: cd388a3f899ea6fccb5c1f9b4f15392fa4930471 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cd388a3f899ea6fccb5c1f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 6 13:17:32 2020 +0100 testbot: Add the exe32 and exe64 mission capabilities. This makes it possible to only test the mailing list patches against one bitness of a locale-specific Windows VM duplicate, while still allowing developers to create jobs of either bitness on it, to run test executables for instance. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 810eb4d..4f0061c 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -177,7 +177,7 @@ sub GetMissionCaps($$) $Capabilities->{lang}->{$Lang} = 1; } } - elsif ($Capability =~ /^(?:win32|wow32|wow64)$/) + elsif ($Capability =~ /^(?:exe32|exe64|win32|wow32|wow64)$/) { $Capabilities->{build}->{$Capability} = 1; }

1 0

Francois Gouget : testbot: Tweak placement of 'Re:' in the Job title.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: tools Branch: master Commit: 9532f0fb5c3f26a83324dd4d7d81bdea74fed079 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9532f0fb5c3f26a83324dd4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 6 13:18:16 2020 +0100 testbot: Tweak placement of 'Re:' in the Job title. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a76c35f..6638fb9 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -236,7 +236,7 @@ sub Submit($$;$) my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Remarks = "[$PatchesMailingList] "; # Keep Re because it's similar to a version - $Remarks = "$SubjectInfo->{Re} $Remarks" if ($SubjectInfo->{Re}); + $Remarks .= "$SubjectInfo->{Re} " if ($SubjectInfo->{Re}); $Remarks .= "$SubjectInfo->{Domain} " if ($SubjectInfo->{Domain}); $Remarks .= "v$SubjectInfo->{Version} " if ($SubjectInfo->{Version}); $Remarks .= $SubjectInfo->{Title};

1 0

Francois Gouget : testbot: Ignore replies to patch series.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: tools Branch: master Commit: 3c21dde07d24ebe932400743b68b53881c1689a4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c21dde07d24ebe93240074… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 6 13:21:05 2020 +0100 testbot: Ignore replies to patch series. Except for part 1, replies to patch series cannot be tested even if they contain a patch: - They must not take the place of the original patch series part. - They are likely to arrive long after the patch series has been completed, by which time the TestBot no longer has access to the patch series parts. - They must not cause the TestBot to open a new patch series waiting for the other parts. So ignore replies to patch series, except for replies to part 1 which are treated as regular patches. With this patch, when a collision happens, we know it's not because of a reply so adjust the corresponding patch disposition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 35 ++++++++++++++++++++--------- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 6638fb9..54b6c5e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -542,10 +542,31 @@ sub NewPatch($$$) } my $ErrMessage; - if (scalar(@PatchBodies) == 1) + my $SubjectInfo = $Patch->ParseSubject(); + if (@PatchBodies == 0) { - my $SubjectInfo = $Patch->ParseSubject(); - $Patch->Disposition($SubjectInfo->{PartNo} ? "Checking series" : "Checking patch"); + $Patch->Disposition("No patch found"); + } + elsif (@PatchBodies > 1) + { + $Patch->Disposition("Message contains multiple patches"); + } + elsif ($SubjectInfo->{Re} and ($SubjectInfo->{PartNo} || 0) > 1) + { + # Except for part 1, replies to patch series cannot be tested even if + # they contain a patch: + # - They must not take the place of the original patch series part. + # - They are likely to arrive long after the patch series has been + # completed, by which time the TestBot no longer has access to the + # patch series parts. + # - They must not trigger the creation of a new PendingPatchSet object. + $Patch->Disposition("Reply to a patch series"); + } + else + { + # Treat replies to patch series part 1 as regular patches + $SubjectInfo->{PartNo} = undef if ($SubjectInfo->{Re}); + $Patch->Disposition("Checking ". ($SubjectInfo->{PartNo} ? "series" : "patch")); (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (!defined $ErrMessage) @@ -555,14 +576,6 @@ sub NewPatch($$$) $Patch->Submit($PatchBodies[0]->path, $SubjectInfo); } } - elsif (scalar(@PatchBodies) == 0) - { - $Patch->Disposition("No patch found"); - } - else - { - $Patch->Disposition("Message contains multiple patches"); - } foreach my $PatchBody (@PatchBodies) { diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 8f5b470..9e386af 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -245,7 +245,7 @@ sub NewSubmission($$$) my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); if ($Part) { - $Patch->Disposition("Existing part reply / collision"); + $Patch->Disposition("Patch series collision"); return undef; }

1 0

Aaro Altonen : kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 723506ef4834cd9a16b890042a1c43861b39f3e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=723506ef4834cd9a16b89004… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 4 09:47:51 2020 +0200 kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx(). Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..8f19161c9c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,53 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx || !pGetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + memset(&info, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + pGetConsoleScreenBufferInfoEx(std_output, &info); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3445,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); }

1 0

Aaro Altonen : kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: b21881f53c6b88523b3eaf6281be8c7a05258ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21881f53c6b88523b3eaf62… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 4 09:47:52 2020 +0200 kernelbase: Implement SetConsoleScreenBufferInfoEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8f19161c9c..9698f11779 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3167,24 +3167,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..b9843850c8 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ( set_console_output_info ) + { + req->handle = console_handle_unmap( handle ); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min( info->dwMaximumWindowSize.X, info->dwSize.X ); + req->max_height = min( info->dwMaximumWindowSize.Y, info->dwSize.Y ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + + return ret; }

1 0

Damjan Jovanovic : gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 99a171981cc42970f0caee69e1ceb0e810d5955f URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a171981cc42970f0caee69… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Mar 5 03:35:40 2020 +0200 gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42585 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 7 ++++++- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0b6e4ec377..04c5501deb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -384,7 +384,12 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ src_color = ((ARGB*)(src + src_stride * y))[x]; if (comp_mode == CompositingModeSourceCopy) - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); + { + if (!(src_color & 0xff000000)) + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, 0); + else + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); + } else { if (!(src_color & 0xff000000)) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index bbb9365edb..0b4ae3cd9c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4491,7 +4491,7 @@ static void test_DrawImage_SourceCopy(void) expect(0, dst_pixels[0]); expect(0xffff0000, dst_pixels[1]); expect(0, dst_pixels[2]); - todo_wine expect(0, dst_pixels[3]); + expect(0, dst_pixels[3]); status = GdipDeleteGraphics(graphics); expect(Ok, status);

1 0

Alistair Leslie-Hughes : qwave: Add QOSAddSocketToFlow stub.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 8641e59fe306c850f28d60edf4b25aaa2a864d7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8641e59fe306c850f28d60ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 00:09:38 2020 +0000 qwave: Add QOSAddSocketToFlow stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48580 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/main.c | 8 ++++++++ dlls/qwave/qwave.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index 685fcfb6c6..e256d1b8c6 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -50,3 +50,11 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) SetLastError(ERROR_SERVICE_ALREADY_RUNNING); return FALSE; } + +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) +{ + FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec index 94b62eb1d8..83dfc6787c 100644 --- a/dlls/qwave/qwave.spec +++ b/dlls/qwave/qwave.spec @@ -1,6 +1,6 @@ @ stub QDLHPathDiagnostics @ stub QDLHStartDiagnosingPath -@ stub QOSAddSocketToFlow +@ stdcall QOSAddSocketToFlow(ptr long ptr long long ptr) @ stub QOSCancel @ stub QOSCloseHandle @ stdcall QOSCreateHandle(ptr ptr)

1 0

Vincent Povirk : windowscodecs/tests: Add test for WriteSource with indexed formats.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 9891afcb684cc1e528838058010b79c669c33f4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9891afcb684cc1e528838058… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 5 13:19:51 2020 -0600 windowscodecs/tests: Add test for WriteSource with indexed formats. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bmpformat.c | 180 +++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 8bac7a3853..9de138130e 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1085,6 +1085,185 @@ static void test_create_decoder(void) IWICImagingFactory_Release(factory); } +static void test_writesource_palette(void) +{ + IWICImagingFactory *factory; + HRESULT hr; + WICColor encode_palette[2] = {0xff111111, 0xffcccccc}; + WICColor source_palette[2] = {0xff555555, 0xffaaaaaa}; + WICColor result_palette[2]; + UINT result_colors; + IWICBitmap *bitmap; + IWICPalette *palette; + IStream *stream; + IWICBitmapEncoder *encoder; + IWICBitmapFrameEncode *frame_encode; + IPropertyBag2 *encode_options; + GUID pixelformat; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame_decode; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + /* Encoder with palette set */ + hr = IWICImagingFactory_CreateBitmap(factory, 1, 1, &GUID_WICPixelFormat1bppIndexed, + WICBitmapCacheOnDemand, &bitmap); + ok(hr == S_OK, "CreateBitmap error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStream error %#x\n", hr); + + hr = IWICImagingFactory_CreateEncoder(factory, &GUID_ContainerFormatBmp, &GUID_VendorMicrosoft, &encoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "IWICBitmapEncoder_Initialize error %#x\n", hr); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame_encode, &encode_options); + ok(hr == S_OK, "CreateNewFrame error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Initialize(frame_encode, encode_options); + ok(hr == S_OK, "IWICBitmapFrameEncode_Initialize error %#x\n", hr); + + IPropertyBag2_Release(encode_options); + + hr = IWICBitmapFrameEncode_SetSize(frame_encode, 1, 1); + ok(hr == S_OK, "SetSize error %#x\n", hr); + + pixelformat = GUID_WICPixelFormat1bppIndexed; + hr = IWICBitmapFrameEncode_SetPixelFormat(frame_encode, &pixelformat); + ok(hr == S_OK, "SetPixelFormat error %#x\n", hr); + ok(!memcmp(&pixelformat, &GUID_WICPixelFormat1bppIndexed, sizeof(pixelformat)), "pixel format changed\n"); + + hr = IWICPalette_InitializeCustom(palette, encode_palette, 2); + ok(hr == S_OK, "InitializeCustom error %#x\n", hr); + + hr = IWICBitmapFrameEncode_SetPalette(frame_encode, palette); + ok(hr == S_OK, "SetPalette error %#x\n", hr); + + hr = IWICPalette_InitializeCustom(palette, source_palette, 2); + ok(hr == S_OK, "InitializeCustom error %#x\n", hr); + + hr = IWICBitmap_SetPalette(bitmap, palette); + ok(hr == S_OK, "SetPalette error %#x\n", hr); + + hr = IWICBitmapFrameEncode_WriteSource(frame_encode, (IWICBitmapSource*)bitmap, NULL); + ok(hr == S_OK, "WriteSource error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Commit(frame_encode); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapFrameEncode_Release(frame_encode); + + hr = IWICBitmapEncoder_Commit(encoder); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapEncoder_Release(encoder); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, WICDecodeMetadataCacheOnLoad, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame_decode); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(frame_decode, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColors(palette, 2, result_palette, &result_colors); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(result_colors == 2, "Got %i colors\n", result_colors); + ok(result_palette[0] == encode_palette[0], "Unexpected palette entry: %x\n", result_palette[0]); + ok(result_palette[1] == encode_palette[1], "Unexpected palette entry: %x\n", result_palette[0]); + + IWICBitmapFrameDecode_Release(frame_decode); + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); + + /* Encoder with no palette set */ + hr = IWICImagingFactory_CreateEncoder(factory, &GUID_ContainerFormatBmp, &GUID_VendorMicrosoft, &encoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStream error %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "IWICBitmapEncoder_Initialize error %#x\n", hr); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame_encode, &encode_options); + ok(hr == S_OK, "CreateNewFrame error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Initialize(frame_encode, encode_options); + ok(hr == S_OK, "IWICBitmapFrameEncode_Initialize error %#x\n", hr); + + IPropertyBag2_Release(encode_options); + + hr = IWICBitmapFrameEncode_SetSize(frame_encode, 1, 1); + ok(hr == S_OK, "SetSize error %#x\n", hr); + + pixelformat = GUID_WICPixelFormat1bppIndexed; + hr = IWICBitmapFrameEncode_SetPixelFormat(frame_encode, &pixelformat); + ok(hr == S_OK, "SetPixelFormat error %#x\n", hr); + ok(!memcmp(&pixelformat, &GUID_WICPixelFormat1bppIndexed, sizeof(pixelformat)), "pixel format changed\n"); + + hr = IWICPalette_InitializeCustom(palette, source_palette, 2); + ok(hr == S_OK, "InitializeCustom error %#x\n", hr); + + hr = IWICBitmap_SetPalette(bitmap, palette); + ok(hr == S_OK, "SetPalette error %#x\n", hr); + + hr = IWICBitmapFrameEncode_WriteSource(frame_encode, (IWICBitmapSource*)bitmap, NULL); + if (hr == WINCODEC_ERR_PALETTEUNAVAILABLE) + { + win_skip("old WriteSource palette behavior\n"); /* winxp */ + IWICBitmapFrameEncode_Release(frame_encode); + IWICBitmapEncoder_Release(encoder); + IStream_Release(stream); + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + IWICImagingFactory_Release(factory); + return; + } + ok(hr == S_OK, "WriteSource error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Commit(frame_encode); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapFrameEncode_Release(frame_encode); + + hr = IWICBitmapEncoder_Commit(encoder); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapEncoder_Release(encoder); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, WICDecodeMetadataCacheOnLoad, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame_decode); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(frame_decode, palette); + todo_wine ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColors(palette, 2, result_palette, &result_colors); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(result_colors == 2, "Got %i colors\n", result_colors); + ok(result_palette[0] == source_palette[0], "Unexpected palette entry: %x\n", result_palette[0]); + ok(result_palette[1] == source_palette[1], "Unexpected palette entry: %x\n", result_palette[0]); + + IWICBitmapFrameDecode_Release(frame_decode); + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); + + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1097,6 +1276,7 @@ START_TEST(bmpformat) test_componentinfo(); test_createfromstream(); test_create_decoder(); + test_writesource_palette(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Set palette in WriteSource when necessary.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 4f53be1a6e7c15c3648b0770f9d92685dc9a9717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f53be1a6e7c15c3648b0770… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 5 13:19:52 2020 -0600 windowscodecs: Set palette in WriteSource when necessary. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 3 ++- dlls/windowscodecs/jpegformat.c | 3 ++- dlls/windowscodecs/main.c | 24 +++++++++++++++++++++++- dlls/windowscodecs/pngformat.c | 4 +++- dlls/windowscodecs/tests/bmpformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 4 +++- dlls/windowscodecs/wincodecs_private.h | 2 +- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 3b77517a8d..2f0c05a5df 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -316,7 +316,8 @@ static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - This->format->guid, This->format->bpp, This->width, This->height); + This->format->guid, This->format->bpp, !This->colors && This->format->colors, + This->width, This->height); } return hr; diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 0ecbbf48fc..9460e6913f 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1181,7 +1181,8 @@ static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - This->format->guid, This->format->bpp, This->width, This->height); + This->format->guid, This->format->bpp, FALSE, + This->width, This->height); } return hr; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 78281519b8..94d6640782 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -154,7 +154,7 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface, HRESULT write_source(IWICBitmapFrameEncode *iface, IWICBitmapSource *source, const WICRect *prc, - const WICPixelFormatGUID *format, UINT bpp, + const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette, INT width, INT height) { IWICBitmapSource *converted_source; @@ -185,6 +185,28 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, return E_NOTIMPL; } + if (need_palette) + { + IWICPalette *palette; + + hr = PaletteImpl_Create(&palette); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapSource_CopyPalette(converted_source, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_SetPalette(iface, palette); + + IWICPalette_Release(palette); + } + + if (FAILED(hr)) + { + IWICBitmapSource_Release(converted_source); + return hr; + } + } + stride = (bpp * width + 7)/8; pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index a79df632ef..207a81d4d2 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1772,7 +1772,9 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - This->format->guid, This->format->bpp, This->width, This->height); + This->format->guid, This->format->bpp, + !This->colors && This->format->color_type == PNG_COLOR_TYPE_PALETTE, + This->width, This->height); } return hr; diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 9de138130e..183fc46100 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1247,7 +1247,7 @@ static void test_writesource_palette(void) ok(hr == S_OK, "GetFrame error %#x\n", hr); hr = IWICBitmapFrameDecode_CopyPalette(frame_decode, palette); - todo_wine ok(hr == S_OK, "CopyPalette error %#x\n", hr); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); hr = IWICPalette_GetColors(palette, 2, result_palette, &result_colors); ok(hr == S_OK, "GetColors error %#x\n", hr); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 295330aea2..60592e0cb8 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1769,7 +1769,9 @@ static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - This->format->guid, This->format->bpp, This->width, This->height); + This->format->guid, This->format->bpp, + !This->colors && This->format->bpp <= 8 && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite), + This->width, This->height); } return hr; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 2b3b10b7ee..7686e80715 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -174,7 +174,7 @@ extern HRESULT configure_write_source(IWICBitmapFrameEncode *iface, extern HRESULT write_source(IWICBitmapFrameEncode *iface, IWICBitmapSource *source, const WICRect *prc, - const WICPixelFormatGUID *format, UINT bpp, + const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette, INT width, INT height) DECLSPEC_HIDDEN; extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN;

1 0