wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Zebediah Figura : winegstreamer: Don't query the pad position in IMediaSeeking::SetPositions().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 54d74a053b6540f3f3aeb4242f09dd02bc4e3ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d74a053b6540f3f3aeb424… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:00 2020 -0600 winegstreamer: Don't query the pad position in IMediaSeeking::SetPositions(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 80 ++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6d66ddcb167..e227ed9331d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1897,63 +1897,43 @@ static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) return IPin_Release(&This->pin.pin.IPin_iface); } -static GstSeekType type_from_flags(DWORD flags) -{ - switch (flags & AM_SEEKING_PositioningBitsMask) { - case AM_SEEKING_NoPositioning: - return GST_SEEK_TYPE_NONE; - case AM_SEEKING_AbsolutePositioning: - case AM_SEEKING_RelativePositioning: - return GST_SEEK_TYPE_SET; - case AM_SEEKING_IncrementalPositioning: - return GST_SEEK_TYPE_END; - } - return GST_SEEK_TYPE_NONE; -} - static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, - REFERENCE_TIME *pCur, DWORD curflags, REFERENCE_TIME *pStop, - DWORD stopflags) + LONGLONG *current, DWORD current_flags, LONGLONG *stop, DWORD stop_flags) { - HRESULT hr; - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); - GstSeekFlags f = 0; - GstSeekType curtype, stoptype; - GstEvent *e; - gint64 stop_pos = 0, curr_pos = 0; + GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; + struct gstdemux_source *pin = impl_from_IMediaSeeking(iface); + GstSeekFlags flags = 0; - TRACE("(%p)->(%p, 0x%x, %p, 0x%x)\n", This, pCur, curflags, pStop, stopflags); + TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", + pin, current ? debugstr_time(*current) : "<null>", current_flags, + stop ? debugstr_time(*stop) : "<null>", stop_flags); mark_wine_thread(); - hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); - if (This->pin.pin.filter->state == State_Stopped) - return hr; - - curtype = type_from_flags(curflags); - stoptype = type_from_flags(stopflags); - if (curflags & AM_SEEKING_SeekToKeyFrame) - f |= GST_SEEK_FLAG_KEY_UNIT; - if (curflags & AM_SEEKING_Segment) - f |= GST_SEEK_FLAG_SEGMENT; - if (!(curflags & AM_SEEKING_NoFlush)) - f |= GST_SEEK_FLAG_FLUSH; - - if (((curflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning) || - ((stopflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning)) { - gint64 tmp_pos; - gst_pad_query_position (This->my_sink, GST_FORMAT_TIME, &tmp_pos); - if ((curflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning) - curr_pos = tmp_pos; - if ((stopflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning) - stop_pos = tmp_pos; - } - - e = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, f, curtype, pCur ? curr_pos + *pCur * 100 : -1, stoptype, pStop ? stop_pos + *pStop * 100 : -1); - if (gst_pad_push_event(This->my_sink, e)) + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); + if (pin->pin.pin.filter->state == State_Stopped) return S_OK; - else - return E_NOTIMPL; + + if (current_flags & AM_SEEKING_SeekToKeyFrame) + flags |= GST_SEEK_FLAG_KEY_UNIT; + if (current_flags & AM_SEEKING_Segment) + flags |= GST_SEEK_FLAG_SEGMENT; + if (!(current_flags & AM_SEEKING_NoFlush)) + flags |= GST_SEEK_FLAG_FLUSH; + + if ((current_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) + current_type = GST_SEEK_TYPE_NONE; + if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) + stop_type = GST_SEEK_TYPE_NONE; + + if (!gst_pad_push_event(pin->my_sink, gst_event_new_seek(pin->seek.dRate, GST_FORMAT_TIME, flags, + current_type, pin->seek.llCurrent * 100, stop_type, pin->seek.llStop * 100))) + { + ERR("Failed to seek (current %s, stop %s).\n", + debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); + return E_FAIL; + } + return S_OK; } static const IMediaSeekingVtbl GST_Seeking_Vtbl =

1 0

