October 2020 - Wine-commits

Alistair Leslie-Hughes : sapi: Return a default token in ISpVoice::GetVoice
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 6eaa2d2df2a17a8b24d46e1224abd9df5b07d9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eaa2d2df2a17a8b24d46e12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 15 20:39:55 2020 +1100 sapi: Return a default token in ISpVoice::GetVoice GetVoice returns a default voice when one is not active. This stops a crash on startup with Scrivener. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 584c3d56b70..77e54e079ac 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -561,7 +561,7 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) { FIXME("(%p, %p): stub.\n", iface, token); - return E_NOTIMPL; + return token_create(NULL, &IID_ISpObjectToken, (void **)token); } static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number)

1 0

Nikolay Sivov : mf/evr: Add attributes store for the sink.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: f0c2b0d2fcd20490d806357f3c14083717552f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c2b0d2fcd20490d806357f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:53 2020 +0300 mf/evr: Add attributes store for the sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 353 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 12 ++ 2 files changed, 365 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0c2b0d2fcd20490d806…

1 0

Nikolay Sivov : mf/evr: Add default attributes on sink creation.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 602a3085e3630487b5a1957c1e4a9aab2cbed343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602a3085e3630487b5a1957c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:54 2020 +0300 mf/evr: Add default attributes on sink creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 12 ++++++++++++ dlls/mf/tests/mf.c | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 7665725405e..af9bd9e0e42 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1896,6 +1896,18 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IMFTransform_Release(mixer); IMFVideoPresenter_Release(presenter); + /* Default attributes */ + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceBob, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToBob, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceThrottle, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToThrottle, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceHalfInterlace, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToHalfInterlace, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceScaling, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowScaling, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceBatching, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowBatching, 0); + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fa3d8111338..465bd7e3c43 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3291,7 +3291,6 @@ static void test_evr(void) IUnknown_Release(unk); hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(!!count, "Unexpected count %u.\n", count); IMFAttributes_Release(attributes);

1 0

