November 2020 - Wine-Commits

Jacek Caban : makedep: Use short debug file names.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: e84394764ab29864ed85ea03e5822c57b01b9dd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84394764ab29864ed85ea03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 18:43:36 2020 +0100 makedep: Use short debug file names. Fixes gitignore entries for symbol files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c30c21ff27d..cee64fd61bf 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3077,8 +3077,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( "-shared" ); output_filename( source->filename ); output_filename( obj_name ); - if ((debug_file = get_debug_file( make, output_file ))) - output_filename( strmake( "-Wl,--debug-file,%s", debug_file )); + if ((debug_file = get_debug_file( make, dll_name ))) + output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); @@ -3293,7 +3293,7 @@ static void output_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s", make->module )); add_install_rule( make, make->module, strmake( "%s", make->module ), strmake( "c$(dlldir)/%s", make->module )); - debug_file = get_debug_file( make, module_path ); + debug_file = get_debug_file( make, make->module ); output( "%s:", module_path ); } else if (*dll_ext) @@ -3316,7 +3316,7 @@ static void output_module( struct makefile *make ) strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); - debug_file = get_debug_file( make, module_path ); + debug_file = get_debug_file( make, make->module ); output( "%s:", module_path ); } @@ -3337,7 +3337,7 @@ static void output_module( struct makefile *make ) output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); - if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", debug_file )); + if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); @@ -3551,8 +3551,8 @@ static void output_test_module( struct makefile *make ) output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); - if ((debug_file = get_debug_file( make, output_file ))) - output_filename( strmake( "-Wl,--debug-file,%s", debug_file )); + if ((debug_file = get_debug_file( make, testmodule ))) + output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" );

1 0

Zebediah Figura : qedit/tests: Test (dis)connecting while not stopped.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: d6c7cfe2da0afb2b144ea8c0d64290d2457ef74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c7cfe2da0afb2b144ea8c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 11:19:35 2020 -0600 qedit/tests: Test (dis)connecting while not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 17 +++++++++++++++++ dlls/qedit/tests/samplegrabber.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 754228d770b..1800f4dad4c 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -803,6 +803,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_null_renderer(); struct testfilter source; IMemAllocator *allocator; + IMediaControl *control; IFilterGraph2 *graph; IMemInputPin *input; AM_MEDIA_TYPE mt; @@ -816,6 +817,7 @@ static void test_connect_pin(void) &IID_IFilterGraph2, (void **)&graph); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, filter, L"sink"); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, L"In", &pin); @@ -827,6 +829,13 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -839,6 +848,13 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!memcmp(&mt, &req_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); test_allocator(input); @@ -875,6 +891,7 @@ static void test_connect_pin(void) IMemInputPin_Release(input); IPin_Release(pin); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(filter); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 8e68e3efae1..3a1d1a16ce6 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -769,6 +769,7 @@ static void test_connect_pin(void) IPin *sink, *source, *peer; IEnumMediaTypes *enummt; ISampleGrabber *grabber; + IMediaControl *control; AM_MEDIA_TYPE mt, *pmt; IFilterGraph2 *graph; HRESULT hr; @@ -781,6 +782,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); IFilterGraph2_AddFilter(graph, filter, L"sample grabber"); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, L"In", &sink); IBaseFilter_FindPin(filter, L"Out", &source); IBaseFilter_QueryInterface(filter, &IID_ISampleGrabber, (void **)&grabber); @@ -802,6 +804,13 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(sink, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -814,6 +823,13 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ISampleGrabber_GetConnectedMediaType(grabber, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -874,6 +890,13 @@ static void test_connect_pin(void) /* Exact connection. */ + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + req_mt.bTemporalCompression = FALSE; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); @@ -893,6 +916,13 @@ static void test_connect_pin(void) ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, source); @@ -1025,6 +1055,7 @@ static void test_connect_pin(void) IPin_Release(sink); IPin_Release(source); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ISampleGrabber_Release(grabber);

1 0