Zebediah Figura : winegstreamer: Return the seeking start time from IMediaSeeking::GetCurrentPosition().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 1bb7ef1c1a47ec18b1d4b4124667f6ca93388274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb7ef1c1a47ec18b1d4b412… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:59 2020 -0600 winegstreamer: Return the seeking start time from IMediaSeeking::GetCurrentPosition(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 7 +++---- dlls/quartz/tests/mpegsplit.c | 7 +++---- dlls/winegstreamer/gstdemux.c | 29 +---------------------------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 4ebc3d5df9a..7ded1773637 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -931,8 +931,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine_if (start != filter->seek_start) - ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); + ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); ok(end == filter->seek_end, "Expected end position %I64u, got %I64u.\n", filter->seek_end, end); IMediaSeeking_Release(seeking); @@ -1696,7 +1695,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); testsink.sample_count = testsink.eos_count = 0; @@ -1712,7 +1711,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); IMediaSeeking_Release(seeking); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index a334467ad70..be971897f99 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1220,8 +1220,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine_if (start != filter->seek_start) - ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); + ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); ok(end == filter->seek_end, "Expected end position %I64u, got %I64u.\n", filter->seek_end, end); IMediaSeeking_Release(seeking); @@ -1863,7 +1862,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); testsink.sample_count = testsink.eos_count = 0; @@ -1879,7 +1878,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); IMediaSeeking_Release(seeking); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 215e2704a27..6d66ddcb167 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1897,33 +1897,6 @@ static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) return IPin_Release(&This->pin.pin.IPin_iface); } -static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFERENCE_TIME *pos) -{ - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p)->(%p)\n", This, pos); - - if (!pos) - return E_POINTER; - - mark_wine_thread(); - - if (This->pin.pin.filter->state == State_Stopped) - { - *pos = This->seek.llCurrent; - TRACE("Cached value\n"); - return S_OK; - } - - if (!gst_pad_query_position(This->their_src, GST_FORMAT_TIME, pos)) { - WARN("Could not query position\n"); - return E_NOTIMPL; - } - *pos /= 100; - This->seek.llCurrent = *pos; - return S_OK; -} - static GstSeekType type_from_flags(DWORD flags) { switch (flags & AM_SEEKING_PositioningBitsMask) { @@ -1997,7 +1970,7 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = SourceSeekingImpl_SetTimeFormat, SourceSeekingImpl_GetDuration, SourceSeekingImpl_GetStopPosition, - GST_Seeking_GetCurrentPosition, + SourceSeekingImpl_GetCurrentPosition, SourceSeekingImpl_ConvertTimeFormat, GST_Seeking_SetPositions, SourceSeekingImpl_GetPositions,

1 0

Zebediah Figura : quartz/tests: Add some tests for parser streaming.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: b04c0a56e38b1d429163e42d9db049f80d93d1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b04c0a56e38b1d429163e42d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:58 2020 -0600 quartz/tests: Add some tests for parser streaming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 150 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 150 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b04c0a56e38b1d429163…

1 0

Zebediah Figura : quartz/tests: Add some tests for IMediaSeeking on parser filters.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 08026a2c664c74d7a2603eca2b0d396635c4106e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08026a2c664c74d7a2603eca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:57 2020 -0600 quartz/tests: Add some tests for IMediaSeeking on parser filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 207 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 193 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.avi | Bin 6938 -> 11642 bytes dlls/quartz/tests/waveparser.c | 210 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 611 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08026a2c664c74d7a260…

1 0

Zebediah Figura : quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 9281b542ff445ef69f7880b2e3435415de57bcaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9281b542ff445ef69f7880b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:56 2020 -0600 quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 142 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 558e6989c98..c33c074d93d 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -877,6 +877,147 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control ok(hr == S_OK, "Got hr %#x.\n", hr); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = send_frame(input); + todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 2000); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); +} + static void test_connect_pin(void) { ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; @@ -971,6 +1112,7 @@ static void test_connect_pin(void) test_filter_state(input, control); test_flushing(pin, input, control); + test_eos(pin, input, control); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Jacek Caban : server: Remove no longer needed hack for inheriting console from stdin.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: c1bfa103a2e72149f6326e4d2926dd109172e0d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1bfa103a2e72149f6326e4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:40:40 2020 +0100 server: Remove no longer needed hack for inheriting console from stdin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 30 ------------------------------ server/process.c | 12 +++--------- server/process.h | 2 -- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/server/console.c b/server/console.c index 799d31c6fde..9190dcc02dd 100644 --- a/server/console.c +++ b/server/console.c @@ -595,36 +595,6 @@ int free_console( struct process *process ) return 1; } -/* let process inherit the console from parent... this handle two cases : - * 1/ generic console inheritance - * 2/ parent is a renderer which launches process, and process should attach to the console - * rendered by parent - */ -obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, struct process *process, - obj_handle_t hconin ) -{ - struct console_input *console = NULL; - - if (handle) return duplicate_handle( current->process, handle, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); - - /* if parent is a renderer, then attach current process to its console - * a bit hacky.... - */ - if (hconin && parent_thread) - { - /* FIXME: should we check some access rights ? */ - if (!(console = (struct console_input *)get_handle_obj( parent_thread->process, hconin, - 0, &console_input_ops ))) - clear_error(); /* ignore error */ - } - if (!console) return 0; - - process->console = console; - console->num_proc++; - return alloc_handle( process, process->console, - SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, 0 ); -} - struct thread *console_get_renderer( struct console_input *console ) { return console->renderer; diff --git a/server/process.c b/server/process.c index 1786493a814..d5b9a2548cf 100644 --- a/server/process.c +++ b/server/process.c @@ -1254,15 +1254,9 @@ DECL_HANDLER(new_process) connect_process_winstation( process, parent_thread, parent ); /* set the process console */ - if (!(req->create_flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE))) - { - /* FIXME: some better error checking should be done... - * like if hConOut and hConIn are console handles, then they should be on the same - * physical console - */ - info->data->console = inherit_console( parent_thread, info->data->console, - process, req->inherit_all ? info->data->hstdin : 0 ); - } + if (info->data->console > 3) + info->data->console = duplicate_handle( parent, info->data->console, process, + 0, 0, DUPLICATE_SAME_ACCESS ); if (!req->inherit_all && !(req->create_flags & CREATE_NEW_CONSOLE)) { diff --git a/server/process.h b/server/process.h index 56092e5b1ac..7e8c1d3beb7 100644 --- a/server/process.h +++ b/server/process.h @@ -132,8 +132,6 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, - struct process *process, obj_handle_t hconin ); extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console_input *console );

