October 2020 - Wine-commits

Henri Verbeet : wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: e154c95355227659524dd449e73f08a48e3b951c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e154c95355227659524dd449… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:54 2020 +0330 wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled. The state itself is ignored in this case, but could still cause additional pipeline variants to be created. That's mostly a consideration for Direct3D 9 and before, since Direct3D 10 and 11 already normalise disabled stencil test state themselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 92b8c14e23..f125884215 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2080,6 +2080,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } + else + { + memset(&key->ds_desc.front, 0, sizeof(key->ds_desc.front)); + memset(&key->ds_desc.back, 0, sizeof(key->ds_desc.back)); + } } else {

1 0

Henri Verbeet : wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE).
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 1b192ce4cbd12e2a42fd59cfde73abe332a1f9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b192ce4cbd12e2a42fd59cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:55 2020 +0330 wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE). This is no longer used internally; two-sided stencil is handled as part of STATE_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3381252e75..2f42a41754 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -510,10 +510,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct if (gl_mask & GL_STENCIL_BUFFER_BIT) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0U); context_invalidate_state(context, STATE_DEPTH_STENCIL); } @@ -5389,10 +5386,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (flags & WINED3DCLEAR_STENCIL) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0u); context_invalidate_state(context, STATE_DEPTH_STENCIL); gl_info->gl_ops.gl.p_glClearStencil(stencil);

1 0

