wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : strmbase: Remove some no longer used callbacks.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: af50b499cb776c25368224b0910778d05a066e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af50b499cb776c25368224b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:30 2020 -0500 strmbase: Remove some no longer used callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 86 ++++++++++++++---------------------------------- include/wine/strmbase.h | 10 ------ 2 files changed, 25 insertions(+), 71 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 939811bfa9..1f0a747a2c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -194,7 +194,6 @@ static HRESULT sink_eos(struct strmbase_sink *iface) struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; - HRESULT hr = S_OK; EnterCriticalSection(&filter->csRenderLock); @@ -210,11 +209,8 @@ static HRESULT sink_eos(struct strmbase_sink *iface) strmbase_passthrough_eos(&filter->passthrough); SetEvent(filter->state_event); - if (filter->pFuncsTable->pfnEndOfStream) - hr = filter->pFuncsTable->pfnEndOfStream(filter); - LeaveCriticalSection(&filter->csRenderLock); - return hr; + return S_OK; } static HRESULT sink_begin_flush(struct strmbase_sink *iface) @@ -229,7 +225,6 @@ static HRESULT sink_begin_flush(struct strmbase_sink *iface) static HRESULT sink_end_flush(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; EnterCriticalSection(&filter->csRenderLock); @@ -238,11 +233,8 @@ static HRESULT sink_end_flush(struct strmbase_sink *iface) strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event); - if (filter->pFuncsTable->pfnEndFlush) - hr = filter->pFuncsTable->pfnEndFlush(filter); - LeaveCriticalSection(&filter->csRenderLock); - return hr; + return S_OK; } static const struct strmbase_sink_ops sink_ops = @@ -277,9 +269,9 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSample *pSample) { - HRESULT hr = S_OK; REFERENCE_TIME start, stop; AM_MEDIA_TYPE *pmt; + HRESULT hr; TRACE("(%p)->%p\n", This, pSample); @@ -301,16 +293,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa DeleteMediaType(pmt); } - if (This->pFuncsTable->pfnPrepareReceive) - hr = This->pFuncsTable->pfnPrepareReceive(This, pSample); - if (FAILED(hr)) - { - if (hr == VFW_E_SAMPLE_REJECTED) - return S_OK; - else - return hr; - } - EnterCriticalSection(&This->csRenderLock); if (This->filter.state == State_Paused) SetEvent(This->state_event); @@ -318,59 +300,41 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa /* Wait for render Time */ if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { - hr = S_FALSE; - strmbase_passthrough_update_time(&This->passthrough, start); - if (This->pFuncsTable->pfnShouldDrawSampleNow) - hr = This->pFuncsTable->pfnShouldDrawSampleNow(This, pSample, &start, &stop); - - if (hr == S_OK) - ;/* Do not wait: drop through */ - else if (hr == S_FALSE) - { - REFERENCE_TIME now; - DWORD_PTR cookie; + REFERENCE_TIME now; + DWORD_PTR cookie; - IReferenceClock_GetTime(This->filter.clock, &now); + strmbase_passthrough_update_time(&This->passthrough, start); - if (now - This->stream_start - start <= -10000) - { - HANDLE handles[2] = {This->advise_event, This->flush_event}; - DWORD ret; + IReferenceClock_GetTime(This->filter.clock, &now); - IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, - start, (HEVENT)This->advise_event, &cookie); + if (now - This->stream_start - start <= -10000) + { + HANDLE handles[2] = {This->advise_event, This->flush_event}; + DWORD ret; - LeaveCriticalSection(&This->csRenderLock); + IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, + start, (HEVENT)This->advise_event, &cookie); - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.clock, cookie); + LeaveCriticalSection(&This->csRenderLock); - if (ret == 1) - { - TRACE("Flush signaled, discarding current sample.\n"); - return S_OK; - } + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + IReferenceClock_Unadvise(This->filter.clock, cookie); - EnterCriticalSection(&This->csRenderLock); + if (ret == 1) + { + TRACE("Flush signaled, discarding current sample.\n"); + return S_OK; } - } - else - { - LeaveCriticalSection(&This->csRenderLock); - /* Drop Sample */ - return S_OK; + + EnterCriticalSection(&This->csRenderLock); } } else start = stop = -1; - if (SUCCEEDED(hr)) - { - QualityControlRender_BeginRender(&This->qc, start, stop); - hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(&This->qc); - } - + QualityControlRender_BeginRender(&This->qc, start, stop); + hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + QualityControlRender_EndRender(&This->qc); QualityControlRender_DoQOS(&This->qc); LeaveCriticalSection(&This->csRenderLock); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9c3cdc4ac5..9e0d4e7d47 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -318,12 +318,6 @@ struct strmbase_renderer typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); -typedef HRESULT (WINAPI *BaseRenderer_ShouldDrawSampleNow)(struct strmbase_renderer *iface, - IMediaSample *sample, REFERENCE_TIME *start, REFERENCE_TIME *end); -typedef HRESULT (WINAPI *BaseRenderer_PrepareReceive)(struct strmbase_renderer *iface, IMediaSample *sample); -typedef HRESULT (WINAPI *BaseRenderer_EndOfStream)(struct strmbase_renderer *iface); -typedef HRESULT (WINAPI *BaseRenderer_BeginFlush) (struct strmbase_renderer *iface); -typedef HRESULT (WINAPI *BaseRenderer_EndFlush) (struct strmbase_renderer *iface); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); struct strmbase_renderer_ops @@ -333,12 +327,8 @@ struct strmbase_renderer_ops void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); - BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; - BaseRenderer_PrepareReceive pfnPrepareReceive; HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); BaseRenderer_BreakConnect pfnBreakConnect; - BaseRenderer_EndOfStream pfnEndOfStream; - BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);