1 0

Jacek Caban : server: Support FileFsDeviceInformation queries on console handles.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 8ca9b44fd1ce98c4fa8e61ad4f7028a29a1a6a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca9b44fd1ce98c4fa8e61ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:40:19 2020 +0100 server: Support FileFsDeviceInformation queries on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 20 ++++++++++++++++++++ server/console.c | 27 +++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1a86aedbc82..0376d00892e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -23,6 +23,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winternl.h> +#include <winioctl.h> #include <stdio.h> #include "wine/test.h" @@ -3945,8 +3946,10 @@ static void test_console_title(void) static void test_file_info(HANDLE input, HANDLE output) { FILE_STANDARD_INFORMATION std_info; + FILE_FS_DEVICE_INFORMATION fs_info; LARGE_INTEGER size; IO_STATUS_BLOCK io; + DWORD type; NTSTATUS status; BOOL ret; @@ -3965,6 +3968,23 @@ static void test_file_info(HANDLE input, HANDLE output) ret = GetFileSizeEx(output, &size); ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); + + status = NtQueryVolumeInformationFile(input, &io, &fs_info, sizeof(fs_info), FileFsDeviceInformation); + ok(!status, "NtQueryVolumeInformationFile failed: %#x\n", status); + ok(fs_info.DeviceType == FILE_DEVICE_CONSOLE, "DeviceType = %u\n", fs_info.DeviceType); + ok(fs_info.Characteristics == FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL, + "Characteristics = %x\n", fs_info.Characteristics); + + status = NtQueryVolumeInformationFile(output, &io, &fs_info, sizeof(fs_info), FileFsDeviceInformation); + ok(!status, "NtQueryVolumeInformationFile failed: %#x\n", status); + ok(fs_info.DeviceType == FILE_DEVICE_CONSOLE, "DeviceType = %u\n", fs_info.DeviceType); + ok(fs_info.Characteristics == FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL, + "Characteristics = %x\n", fs_info.Characteristics); + + type = GetFileType(input); + ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); + type = GetFileType(output); + ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); } static void test_AttachConsole_child(DWORD console_pid) diff --git a/server/console.c b/server/console.c index cecd1455d60..799d31c6fde 100644 --- a/server/console.c +++ b/server/console.c @@ -99,6 +99,7 @@ static const struct object_ops console_input_ops = static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); +static void console_get_volume_info( struct fd *fd, unsigned int info_class ); static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); 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 ); @@ -112,7 +113,7 @@ static const struct fd_ops console_input_fd_ops = no_fd_write, /* write */ console_input_flush, /* flush */ console_get_file_info, /* get_file_info */ - no_fd_get_volume_info, /* get_volume_info */ + console_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ @@ -250,7 +251,7 @@ static const struct fd_ops screen_buffer_fd_ops = screen_buffer_write, /* write */ no_fd_flush, /* flush */ console_get_file_info, /* get_file_info */ - no_fd_get_volume_info, /* get_volume_info */ + console_get_volume_info, /* get_volume_info */ screen_buffer_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ @@ -426,6 +427,28 @@ static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned set_error( STATUS_INVALID_DEVICE_REQUEST ); } +static void console_get_volume_info( struct fd *fd, unsigned int info_class ) +{ + switch (info_class) + { + case FileFsDeviceInformation: + { + static const FILE_FS_DEVICE_INFORMATION device_info = + { + FILE_DEVICE_CONSOLE, + FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL + }; + if (get_reply_max_size() >= sizeof(device_info)) + set_reply_data( &device_info, sizeof(device_info) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + break; + } + default: + set_error( STATUS_NOT_IMPLEMENTED ); + } +} + static struct object *create_console_input(void) { struct console_input *console_input;