Jacek Caban : kernel32: Always use conhost for WriteConsoleW.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 143c210360ab4b3232fc5cdbf5c5c56d8001ace4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=143c210360ab4b3232fc5cdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:11 2020 +0200 kernel32: Always use conhost for WriteConsoleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 207 +++--------------------------------------------- 1 file changed, 10 insertions(+), 197 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e56a09516d..37e36730a9 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -357,116 +357,6 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) return TRUE; } -/****************************************************************** - * CONSOLE_WriteChars - * - * WriteConsoleOutput helper: hides server call semantics - * writes a string at a given pos with standard attribute - */ -static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) -{ - struct condrv_output_params *params; - DWORD written = 0, size; - - if (!length) return 0; - - size = sizeof(*params) + length * sizeof(WCHAR); - if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; - params->mode = CHAR_INFO_MODE_TEXTSTDATTR; - params->x = coord->X; - params->y = coord->Y; - params->width = 0; - memcpy( params + 1, str, length * sizeof(*str) ); - if (DeviceIoControl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, - &written, sizeof(written), NULL, NULL )) - coord->X += written; - HeapFree( GetProcessHeap(), 0, params ); - return written; -} - -/****************************************************************** - * next_line - * - * WriteConsoleOutput helper: handles passing to next line (+scrolling if necessary) - * - */ -static BOOL next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) -{ - SMALL_RECT src; - CHAR_INFO ci; - COORD dst; - - csbi->dwCursorPosition.X = 0; - csbi->dwCursorPosition.Y++; - - if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return TRUE; - - src.Top = 1; - src.Bottom = csbi->dwSize.Y - 1; - src.Left = 0; - src.Right = csbi->dwSize.X - 1; - - dst.X = 0; - dst.Y = 0; - - ci.Attributes = csbi->wAttributes; - ci.Char.UnicodeChar = ' '; - - csbi->dwCursorPosition.Y--; - if (!ScrollConsoleScreenBufferW(hCon, &src, NULL, dst, &ci)) - return FALSE; - return TRUE; -} - -/****************************************************************** - * write_block - * - * WriteConsoleOutput helper: writes a block of non special characters - * Block can spread on several lines, and wrapping, if needed, is - * handled - * - */ -static BOOL write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, - DWORD mode, LPCWSTR ptr, int len) -{ - int blk; /* number of chars to write on current line */ - int done; /* number of chars already written */ - - if (len <= 0) return TRUE; - - if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */ - { - for (done = 0; done < len; done += blk) - { - blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); - - if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return FALSE; - if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi)) - return FALSE; - } - } - else - { - int pos = csbi->dwCursorPosition.X; - /* FIXME: we could reduce the number of loops - * but, in most cases we wouldn't gain lots of time (it would only - * happen if we're asked to overwrite more than twice the part of the line, - * which is unlikely - */ - for (done = 0; done < len; done += blk) - { - blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); - - csbi->dwCursorPosition.X = pos; - if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return FALSE; - } - } - - return TRUE; -} - /*********************************************************************** * WriteConsoleA (KERNEL32.@) @@ -492,95 +382,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleA( HANDLE handle, LPCVOID buffer, DWOR /*********************************************************************** * WriteConsoleW (KERNEL32.@) */ -BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumberOfCharsToWrite, - LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved) -{ - DWORD mode; - DWORD nw = 0; - const WCHAR* psz = lpBuffer; - CONSOLE_SCREEN_BUFFER_INFO csbi; - int k, first = 0; - IO_STATUS_BLOCK io; - - TRACE("%p %s %d %p %p\n", - hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite), - nNumberOfCharsToWrite, lpNumberOfCharsWritten, lpReserved); - - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; - - if (!NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &io, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, - nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0)) - { - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; - return TRUE; - } - - if (!GetConsoleMode(hConsoleOutput, &mode) || !GetConsoleScreenBufferInfo(hConsoleOutput, &csbi)) - return FALSE; - - if (!nNumberOfCharsToWrite) return TRUE; - - if (mode & ENABLE_PROCESSED_OUTPUT) - { - unsigned int i; - - for (i = 0; i < nNumberOfCharsToWrite; i++) - { - switch (psz[i]) - { - case '\b': case '\t': case '\n': case '\a': case '\r': - /* don't handle here the i-th char... done below */ - if ((k = i - first) > 0) - { - if (!write_block(hConsoleOutput, &csbi, mode, &psz[first], k)) - goto the_end; - nw += k; - } - first = i + 1; - nw++; - } - switch (psz[i]) - { - case '\b': - if (csbi.dwCursorPosition.X > 0) csbi.dwCursorPosition.X--; - break; - case '\t': - { - static const WCHAR tmp[] = {' ',' ',' ',' ',' ',' ',' ',' '}; - if (!write_block(hConsoleOutput, &csbi, mode, tmp, - ((csbi.dwCursorPosition.X + 8) & ~7) - csbi.dwCursorPosition.X)) - goto the_end; - } - break; - case '\n': - next_line(hConsoleOutput, &csbi); - break; - case '\a': - Beep(400, 300); - break; - case '\r': - csbi.dwCursorPosition.X = 0; - break; - default: - break; - } - } - } +BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, DWORD length, + DWORD *written, void *reserved ) +{ + BOOL ret; - /* write the remaining block (if any) if processed output is enabled, or the - * entire buffer otherwise - */ - if ((k = nNumberOfCharsToWrite - first) > 0) - { - if (!write_block(hConsoleOutput, &csbi, mode, &psz[first], k)) - goto the_end; - nw += k; - } + TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_wn(buffer, length), length, written, reserved ); - the_end: - SetConsoleCursorPosition(hConsoleOutput, csbi.dwCursorPosition); - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nw; - return nw != 0; + ret = DeviceIoControl( handle, IOCTL_CONDRV_WRITE_CONSOLE, (void *)buffer, + length * sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (written) *written = ret ? length : 0; + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; }

1 0

Jacek Caban : kernel32: Always use conhost for ReadConsoleW.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 633b244b1ae7928cafbfd25ef338e4918aac0d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633b244b1ae7928cafbfd25e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:38 2020 +0200 kernel32: Always use conhost for ReadConsoleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/console.c | 178 +------ dlls/kernel32/console_private.h | 34 -- dlls/kernel32/editline.c | 1044 --------------------------------------- dlls/kernel32/kernel_main.c | 1 - 5 files changed, 9 insertions(+), 1249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=633b244b1ae7928cafbf…

1 0