Zebediah Figura : qcap/tests: Test (dis)connecting while not stopped.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: aa8e69a68bc92a90f1663c0bdff76b209cdc7467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa8e69a68bc92a90f1663c0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 11:19:34 2020 -0600 qcap/tests: Test (dis)connecting while not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/filewriter.c | 14 ++++++++++++++ dlls/qcap/tests/smartteefilter.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index e3bdcb76560..d6dbc3faded 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -768,6 +768,13 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Stream; @@ -783,6 +790,13 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!memcmp(&mt, &req_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + todo_wine ok(hr == VFW_E_NO_ALLOCATOR, "Got hr %#x.\n", hr); + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)&allocator); diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 1364beef161..1019fd3c1ba 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2519,7 +2519,7 @@ static void test_source_media_types(AM_MEDIA_TYPE req_mt, const AM_MEDIA_TYPE *s } static void test_source_connection(AM_MEDIA_TYPE req_mt, IFilterGraph2 *graph, - struct testfilter *testsink, IPin *source) + IMediaControl *control, struct testfilter *testsink, IPin *source) { const AM_MEDIA_TYPE sink_mt = req_mt; AM_MEDIA_TYPE mt; @@ -2536,6 +2536,13 @@ static void test_source_connection(AM_MEDIA_TYPE req_mt, IFilterGraph2 *graph, /* Exact connection. */ + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2549,6 +2556,13 @@ static void test_source_connection(AM_MEDIA_TYPE req_mt, IFilterGraph2 *graph, ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink->sink.pin.mt, &req_mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, source); @@ -2662,6 +2676,7 @@ static void test_connect_pin(void) IPin *sink, *capture, *preview, *peer; AM_MEDIA_TYPE mt, *mts[3]; IEnumMediaTypes *enummt; + IMediaControl *control; IFilterGraph2 *graph; HRESULT hr; ULONG ref; @@ -2673,6 +2688,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); IFilterGraph2_AddFilter(graph, filter, L"sample grabber"); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, L"Input", &sink); IBaseFilter_FindPin(filter, L"Capture", &capture); IBaseFilter_FindPin(filter, L"Preview", &preview); @@ -2709,6 +2725,13 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(sink, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2729,8 +2752,15 @@ static void test_connect_pin(void) test_source_media_types(req_mt, &testsource.source_mt, capture); test_source_media_types(req_mt, &testsource.source_mt, preview); - test_source_connection(req_mt, graph, &testsink, capture); - test_source_connection(req_mt, graph, &testsink, preview); + test_source_connection(req_mt, graph, control, &testsink, capture); + test_source_connection(req_mt, graph, control, &testsink, preview); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, sink); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2750,6 +2780,7 @@ static void test_connect_pin(void) IPin_Release(sink); IPin_Release(capture); IPin_Release(preview); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(filter);

1 0