Nikolay Sivov : evr/tests: Add a mixer tests for clearing output in idle state.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: d91a82ac8db314ff8c04544bf0402434e218b8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91a82ac8db314ff8c04544b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:55 2020 +0300 evr/tests: Add a mixer tests for clearing output in idle state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d0e39cb47c9..9124109c07f 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1994,16 +1994,82 @@ static void test_mixer_zorder(void) IMFTransform_Release(mixer); } +static IDirect3DSurface9 * create_surface(IDirect3DDeviceManager9 *manager, unsigned int width, + unsigned int height) +{ + IDirectXVideoAccelerationService *service; + IDirect3DSurface9 *surface = NULL; + IDirect3DDevice9 *device; + HANDLE handle; + HRESULT hr; + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(service, width, height, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirectXVideoAccelerationService_Release(service); + + hr = IDirect3DDevice9_ColorFill(device, surface, NULL, D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return surface; +} + +/* Format is assumed as 32bpp */ +static DWORD get_surface_color(IDirect3DSurface9 *surface, unsigned int x, unsigned int y) +{ + D3DLOCKED_RECT locked_rect = { 0 }; + D3DSURFACE_DESC desc; + DWORD *row, color; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(x < desc.Width && y < desc.Height, "Invalid coordinate.\n"); + if (x >= desc.Width || y >= desc.Height) return 0; + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + row = (DWORD *)((char *)locked_rect.pBits + y * locked_rect.Pitch); + color = row[x]; + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return color; +} + static void test_mixer_samples(void) { IDirect3DDeviceManager9 *manager; MFT_OUTPUT_DATA_BUFFER buffer; + IDirect3DSurface9 *surface; + IMFDesiredSample *desired; IDirect3DDevice9 *device; IMFMediaType *video_type; + DWORD color, status; IMFTransform *mixer; IMFSample *sample; IDirect3D9 *d3d; - DWORD status; HWND window; UINT token; HRESULT hr; @@ -2030,8 +2096,6 @@ static void test_mixer_samples(void) hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IDirect3DDeviceManager9_Release(manager); - video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); @@ -2052,6 +2116,7 @@ static void test_mixer_samples(void) todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* It needs a sample with a backing surface. */ hr = MFCreateSample(&sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2062,9 +2127,41 @@ todo_wine IMFSample_Release(sample); + surface = create_surface(manager, 64, 64); + + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + buffer.pSample = sample; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); +todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); + ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#x.\n", color); + + /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ + IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); + + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); +todo_wine + ok(!color, "Unexpected color %#x.\n", color); + + IMFSample_Release(sample); + + IDirect3DSurface9_Release(surface); + IMFTransform_Release(mixer); IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); done: IDirect3D9_Release(d3d);

1 0

Jacek Caban : kernel32/tests: Add more FlushConsoleInputBuffer tests.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 591cb80dea8c094539b4bc4ab640b00538c6e06a URL: https://source.winehq.org/git/wine.git/?a=commit;h=591cb80dea8c094539b4bc4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:30 2020 +0200 kernel32/tests: Add more FlushConsoleInputBuffer tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ddd5bfcb4c4..495fa1b9e57 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1970,6 +1970,63 @@ static void test_WriteConsoleInputW(HANDLE input_handle) ok(ret == TRUE, "Expected SetConsoleMode to return TRUE, got %d\n", ret); } +static void test_FlushConsoleInputBuffer(HANDLE input, HANDLE output) +{ + INPUT_RECORD record; + DWORD count; + BOOL ret; + + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + record.EventType = KEY_EVENT; + record.Event.KeyEvent.bKeyDown = 1; + record.Event.KeyEvent.wRepeatCount = 1; + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; + record.Event.KeyEvent.uChar.UnicodeChar = '\r'; + record.Event.KeyEvent.dwControlKeyState = 0; + ret = WriteConsoleInputW(input, &record, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 1, "Expected count to be 0, got %u\n", count); + + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + ret = WriteConsoleInputW(input, &record, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 1, "Expected count to be 0, got %u\n", count); + + ret = FlushFileBuffers(input); + ok(ret, "FlushFileBuffers failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + ret = FlushConsoleInputBuffer(output); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FlushConsoleInputBuffer returned: %x(%u)\n", + ret, GetLastError()); + + ret = FlushFileBuffers(output); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FlushFileBuffers returned: %x(%u)\n", + ret, GetLastError()); +} + static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) { static const char output[] = {'a', 0}; @@ -4269,6 +4326,7 @@ START_TEST(console) test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); + test_FlushConsoleInputBuffer(hConIn, hConOut); test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut);

1 0

Jacek Caban : kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 6f05b299bce211ef11dd5b046da4247e111cb91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f05b299bce211ef11dd5b04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:36 2020 +0200 kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 28 +--------------------------- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2b46fe5589f..f9d24f5c885 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,38 +148,12 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/****************************************************************************** - * read_console_input - * - * Helper function for ReadConsole, ReadConsoleInput and FlushConsoleInputBuffer - * - * Returns - * 0 for error, 1 for no INPUT_RECORD ready, 2 with INPUT_RECORD ready - */ -enum read_console_input_return {rci_error = 0, rci_timeout = 1, rci_gotone = 2}; - -static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) -{ - int blocking = timeout != 0; - DWORD read_bytes; - - if (!DeviceIoControl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), ir, sizeof(*ir), &read_bytes, NULL )) - return rci_error; - return read_bytes ? rci_gotone : rci_timeout; -} - - /*********************************************************************** * FlushConsoleInputBuffer (KERNEL32.@) */ BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) { - enum read_console_input_return last; - INPUT_RECORD ir; - - while ((last = read_console_input(handle, &ir, 0)) == rci_gotone); - - return last == rci_timeout; + return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index eed8bc5bfcf..cf2524edc66 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -39,6 +39,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 18, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_CONDRV_FLUSH CTL_CODE(FILE_DEVICE_CONSOLE, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a93f9be73b2..8fb28e18ba9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2321,8 +2321,8 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return scroll_output( screen_buffer, in_data ); default: - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + WARN( "invalid ioctl %x\n", code ); + return STATUS_INVALID_HANDLE; } } @@ -2439,6 +2439,12 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, } return STATUS_SUCCESS; + case IOCTL_CONDRV_FLUSH: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + TRACE( "flush\n" ); + console->record_count = 0; + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : kernel32: Move FlushConsoleInputBuffer to kernelbase.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: ea8fa3174cba57df1120438724ddb8d41442c2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8fa3174cba57df11204387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:49 2020 +0200 kernel32: Move FlushConsoleInputBuffer to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 9 --------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f9d24f5c885..4b74c1183ca 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,15 +148,6 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/*********************************************************************** - * FlushConsoleInputBuffer (KERNEL32.@) - */ -BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) -{ - return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); -} - - /*********************************************************************** * SetConsoleTitleA (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 08a64955123..79964c7a9b3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -517,7 +517,7 @@ @ stdcall -import FlsFree(long) @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) +@ stdcall -import FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d073b77eaa3..345241a44fd 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1704,6 +1704,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, } +/*********************************************************************** + * FlushConsoleInputBuffer (kernelbase.@) + */ +BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) +{ + return console_ioctl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL ); +} + + /*********************************************************************** * Beep (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e55194f2041..9c7babde7fd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -381,7 +381,7 @@ @ stdcall FlsFree(long) @ stdcall FlsGetValue(long) @ stdcall FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer +@ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers

1 0

Jacek Caban : server: Implement console input flush in server.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 746ece1a086f8fb721766fc8a4677606e722e4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=746ece1a086f8fb721766fc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:43 2020 +0200 server: Implement console input flush in server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 8ac3a08abc7..d1e3cae8919 100644 --- a/server/console.c +++ b/server/console.c @@ -3,6 +3,7 @@ * * Copyright (C) 1998 Alexandre Julliard * 2001 Eric Pouech + * Copyright 2020 Jacek Caban for CodeWeavers * * * This library is free software; you can redistribute it and/or @@ -96,6 +97,7 @@ static const struct object_ops console_input_ops = }; static enum server_fd_type console_get_fd_type( struct fd *fd ); +static int console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_input_fd_ops = @@ -105,7 +107,7 @@ static const struct fd_ops console_input_fd_ops = console_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ no_fd_write, /* write */ - no_fd_flush, /* flush */ + console_input_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ @@ -409,7 +411,7 @@ static int queue_host_ioctl( struct console_server *server, unsigned int code, u list_add_tail( &server->queue, &ioctl->entry ); wake_up( &server->obj, 0 ); if (async) set_error( STATUS_PENDING ); - return 0; + return 1; } static void disconnect_console_server( struct console_server *server ) @@ -831,6 +833,18 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } } +static int console_input_flush( struct fd *fd, struct async *async ) +{ + struct console_input *console = get_fd_user( fd ); + + if (!console->server) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); +} + static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct screen_buffer *screen_buffer = get_fd_user( fd );