1 0

Zebediah Figura : quartz/dsoundrender: Reimplement the DirectSound renderer directly on top of the strmbase filter.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 9f467402df4c9fb0a4e20ccd35d86d817936a8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f467402df4c9fb0a4e20ccd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:29 2020 -0500 quartz/dsoundrender: Reimplement the DirectSound renderer directly on top of the strmbase filter. The DirectSound renderer does a lot of things differently. To a large degree this is to be expected; it's an audio renderer and therefore needs to buffer much farther in advance. However, it also doesn't participate in quality management, doesn't block in Receive(), and has a few other mild differences in behaviour. Weighing the features implemented by the base renderer against the quirks necessary for the DirectSound renderer leads me to believe that it would be easier not to use that framework. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 438 +++++++++++++++++++++++++++++---------- dlls/quartz/tests/dsoundrender.c | 3 +- dlls/strmbase/strmbase_private.h | 4 - include/wine/strmbase.h | 4 + 4 files changed, 333 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f467402df4c9fb0a4e2…

1 0

Zebediah Figura : quartz/vmr9: Render preroll samples.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: b9063c4b7e73d5fad19741c3ec0c485ca0e5b499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9063c4b7e73d5fad19741c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:28 2020 -0500 quartz/vmr9: Render preroll samples. The documentation specifies that preroll samples shouldn't be rendered, but the VMR9 renders them anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/vmr9.c | 16 ---------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index cf4675ce06..f1b19aa663 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -983,6 +983,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cd4df58f79..e630deb8d7 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1011,6 +1011,9 @@ static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, DWO hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index aeaefd52c6..a3f5501106 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -244,12 +244,6 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi if (IMediaSample_IsSyncPoint(sample) == S_OK) info.dwFlags |= VMR9Sample_SyncPoint; - /* If we render ourselves, and this is a preroll sample, discard it */ - if (info.dwFlags & VMR9Sample_Preroll) - { - return S_OK; - } - if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) { ERR("Failed to get pointer to sample data, hr %#x.\n", hr); @@ -504,15 +498,6 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) ResetEvent(This->run_event); } -static HRESULT WINAPI VMR9_ShouldDrawSampleNow(struct strmbase_renderer *iface, - IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) -{ - /* Preroll means the sample isn't shown, this is used for key frames and things like that */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - return E_FAIL; - return S_FALSE; -} - static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -668,7 +653,6 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, - .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .renderer_connect = vmr_connect, .pfnBreakConnect = VMR9_BreakConnect, .renderer_destroy = vmr_destroy,

1 0