1 0

Jacek Caban : kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: a055f4128657f473e1ceec1aaa7cbbe61d3851b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a055f4128657f473e1ceec1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:40:04 2020 +0100 kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- dlls/kernelbase/file.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5943213fb17..1a86aedbc82 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3959,12 +3959,10 @@ static void test_file_info(HANDLE input, HANDLE output) ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status); ret = GetFileSizeEx(input, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); ret = GetFileSizeEx(output, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index b265866ac54..bfa44b4da50 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3047,12 +3047,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileSizeEx( HANDLE file, PLARGE_INTEGER size ) FILE_STANDARD_INFORMATION info; IO_STATUS_BLOCK io; - if (is_console_handle( file )) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - if (!set_ntstatus( NtQueryInformationFile( file, &io, &info, sizeof(info), FileStandardInformation ))) return FALSE;

1 0

Jacek Caban : server: Properly handle NtQueryInformationFile on console handles.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 382b2072e35e921e2697bfb3e54444cd97269e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=382b2072e35e921e2697bfb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:39:44 2020 +0100 server: Properly handle NtQueryInformationFile on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 28 ++++++++++++++++++++++++++++ server/console.c | 10 ++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a306a5144a3..5943213fb17 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3942,6 +3942,33 @@ static void test_console_title(void) } } +static void test_file_info(HANDLE input, HANDLE output) +{ + FILE_STANDARD_INFORMATION std_info; + LARGE_INTEGER size; + IO_STATUS_BLOCK io; + NTSTATUS status; + BOOL ret; + + if (skip_nt) return; + + status = NtQueryInformationFile(input, &io, &std_info, sizeof(std_info), FileStandardInformation); + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status); + + status = NtQueryInformationFile(output, &io, &std_info, sizeof(std_info), FileStandardInformation); + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status); + + ret = GetFileSizeEx(input, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, + "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); + + ret = GetFileSizeEx(output, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, + "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -4479,6 +4506,7 @@ START_TEST(console) } test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); + test_file_info(hConIn, hConOut); test_console_title(); if (!test_current) { diff --git a/server/console.c b/server/console.c index 48f92dd66e6..cecd1455d60 100644 --- a/server/console.c +++ b/server/console.c @@ -98,6 +98,7 @@ static const struct object_ops console_input_ops = }; static enum server_fd_type console_get_fd_type( struct fd *fd ); +static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); 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 ); @@ -110,7 +111,7 @@ static const struct fd_ops console_input_fd_ops = console_input_read, /* read */ no_fd_write, /* write */ console_input_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + console_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -248,7 +249,7 @@ static const struct fd_ops screen_buffer_fd_ops = no_fd_read, /* read */ screen_buffer_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + console_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ screen_buffer_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -420,6 +421,11 @@ static enum server_fd_type console_get_fd_type( struct fd *fd ) return FD_TYPE_CHAR; } +static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) +{ + set_error( STATUS_INVALID_DEVICE_REQUEST ); +} + static struct object *create_console_input(void) { struct console_input *console_input;

1 0

Zebediah Figura : ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 74ec9773dd3892f34003811cdee7da3e47a550c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ec9773dd3892f34003811c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 20 18:10:02 2020 -0600 ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50105 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 368448c9f8d..ff5a175027c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -608,19 +608,20 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS const IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; WINE_MODREF *wm; - WCHAR mod_name[32]; + WCHAR buffer[32], *mod_name = buffer; const char *end = strrchr(forward, '.'); FARPROC proc = NULL; if (!end) return NULL; - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name)) return NULL; + if ((end - forward) * sizeof(WCHAR) > sizeof(buffer) - sizeof(dllW)) + { + if (!(mod_name = RtlAllocateHeap( GetProcessHeap(), 0, (end - forward + sizeof(dllW)) * sizeof(WCHAR) ))) + return NULL; + } ascii_to_unicode( mod_name, forward, end - forward ); mod_name[end - forward] = 0; if (!wcschr( mod_name, '.' )) - { - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name) - sizeof(dllW)) return NULL; memcpy( mod_name + (end - forward), dllW, sizeof(dllW) ); - } if (!(wm = find_basename_module( mod_name ))) { @@ -642,6 +643,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!wm) { + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); ERR( "module not found for forward '%s' used by %s\n", forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); return NULL; @@ -664,6 +666,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer), debugstr_w(get_modref(module)->ldr.BaseDllName.Buffer) ); } + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); return proc; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
86
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 November 2020