1 0

Jacek Caban : kernel32: Import FlushFileBuffers from kernelbase.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 7fe55d2f7a66d60f3bf4890f59311920f1cc3608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe55d2f7a66d60f3bf4890f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:53 2020 +0200 kernel32: Import FlushFileBuffers from kernelbase. Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 14 -------------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4ba80a624d8..dfedb443412 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -319,20 +319,6 @@ BOOL WINAPI KERNEL32_WriteFile( HANDLE file, LPCVOID buffer, DWORD count, } -/************************************************************************* - * FlushFileBuffers (KERNEL32.@) - */ -BOOL WINAPI KERNEL32_FlushFileBuffers( HANDLE file ) -{ - IO_STATUS_BLOCK iosb; - - /* this will fail (as expected) for an output handle */ - if (is_console_handle( file )) return FlushConsoleInputBuffer( file ); - - return set_ntstatus( NtFlushBuffersFile( file, &iosb )); -} - - /*********************************************************************** * DosDateTimeToFileTime (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 79964c7a9b3..5508a10f9a0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -518,7 +518,7 @@ @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) @ stdcall -import FlushConsoleInputBuffer(long) -@ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers +@ stdcall -import FlushFileBuffers(long) @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall -import FlushViewOfFile(ptr long)

1 0

Jacek Caban : conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 01c17ca26027d055c5e983c8d76d60647bf7f24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c17ca26027d055c5e983c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:59 2020 +0200 conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 3 +-- programs/conhost/conhost.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 345241a44fd..2b3c6c3315a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1373,8 +1373,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length */ BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) { - int blocking = 1; - if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), + if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, NULL, 0, buffer, length * sizeof(*buffer), count )) return FALSE; *count /= sizeof(*buffer); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8fb28e18ba9..3b4255ea310 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_INPUT: { - unsigned int blocking; - if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; + if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - blocking = in_size && *(unsigned int *)in_data; - if (blocking && !console->record_count && *out_size) + if (!console->record_count && *out_size) { TRACE( "pending read\n" ); console->read_ioctl = IOCTL_CONDRV_READ_INPUT;

1 0