Zebediah Figura : quartz/videorenderer: Render preroll samples.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 72f94724922e4db4fb932e404f2f642fef0642e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f94724922e4db4fb932e40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:27 2020 -0500 quartz/videorenderer: Render preroll samples. The documentation specifies that preroll samples shouldn't be rendered, but the video renderer renders them anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/videorenderer.c | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4ae320e022..ac2cadc4b1 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -797,6 +797,9 @@ static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, uns hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f635d9eaac..eb6accf2d3 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,15 +82,6 @@ static void VideoRenderer_AutoShowWindow(struct video_renderer *This) ShowWindow(This->window.hwnd, SW_SHOW); } -static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, - IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) -{ - /* Preroll means the sample isn't shown, this is used for key frames and things like that */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - return E_FAIL; - return S_FALSE; -} - static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); @@ -253,7 +244,6 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_init_stream = video_renderer_init_stream, .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, - .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, .renderer_pin_query_interface = video_renderer_pin_query_interface,

1 0

Jacek Caban : server: Remove no longer used code from set_console_input_info.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: fc7dae4ba5edd734bb0ffc7318dcc659d1797f2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7dae4ba5edd734bb0ffc73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:39:13 2020 +0200 server: Remove no longer used code from set_console_input_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/server/console.c b/server/console.c index a348ed5bca..3a3260645d 100644 --- a/server/console.c +++ b/server/console.c @@ -849,42 +849,6 @@ static int set_console_input_info( const struct set_console_input_info_request * evt.event = CONSOLE_RENDERER_TITLE_EVENT; console_input_events_append( console, &evt ); } - if (req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) - { - console->history_mode = req->history_mode; - } - if ((req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && - console->history_size != req->history_size) - { - struct history_line **mem = NULL; - int i, delta; - - if (req->history_size) - { - if (!(mem = mem_alloc( req->history_size * sizeof(*mem) ))) goto error; - memset( mem, 0, req->history_size * sizeof(*mem) ); - } - - delta = (console->history_index > req->history_size) ? - (console->history_index - req->history_size) : 0; - - for (i = delta; i < console->history_index; i++) - { - mem[i - delta] = console->history[i]; - console->history[i] = NULL; - } - console->history_index -= delta; - - for (i = 0; i < console->history_size; i++) - free( console->history[i] ); - free( console->history ); - console->history = mem; - console->history_size = req->history_size; - } - if (req->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) - { - console->edition_mode = req->edition_mode; - } if (req->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) { console->input_cp = req->input_cp; @@ -893,10 +857,6 @@ static int set_console_input_info( const struct set_console_input_info_request * { console->output_cp = req->output_cp; } - if (req->mask & SET_CONSOLE_INPUT_INFO_WIN) - { - console->win = req->win; - } release_object( console ); return 1; error:

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO to set console window handle.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 2fc11e8952bff715115425346d0ccbaed146bcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc11e8952bff71511542534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:50 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO to set console window handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1fad63d72c..eaf67f8875 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -613,6 +613,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna enum init_return (*backend)(struct inner_data*), INT nCmdShow) { + struct condrv_input_info_params input_params; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; struct inner_data* data = NULL; DWORD ret; @@ -719,12 +720,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg); + + memset(&input_params, 0, sizeof(input_params)); + input_params.mask = SET_CONSOLE_INPUT_INFO_WIN; + input_params.info.win = condrv_handle(data->hWnd); + ret = DeviceIoControl(data->hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &input_params, sizeof(input_params), + NULL, 0, NULL, NULL); + if (!ret) goto error; + SERVER_START_REQ( set_console_input_info ) { req->handle = wine_server_obj_handle( data->hConIn ); - req->win = wine_server_user_handle( data->hWnd ); - req->mask = SET_CONSOLE_INPUT_INFO_TITLE | - SET_CONSOLE_INPUT_INFO_WIN; + req->mask = SET_CONSOLE_INPUT_INFO_TITLE; wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); }

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetEditionMode.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 96c5109a0f1a4b203e2a0575764a2577f5270c52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c5109a0f1a4b203e2a0575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:26 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetEditionMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 2ad9cc84ee..1fad63d72c 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -173,17 +173,9 @@ BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len) */ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) { - BOOL ret; - - SERVER_START_REQ( set_console_input_info ) - { - req->handle = wine_server_obj_handle( hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_EDITION_MODE; - req->edition_mode = edition_mode; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_EDITION_MODE }; + params.info.edition_mode = edition_mode; + return DeviceIoControl(hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistoryMode.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: bd12ec5dfff885a1bd5a5d05b2ec48129e6f4398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd12ec5dfff885a1bd5a5d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:18 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistoryMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 35c2f8e92d..2ad9cc84ee 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -128,17 +128,9 @@ static BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) */ static BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode) { - BOOL ret; - - SERVER_START_REQ(set_console_input_info) - { - req->handle = wine_server_obj_handle( hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_HISTORY_MODE; - req->history_mode = mode; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_HISTORY_MODE }; + params.info.history_mode = mode; + return DeviceIoControl(hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistorySize.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: abe5fda90d918e0efbc0f4e122eee7cf637a2e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=abe5fda90d918e0efbc0f4e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:11 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistorySize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 4e0309f18b..35c2f8e92d 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -116,17 +116,9 @@ void WINECON_ResizeWithContainer(struct inner_data* data, int width, int height) */ static BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) { - BOOL ret; - - SERVER_START_REQ(set_console_input_info) - { - req->handle = wine_server_obj_handle( hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_HISTORY_SIZE; - req->history_size = size; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_HISTORY_SIZE }; + params.info.history_size = size; + return DeviceIoControl(hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_INPUT_INFO ioctl.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: dcd02876ea73f65dc286038f0f70189c4994152f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd02876ea73f65dc286038f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:00 2020 +0200 server: Introduce IOCTL_CONDRV_SET_INPUT_INFO ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 11 +++++++++ server/console.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index fedf3f308c..f6888443c9 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -32,6 +32,7 @@ #define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) /* console output ioctls */ @@ -64,10 +65,20 @@ typedef struct /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { + unsigned int input_cp; /* console input codepage */ + unsigned int output_cp; /* console output codepage */ unsigned int history_mode; /* whether we duplicate lines in history */ unsigned int history_size; /* number of lines in history */ unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ + condrv_handle_t win; /* renderer window handle */ +}; + +/* IOCTL_CONDRV_SET_INPUT_INFO params */ +struct condrv_input_info_params +{ + unsigned int mask; /* setting mask */ + struct condrv_input_info info; /* input_info */ }; /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ diff --git a/server/console.c b/server/console.c index 3c562cb507..a348ed5bca 100644 --- a/server/console.c +++ b/server/console.c @@ -1577,13 +1577,75 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * set_error( STATUS_INVALID_PARAMETER ); return 0; } + info.input_cp = console->input_cp; + info.output_cp = console->output_cp; info.history_mode = console->history_mode; info.history_size = console->history_size; info.edition_mode = console->edition_mode; info.input_count = console->recnum; + info.win = console->win; return set_reply_data( &info, sizeof(info) ) != NULL; } + case IOCTL_CONDRV_SET_INPUT_INFO: + { + const struct condrv_input_info_params *params = get_req_data(); + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) + { + console->history_mode = params->info.history_mode; + } + if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && + console->history_size != params->info.history_size) + { + struct history_line **mem = NULL; + int i, delta; + + if (params->info.history_size) + { + if (!(mem = mem_alloc( params->info.history_size * sizeof(*mem) ))) return 0; + memset( mem, 0, params->info.history_size * sizeof(*mem) ); + } + + delta = (console->history_index > params->info.history_size) ? + (console->history_index - params->info.history_size) : 0; + + for (i = delta; i < console->history_index; i++) + { + mem[i - delta] = console->history[i]; + console->history[i] = NULL; + } + console->history_index -= delta; + + for (i = 0; i < console->history_size; i++) + free( console->history[i] ); + free( console->history ); + console->history = mem; + console->history_size = params->info.history_size; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) + { + console->edition_mode = params->info.edition_mode; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + console->input_cp = params->info.input_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + console->output_cp = params->info.output_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) + { + console->win = params->info.win; + } + return 1; + } + case IOCTL_CONDRV_GET_TITLE: if (!console->title_len) return 1; return set_reply_data( console->title, min( console->title_len, get_reply_max_size() )) != NULL;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020