Zebediah Figura : qasf/tests: Test (dis)connecting while not stopped.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 2945f4670747a688ebbc21114081b438e041e5bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2945f4670747a688ebbc2111… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 11:19:33 2020 -0600 qasf/tests: Test (dis)connecting while not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index f76c0c3d9d5..bd87a3494b2 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1445,6 +1445,8 @@ static void test_filter_state(IMediaControl *control) OAFilterState state; HRESULT hr; + got_Flush = 0; + hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); @@ -1782,6 +1784,13 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!testdmo_input_mt_set, "Input type should not be set.\n"); req_mt.lSampleSize = 123; @@ -1800,6 +1809,13 @@ static void test_connect_pin(void) ok(testdmo_input_mt_set, "Input type should be set.\n"); ok(compare_media_types(&testdmo_input_mt, &req_mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + test_sink_allocator(meminput); /* Test source connection. */ @@ -1816,6 +1832,14 @@ static void test_connect_pin(void) /* Exact connection. */ req_mt = mt2; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1831,6 +1855,13 @@ static void test_connect_pin(void) ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &req_mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + test_filter_state(control); test_sample_processing(control, meminput);

1 0

Jacek Caban : server: Allow reading directly from console handle.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: c248999a8f9ca6425235c7120ee5f2d296f26756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c248999a8f9ca6425235c712… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 17:59:30 2020 +0100 server: Allow reading directly from console handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 40675d931b5..48f92dd66e6 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 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 ); @@ -106,7 +107,7 @@ static const struct fd_ops console_input_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ - no_fd_read, /* read */ + console_input_read, /* read */ no_fd_write, /* write */ console_input_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ @@ -913,6 +914,18 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } } +static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ) +{ + 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_READ_FILE, 0, async, &console->ioctl_q ); +} + static int console_input_flush( struct fd *fd, struct async *async ) { struct console_input *console = get_fd_user( fd );

1 0

Jacek Caban : conhost/tests: Add more ReadConsoleA tests.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: ee77a96daeca1e08bbe6596ad0de349d5fb484a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee77a96daeca1e08bbe6596a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 17:57:48 2020 +0100 conhost/tests: Add more ReadConsoleA tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 121 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 9b1ab77dc0b..7cc37fa7fe1 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -150,9 +150,12 @@ enum req_type REQ_FILL_CHAR, REQ_GET_INPUT, REQ_READ_CONSOLE, + REQ_READ_CONSOLE_A, + REQ_READ_CONSOLE_FILE, REQ_SCROLL, REQ_SET_ACTIVE, REQ_SET_CURSOR, + REQ_SET_INPUT_CP, REQ_SET_INPUT_MODE, REQ_SET_OUTPUT_MODE, REQ_SET_TITLE, @@ -170,6 +173,7 @@ struct pseudoconsole_req COORD coord; HANDLE handle; DWORD mode; + int cp; size_t size; struct { @@ -362,6 +366,18 @@ static void child_set_output_mode(DWORD mode) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static void child_set_input_cp(int cp) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_SET_INPUT_CP; + req.u.cp = cp; + ret = WriteFile(child_pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + static void child_read_console(HANDLE pipe, size_t size) { struct pseudoconsole_req req; @@ -374,6 +390,30 @@ static void child_read_console(HANDLE pipe, size_t size) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static void child_read_console_a(HANDLE pipe, size_t size) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_READ_CONSOLE_A; + req.u.size = size; + ret = WriteFile(pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + +static void child_read_console_file(HANDLE pipe, size_t size) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_READ_CONSOLE_FILE; + req.u.size = size; + ret = WriteFile(pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + #define child_expect_read_result(a,b) child_expect_read_result_(__LINE__,a,b) static void child_expect_read_result_(unsigned int line, HANDLE pipe, const WCHAR *expect) { @@ -390,6 +430,22 @@ static void child_expect_read_result_(unsigned int line, HANDLE pipe, const WCHA ok_(__FILE__,line)(!memcmp(expect, buf, count), "unexpected data %s\n", wine_dbgstr_w(buf)); } +#define child_expect_read_result_a(a,b) child_expect_read_result_a_(__LINE__,a,b) +static void child_expect_read_result_a_(unsigned int line, HANDLE pipe, const char *expect) +{ + size_t exlen = strlen(expect); + char buf[4096]; + DWORD count; + BOOL ret; + + ret = ReadFile(pipe, buf, sizeof(buf), &count, NULL); + ok_(__FILE__,line)(ret, "ReadFile failed: %u\n", GetLastError()); + todo_wine_if(exlen && expect[exlen - 1] == '\xcc') + ok_(__FILE__,line)(count == exlen, "got %u, expected %u\n", count, exlen); + buf[count] = 0; + ok_(__FILE__,line)(!memcmp(expect, buf, count), "unexpected data %s\n", wine_dbgstr_a(buf)); +} + static void expect_input(unsigned int event_type, INPUT_RECORD *record) { struct pseudoconsole_req req = { REQ_GET_INPUT }; @@ -1015,6 +1071,48 @@ static void test_read_console(void) child_expect_read_result(child_pipe, L"yz"); expect_empty_output(); + child_set_input_cp(932); + + child_read_console_a(child_pipe, 2); + write_console_pipe("\xe3\x81\x81"); + child_expect_read_result_a(child_pipe, "\x82\x9f"); + expect_empty_output(); + + child_read_console_a(child_pipe, 1); + write_console_pipe("\xe3\x81\x81""a"); + child_expect_read_result_a(child_pipe, "\x82\xcc"); + child_read_console_a(child_pipe, 1); + child_expect_read_result_a(child_pipe, "a"); + expect_empty_output(); + + child_read_console_a(child_pipe, 2); + write_console_pipe("a\xe3\x81\x81""b"); + child_expect_read_result_a(child_pipe, "a\x82\xcc"); + child_read_console_a(child_pipe, 1); + child_expect_read_result_a(child_pipe, "b"); + expect_empty_output(); + + child_read_console_file(child_pipe, 2); + write_console_pipe("\xe3\x81\x81"); + child_expect_read_result_a(child_pipe, "\x82\x9f"); + expect_empty_output(); + + child_read_console_file(child_pipe, 1); + write_console_pipe("\xe3\x81\x81""a"); + child_expect_read_result_a(child_pipe, "\x82\xcc"); + child_read_console_file(child_pipe, 1); + child_expect_read_result_a(child_pipe, "a"); + expect_empty_output(); + + child_read_console_file(child_pipe, 2); + write_console_pipe("a\xe3\x81\x81""b"); + child_expect_read_result_a(child_pipe, "a\x82\xcc"); + child_read_console_file(child_pipe, 1); + child_expect_read_result_a(child_pipe, "b"); + expect_empty_output(); + + child_set_input_cp(437); + child_set_input_mode(child_pipe, ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION); @@ -1209,6 +1307,24 @@ static void child_process(HANDLE pipe) ok(ret, "WriteFile failed: %u\n", GetLastError()); break; + case REQ_READ_CONSOLE_A: + count = req->u.size; + memset(buf, 0xcc, sizeof(buf)); + ret = ReadConsoleA(input, buf, count, &count, NULL ); + ok(ret, "ReadConsoleA failed: %u\n", GetLastError()); + ret = WriteFile(pipe, buf, count, NULL, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + break; + + case REQ_READ_CONSOLE_FILE: + count = req->u.size; + memset(buf, 0xcc, sizeof(buf)); + ret = ReadFile(input, buf, count, &count, NULL ); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ret = WriteFile(pipe, buf, count, NULL, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + break; + case REQ_SCROLL: ret = ScrollConsoleScreenBufferW(output, &req->u.scroll.rect, NULL, req->u.scroll.dst, &req->u.scroll.fill); ok(ret, "ScrollConsoleScreenBuffer failed: %u\n", GetLastError()); @@ -1231,6 +1347,11 @@ static void child_process(HANDLE pipe) ok(ret, "SetConsoleCursorPosition failed: %u\n", GetLastError()); break; + case REQ_SET_INPUT_CP: + ret = SetConsoleCP(req->u.cp); + ok(ret, "SetConsoleCP failed: %u\n", GetLastError()); + break; + case REQ_SET_INPUT_MODE: ret = SetConsoleMode(input, req->u.mode); ok(ret, "SetConsoleMode failed: %u\n", GetLastError());

1 0

Piotr Caban : msvcrt: Don't overwrite threadmbcinfostruct structure in _setmbcp.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 35a8f15361022d9195bd141aa67b22e06007fa16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a8f15361022d9195bd141a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 19 18:57:48 2020 +0100 msvcrt: Don't overwrite threadmbcinfostruct structure in _setmbcp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 25 +++++++++++++++++++++---- dlls/msvcrt/locale.c | 19 ++++++++++--------- dlls/msvcrt/mbcs.c | 42 ++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.h | 3 ++- 4 files changed, 63 insertions(+), 26 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ca5349e3387..08eb4a7ac64 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -130,6 +130,7 @@ static int (__cdecl *p_fflush_nolock)(FILE*); static size_t (__cdecl *p_mbstowcs)(wchar_t*, const char*, size_t); static size_t (__cdecl *p_wcstombs)(char*, const wchar_t*, size_t); static char* (__cdecl *p_setlocale)(int, const char*); +static int (__cdecl *p__setmbcp)(int); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); @@ -160,6 +161,16 @@ struct __lc_time_data { #undef errno #define errno (*p_errno()) +typedef struct threadmbcinfostruct { + int refcount; + int mbcodepage; + int ismbcodepage; + int mblcid; + unsigned short mbulinfo[6]; + unsigned char mbctype[257]; + unsigned char mbcasemap[256]; +} threadmbcinfo; + /* type info */ typedef struct __type_info { @@ -415,6 +426,7 @@ static BOOL init(void) SET(p_mbstowcs, "mbstowcs"); SET(p_wcstombs, "wcstombs"); SET(p_setlocale, "setlocale"); + SET(p__setmbcp, "_setmbcp"); SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); @@ -1979,9 +1991,13 @@ static void test____mb_cur_max_l_func(void) static void test__get_current_locale(void) { - _locale_t l = p__get_current_locale(), l2 = p__get_current_locale(); + _locale_t l, l2; int i; + ok(!p__setmbcp(1252), "_setmbcp failed\n"); + l = p__get_current_locale(); + l2 = p__get_current_locale(); + ok(!strcmp(l->locinfo->lc_category[LC_COLLATE].locale, "C"), "LC_COLLATE = \"%s\"\n", l->locinfo->lc_category[LC_COLLATE].locale); ok(!strcmp(l->locinfo->lc_category[LC_CTYPE].locale, "C"), @@ -1992,6 +2008,7 @@ static void test__get_current_locale(void) "LC_NUMERIC = \"%s\"\n", l->locinfo->lc_category[LC_NUMERIC].locale); ok(!strcmp(l->locinfo->lc_category[LC_TIME].locale, "C"), "LC_TIME = \"%s\"\n", l->locinfo->lc_category[LC_TIME].locale); + ok(l->mbcinfo->mbcodepage == 1252, "mbcodepage = %d\n", l->mbcinfo->mbcodepage); ok(l->locinfo->refcount == 3, "refcount = %d\n", l->locinfo->refcount); @@ -2001,6 +2018,7 @@ static void test__get_current_locale(void) p__free_locale(l2); return; } + ok(!p__setmbcp(932), "_setmbcp failed\n"); ok(!strcmp(l->locinfo->lc_category[LC_COLLATE].locale, "C"), "LC_COLLATE = \"%s\"\n", l->locinfo->lc_category[LC_COLLATE].locale); @@ -2012,6 +2030,7 @@ static void test__get_current_locale(void) "LC_NUMERIC = \"%s\"\n", l->locinfo->lc_category[LC_NUMERIC].locale); ok(!strcmp(l->locinfo->lc_category[LC_TIME].locale, "C"), "LC_TIME = \"%s\"\n", l->locinfo->lc_category[LC_TIME].locale); + ok(l->mbcinfo->mbcodepage == 1252, "mbcodepage = %d\n", l->mbcinfo->mbcodepage); ok(l->locinfo->refcount == 2, "refcount = %d\n", l->locinfo->refcount); ok(l->locinfo == l2->locinfo, "different locinfo pointers\n"); @@ -2143,9 +2162,7 @@ static void test__get_current_locale(void) p__free_locale(l2); - trace("before: %s\n", p_setlocale(LC_ALL, NULL)); - trace("current locale is: %s\n", p_setlocale(LC_MONETARY, "C")); - trace("after: %s\n", p_setlocale(LC_ALL, NULL)); + p_setlocale(LC_MONETARY, "C"); l2 = p__get_current_locale(); ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8543b3f1713..2cedc89530e 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -597,14 +597,18 @@ MSVCRT_pthreadlocinfo CDECL get_locinfo(void) { return *get_locinfo_ptr(); } -/* INTERNAL: returns pthreadmbcinfo struct */ -MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { +MSVCRT_pthreadmbcinfo* CDECL get_mbcinfo_ptr(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !data->have_locale) - return MSVCRT_locale->mbcinfo; + return &MSVCRT_locale->mbcinfo; - return data->mbcinfo; + return &data->mbcinfo; +} + +/* INTERNAL: returns pthreadmbcinfo struct */ +MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { + return *get_mbcinfo_ptr(); } /* INTERNAL: constructs string returned by setlocale */ @@ -1964,16 +1968,13 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return NULL; } - loc->mbcinfo = MSVCRT_malloc(sizeof(MSVCRT_threadmbcinfo)); + loc->mbcinfo = create_mbcinfo(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, + loc->locinfo->lc_handle[MSVCRT_LC_CTYPE], NULL); if(!loc->mbcinfo) { free_locinfo(loc->locinfo); MSVCRT_free(loc); return NULL; } - - loc->mbcinfo->refcount = 1; - _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, - loc->locinfo->lc_handle[MSVCRT_LC_CTYPE], loc->mbcinfo); return loc; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index f9a38184436..1454004610d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -211,10 +211,9 @@ int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) /********************************************************************* * INTERNAL: _setmbcp_l */ -int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) +MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *old_mbcinfo) { - const char format[] = ".%d"; - + MSVCRT_threadmbcinfo *mbcinfo; int newcp; CPINFO cpi; BYTE *bytes; @@ -225,8 +224,16 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) int ret; int i; + if(old_mbcinfo && cp==old_mbcinfo->mbcodepage + && (lcid==-1 || lcid==old_mbcinfo->mblcid)) { + InterlockedIncrement(&old_mbcinfo->refcount); + return old_mbcinfo; + } + + mbcinfo = MSVCRT_malloc(sizeof(MSVCRT_threadmbcinfo)); if(!mbcinfo) - mbcinfo = get_mbcinfo(); + return NULL; + mbcinfo->refcount = 1; switch (cp) { @@ -250,7 +257,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) } if(lcid == -1) { - MSVCRT_sprintf(bufA, format, newcp); + MSVCRT_sprintf(bufA, ".%d", newcp); mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA, NULL, NULL); } else { mbcinfo->mblcid = lcid; @@ -265,8 +272,8 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) if (!GetCPInfo(newcp, &cpi)) { WARN("Codepage %d not found\n", newcp); - *MSVCRT__errno() = MSVCRT_EINVAL; - return -1; + MSVCRT_free(mbcinfo); + return NULL; } /* setup the _mbctype */ @@ -370,10 +377,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) } mbcinfo->mbcodepage = newcp; - if(MSVCRT_locale && mbcinfo == MSVCRT_locale->mbcinfo) - memcpy(MSVCRT_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(MSVCRT_mbctype)); - - return 0; + return mbcinfo; } /********************************************************************* @@ -381,7 +385,21 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) */ int CDECL _setmbcp(int cp) { - return _setmbcp_l(cp, -1, NULL); + MSVCRT_threadmbcinfo **old_mbcinfo = get_mbcinfo_ptr(); + MSVCRT_threadmbcinfo *mbcinfo; + + mbcinfo = create_mbcinfo(cp, -1, *old_mbcinfo); + if(!mbcinfo) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + free_mbcinfo(*old_mbcinfo); + *old_mbcinfo = mbcinfo; + + if(mbcinfo == MSVCRT_locale->mbcinfo) + memcpy(MSVCRT_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(MSVCRT_mbctype)); + return 0; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 503aea33bd0..6c103ee3ca2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1136,10 +1136,11 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) DECLS void CDECL free_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadmbcinfo* CDECL get_mbcinfo_ptr(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); +MSVCRT_threadmbcinfo* create_mbcinfo(int, LCID, MSVCRT_threadmbcinfo*) DECLSPEC_HIDDEN; void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; -int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; #ifndef __WINE_MSVCRT_TEST

1 0

Jacek Caban : kernel32: Import ReadFile from kernelbase.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: dc72519cd234055ac79b5a7e51b8fbcc4cda1e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc72519cd234055ac79b5a7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 17:59:43 2020 +0100 kernel32: Import ReadFile from kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 30 ------------------------------ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index fc83e618c3a..92022063ecc 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -276,36 +276,6 @@ UINT WINAPI SetHandleCount( UINT count ) } -/************************************************************************* - * ReadFile (KERNEL32.@) - */ -BOOL WINAPI KERNEL32_ReadFile( HANDLE file, LPVOID buffer, DWORD count, - LPDWORD result, LPOVERLAPPED overlapped ) -{ - if (result) *result = 0; - - if (is_console_handle( file )) - { - DWORD conread, mode; - - if (!ReadConsoleA( file, buffer, count, &conread, NULL) || !GetConsoleMode( file, &mode )) - return FALSE; - /* ctrl-Z (26) means end of file on window (if at beginning of buffer) - * but Unix uses ctrl-D (4), and ctrl-Z is a bad idea on Unix :-/ - * So map both ctrl-D ctrl-Z to EOF. - */ - if ((mode & ENABLE_PROCESSED_INPUT) && conread > 0 && - (((char *)buffer)[0] == 26 || ((char *)buffer)[0] == 4)) - { - conread = 0; - } - if (result) *result = conread; - return TRUE; - } - return ReadFile( file, buffer, count, result, overlapped ); -} - - /*********************************************************************** * DosDateTimeToFileTime (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d0a273fe39e..949b262a592 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1205,7 +1205,7 @@ @ stdcall -import ReadConsoleOutputW(long ptr long long ptr) @ stdcall -import ReadConsoleW(long ptr long ptr ptr) @ stdcall -import ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) -@ stdcall ReadFile(long ptr long ptr ptr) KERNEL32_ReadFile +@ stdcall -import ReadFile(long ptr long ptr ptr) @ stdcall -import ReadFileEx(long ptr long ptr ptr) @ stdcall -import ReadFileScatter(long ptr long ptr ptr) @ stdcall -import ReadProcessMemory(long ptr ptr long ptr)

1 0

Alexandre Julliard : msvcrt: Enable multi-thread locking by default.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 6482ce7666a5f8beb92879af5ae3fde3782627d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6482ce7666a5f8beb92879af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 11:33:51 2020 +0100 msvcrt: Enable multi-thread locking by default. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/exit.c | 4 ++-- dlls/msvcrt/heap.c | 4 ++-- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/mtdll.h | 13 ------------- dlls/msvcrt/onexit.c | 14 +++++++------- dlls/msvcrt/process.c | 12 ++++++------ dlls/msvcrt/time.c | 8 ++++---- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 19 files changed, 36 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6482ce7666a5f8beb928…

1 0

Nikolay Sivov : combase: Set a flag on thread id initialization.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: ffce592cc354b7ce962eb689d7ebb86eeb46dd50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffce592cc354b7ce962eb689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 13:40:31 2020 +0000 combase: Set a flag on thread id initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 3 ++ dlls/combase/combase_private.h | 15 ++++--- dlls/ole32/compobj_private.h | 36 ++++++++-------- dlls/ole32/tests/compobj.c | 96 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 23 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7a85b95a19b..72ff6cc31f9 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2547,7 +2547,10 @@ HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) return hr; if (IsEqualGUID(&tlsdata->causality_id, &GUID_NULL)) + { CoCreateGuid(&tlsdata->causality_id); + tlsdata->flags |= OLETLS_UUIDINITIALIZED; + } *id = tlsdata->causality_id; diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 55ce02d06f0..46a7c7f655d 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -63,17 +63,22 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DE #define CHARS_IN_GUID 39 +enum tlsdata_flags +{ + OLETLS_UUIDINITIALIZED = 0x2, +}; + /* this is what is stored in TEB->ReservedForOle */ struct tlsdata { struct apartment *apt; IErrorInfo *errorinfo; - DWORD thread_seqid;/* returned with CoGetCurrentProcess */ - DWORD apt_mask; /* apartment mask (+0Ch on x86) */ + DWORD thread_seqid; /* returned with CoGetCurrentProcess */ + DWORD flags; /* tlsdata_flags (+0Ch on x86) */ void *unknown0; - DWORD inits; /* number of times CoInitializeEx called */ - DWORD ole_inits; /* number of times OleInitialize called */ - GUID causality_id; /* unique identifier for each COM call */ + DWORD inits; /* number of times CoInitializeEx called */ + DWORD ole_inits; /* number of times OleInitialize called */ + GUID causality_id; /* unique identifier for each COM call */ LONG pending_call_count_client; /* number of client calls pending */ LONG pending_call_count_server; /* number of server calls pending */ DWORD unknown; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 4ec22d51f45..3c0e338127c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -45,24 +45,24 @@ DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); struct oletls { struct apartment *apt; - IErrorInfo *errorinfo; /* see errorinfo.c */ - DWORD thread_seqid;/* returned with CoGetCurrentProcess */ - DWORD apt_mask; /* apartment mask (+0Ch on x86) */ - void *unknown0; - DWORD inits; /* number of times CoInitializeEx called */ - DWORD ole_inits; /* number of times OleInitialize called */ - GUID causality_id; /* unique identifier for each COM call */ - LONG pending_call_count_client; /* number of client calls pending */ - LONG pending_call_count_server; /* number of server calls pending */ - DWORD unknown; - IObjContext *context_token; /* (+38h on x86) */ - IUnknown *call_state; /* current call context (+3Ch on x86) */ - DWORD unknown2[46]; - IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ - IUnknown *state; /* see CoSetState */ - struct list spies; /* Spies installed with CoRegisterInitializeSpy */ - DWORD spies_lock; - DWORD cancelcount; + IErrorInfo *errorinfo; /* see errorinfo.c */ + DWORD thread_seqid; /* returned with CoGetCurrentProcess */ + DWORD flags; /* tlsdata_flags (+0Ch on x86) */ + void *unknown0; + DWORD inits; /* number of times CoInitializeEx called */ + DWORD ole_inits; /* number of times OleInitialize called */ + GUID causality_id; /* unique identifier for each COM call */ + LONG pending_call_count_client; /* number of client calls pending */ + LONG pending_call_count_server; /* number of server calls pending */ + DWORD unknown; + IObjContext *context_token; /* (+38h on x86) */ + IUnknown *call_state; /* current call context (+3Ch on x86) */ + DWORD unknown2[46]; + IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + IUnknown *state; /* see CoSetState */ + struct list spies; /* Spies installed with CoRegisterInitializeSpy */ + DWORD spies_lock; + DWORD cancelcount; }; /* Global Interface Table Functions */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 0d7f3d8adee..c79e379f92a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -36,6 +36,7 @@ #include "ctxtcall.h" #include "wine/test.h" +#include "winternl.h" #include "initguid.h" #define DEFINE_EXPECT(func) \ @@ -4245,6 +4246,100 @@ static void test_call_cancellation(void) ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); } +enum oletlsflags +{ + OLETLS_UUIDINITIALIZED = 0x2, + OLETLS_DISABLE_OLE1DDE = 0x40, + OLETLS_APARTMENTTHREADED = 0x80, + OLETLS_MULTITHREADED = 0x100, +}; + +struct oletlsdata +{ + void *threadbase; + void *smallocator; + DWORD id; + DWORD flags; +}; + +static DWORD get_oletlsflags(void) +{ + struct oletlsdata *data = NtCurrentTeb()->ReservedForOle; + return data ? data->flags : 0; +} + +static DWORD CALLBACK oletlsdata_test_thread(void *arg) +{ + IUnknown *unk; + DWORD flags; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + /* Flag is not set for implicit MTA. */ + flags = get_oletlsflags(); + ok(!(flags & OLETLS_MULTITHREADED), "Unexpected flags %#x.\n", flags); + + return 0; +} + +static void test_oletlsdata(void) +{ + HANDLE thread; + DWORD flags; + HRESULT hr; + GUID guid; + + /* STA */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_APARTMENTTHREADED && !(flags & OLETLS_DISABLE_OLE1DDE), "Unexpected flags %#x.\n", flags); + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_APARTMENTTHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + /* MTA */ + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_MULTITHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); + + /* Implicit case. */ + thread = CreateThread(NULL, 0, oletlsdata_test_thread, NULL, 0, &flags); + ok(thread != NULL, "Failed to create a test thread, error %d.\n", GetLastError()); + ok(!WaitForSingleObject(thread, 5000), "Wait timed out.\n"); + CloseHandle(thread); + + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + /* Thread ID. */ + flags = get_oletlsflags(); + ok(!(flags & OLETLS_UUIDINITIALIZED), "Unexpected flags %#x.\n", flags); + + hr = CoGetCurrentLogicalThreadId(&guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + flags = get_oletlsflags(); + ok(flags & OLETLS_UUIDINITIALIZED && !(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED)), + "Unexpected flags %#x.\n", flags); +} + START_TEST(compobj) { init_funcs(); @@ -4254,6 +4349,7 @@ START_TEST(compobj) lstrcatA(testlib, "\\testlib.dll"); extract_resource("testlib.dll", "TESTDLL", testlib); + test_oletlsdata(); test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString();

1 0