Jacek Caban : kernel32: Move ReadConsole and WriteConsole to kernelbase.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 98dcd3a7ead292eee3cdd1825380ccbb8a69dbc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98dcd3a7ead292eee3cdd182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:55 2020 +0200 kernel32: Move ReadConsole and WriteConsole to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 86 ----------------------------------------- dlls/kernel32/kernel32.spec | 8 ++-- dlls/kernelbase/console.c | 85 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 8 ++-- 4 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98dcd3a7ead292eee3cd…

1 0

Jacek Caban : kernelbase: Remove window position adjustment from SetConsoleCursorPosition.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: eca4d91cad48922f0ec881f79913e4b0162adbec URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca4d91cad48922f0ec881f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:28:12 2020 +0200 kernelbase: Remove window position adjustment from SetConsoleCursorPosition. It's done in conhost now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 4f511b1637..143644e233 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1183,46 +1183,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos ) { struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS }; - CONSOLE_SCREEN_BUFFER_INFO info; - int w, h, do_move = 0; TRACE( "%p %d %d\n", handle, pos.X, pos.Y ); params.info.cursor_x = pos.X; params.info.cursor_y = pos.Y; - if (!console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL )) - return FALSE; - - if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; - - /* if cursor is no longer visible, scroll the visible window... */ - w = info.srWindow.Right - info.srWindow.Left + 1; - h = info.srWindow.Bottom - info.srWindow.Top + 1; - if (pos.X < info.srWindow.Left) - { - info.srWindow.Left = min(pos.X, info.dwSize.X - w); - do_move = 1; - } - else if (pos.X > info.srWindow.Right) - { - info.srWindow.Left = max(pos.X, w) - w + 1; - do_move = 1; - } - info.srWindow.Right = info.srWindow.Left + w - 1; - - if (pos.Y < info.srWindow.Top) - { - info.srWindow.Top = min(pos.Y, info.dwSize.Y - h); - do_move = 1; - } - else if (pos.Y > info.srWindow.Bottom) - { - info.srWindow.Top = max(pos.Y, h) - h + 1; - do_move = 1; - } - info.srWindow.Bottom = info.srWindow.Top + h - 1; - - return !do_move || SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Remove no longer needed free_console server call from FreeConsole.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 1b672d1013056d6a017605b8f8b7a8aca7ff16cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b672d1013056d6a017605b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:28:45 2020 +0200 kernelbase: Remove no longer needed free_console server call from FreeConsole. We can depend on closing console connection handle now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 143644e233..d073b77eaa 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -584,7 +584,6 @@ HANDLE get_console_wait_handle( HANDLE handle ) BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { HANDLE event; - BOOL ret; RtlEnterCriticalSection( &console_section ); @@ -599,15 +598,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); console_flags = 0; - SERVER_START_REQ( free_console ) - { - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); RtlLeaveCriticalSection( &console_section ); - return ret; + return TRUE; }

1 0

Jacek Caban : server: Remove no longer used console requests.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: dc6f6e9ef3d6f9c99eb743d779174e5759f091e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6f6e9ef3d6f9c99eb743d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:03 2020 +0200 server: Remove no longer used console requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 92 +------------------------ server/console.c | 153 ----------------------------------------- server/protocol.def | 42 ----------- server/request.h | 31 --------- server/trace.c | 63 ----------------- 5 files changed, 1 insertion(+), 380 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc6f6e9ef3d6f9c99eb7…

1 0

Jacek Caban : server: Remove no longer needed server-side screen buffer ioctls.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 2e74000537a947e29c6de9de53bbfb1549649f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e74000537a947e29c6de9de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:34 2020 +0200 server: Remove no longer needed server-side screen buffer ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 694 ------------------------------------------------------- 1 file changed, 694 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e74000537a947e29c6d…

1 0

Jacek Caban : server: Remove no longer needed server-side console input ioctls.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: c2e319ed20d3e0e5b263960edff237702896e1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e319ed20d3e0e5b263960e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:47 2020 +0200 server: Remove no longer needed server-side console input ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 275 ------------------------------------------------------- 1 file changed, 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2e319ed20d3e0e5b263…

1 0