wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Nikolay Sivov : evr: Respond to IMFVideoMixerControl in mixer's GetService().
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 52f8191b9348f0e5b183b81cb6f7a8e9787a64c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f8191b9348f0e5b183b81c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:36 2020 +0300 evr: Respond to IMFVideoMixerControl in mixer's GetService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c8bd300b0d..f274a2a447 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1021,7 +1021,9 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE { if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap) || IsEqualIID(riid, &IID_IMFVideoProcessor) || - IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + IsEqualIID(riid, &IID_IMFVideoPositionMapper) || + IsEqualIID(riid, &IID_IMFVideoMixerControl) || + IsEqualIID(riid, &IID_IMFVideoMixerControl2)) { return IMFGetService_QueryInterface(iface, riid, obj); } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db9b3a80e0..5e18494718 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -450,6 +450,10 @@ static void test_default_mixer(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Add IMFGetService stub.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: f557a5ee561faa215f2700b492daab789c82bee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f557a5ee561faa215f2700b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:35 2020 +0300 mf/evr: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 +++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index aa4d3850c6..ebb3fd4c2c 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -36,6 +36,7 @@ struct video_renderer IMFVideoRenderer IMFVideoRenderer_iface; IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFGetService IMFGetService_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -70,6 +71,11 @@ static struct video_renderer *impl_from_IMFClockStateSink(IMFClockStateSink *ifa return CONTAINING_RECORD(iface, struct video_renderer, IMFClockStateSink_iface); } +static struct video_renderer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFGetService_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -97,6 +103,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFClockStateSink_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &renderer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -438,6 +448,39 @@ static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl = video_renderer_clock_sink_OnClockSetRate, }; +static HRESULT WINAPI video_renderer_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_get_service_AddRef(IMFGetService *iface) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_get_service_Release(IMFGetService *iface) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_renderer_get_service_vtbl = +{ + video_renderer_get_service_QueryInterface, + video_renderer_get_service_AddRef, + video_renderer_get_service_Release, + video_renderer_get_service_GetService, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -499,6 +542,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; + object->IMFGetService_iface.lpVtbl = &video_renderer_get_service_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 077466b7e8..3fad309bcf 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3234,6 +3234,7 @@ static void test_evr(void) IMFMediaSink *sink, *sink2; IMFActivate *activate; DWORD flags, count; + IMFGetService *gs; UINT64 value; HRESULT hr; @@ -3277,6 +3278,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFClockStateSink_Release(clock_sink); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Add a stub for clock state sink.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 115ac283993013116af06f9d14e650e027d7f06d URL: https://source.winehq.org/git/wine.git/?a=commit;h=115ac283993013116af06f9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:34 2020 +0300 mf/evr: Add a stub for clock state sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 ++++ 2 files changed, 81 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index bb21ccdd25..aa4d3850c6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -34,6 +34,7 @@ struct video_renderer IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; IMFVideoRenderer IMFVideoRenderer_iface; + IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; @@ -64,6 +65,11 @@ static struct video_renderer *impl_from_IMFMediaEventGenerator(IMFMediaEventGene return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaEventGenerator_iface); } +static struct video_renderer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFClockStateSink_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -87,6 +93,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &renderer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -363,6 +373,71 @@ static const IMFMediaEventGeneratorVtbl video_renderer_events_vtbl = video_renderer_events_QueueEvent, }; +static HRESULT WINAPI video_renderer_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl = +{ + video_renderer_clock_sink_QueryInterface, + video_renderer_clock_sink_AddRef, + video_renderer_clock_sink_Release, + video_renderer_clock_sink_OnClockStart, + video_renderer_clock_sink_OnClockStop, + video_renderer_clock_sink_OnClockPause, + video_renderer_clock_sink_OnClockRestart, + video_renderer_clock_sink_OnClockSetRate, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -423,6 +498,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5d9ccc5408..077466b7e8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3229,6 +3229,7 @@ static void test_evr(void) { IMFMediaEventGenerator *ev_generator; IMFVideoRenderer *video_renderer; + IMFClockStateSink *clock_sink; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFActivate *activate; @@ -3272,6 +3273,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaEventGenerator_Release(ev_generator); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clock_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFClockStateSink_Release(clock_sink); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Jacek Caban : server: Remove no longer needed supoort for signaling console_input_events object.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: ca0db956a65f9010983c6723643e50df115ef34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0db956a65f9010983c6723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:32:04 2020 +0200 server: Remove no longer needed supoort for signaling console_input_events object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/server/console.c b/server/console.c index 9494ea84b8..a18892b156 100644 --- a/server/console.c +++ b/server/console.c @@ -106,7 +106,6 @@ static const struct object_ops console_input_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); -static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_events_get_fd( struct object *obj ); struct console_input_events @@ -126,7 +125,7 @@ static const struct object_ops console_input_events_ops = no_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - console_input_events_signaled, /* signaled */ + NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_events_get_fd, /* get_fd */ @@ -308,14 +307,6 @@ static void console_input_events_destroy( struct object *obj ) free( evts->events ); } -/* the renderer events list is signaled when it's not empty */ -static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct console_input_events *evts = (struct console_input_events *)obj; - assert( obj->ops == &console_input_events_ops ); - return (evts->num_used != 0); -} - static struct fd *console_input_events_get_fd( struct object* obj ) { struct console_input_events *evts = (struct console_input_events*)obj; @@ -396,7 +387,6 @@ static void console_input_events_append( struct console_input* console, get_renderer_events( evts, async ); release_object( async ); } - if (evts->num_used) wake_up( &evts->obj, 0 ); } static struct console_input_events *create_console_input_events(void)

1 0

Jacek Caban : wineconsole: Use OVERLAPPED to wait for console events.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 340a661723eab4afe2204837716e2b53cc14f5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340a661723eab4afe2204837… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:31:55 2020 +0200 wineconsole: Use OVERLAPPED to wait for console events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/winecon_private.h | 4 ++++ programs/wineconsole/wineconsole.c | 18 +++++++++++++----- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 6fa669d150..ff38bafe2c 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1020,7 +1020,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 1; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) + while (!data->dying && WaitForSingleObject(data->overlapped.hEvent, INFINITE) == WAIT_OBJECT_0) { EnterCriticalSection(&PRIVATE(data)->lock); WINECON_GrabChanges(data); diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..67531c0045 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1365,7 +1365,7 @@ static int WCUSER_MainLoop(struct inner_data* data) ShowWindow(data->hWnd, data->nCmdShow); while (!data->dying || !data->curcfg.exit_on_die) { - switch (MsgWaitForMultipleObjects(1, &data->hSynchro, FALSE, INFINITE, QS_ALLINPUT)) + switch (MsgWaitForMultipleObjects(1, &data->overlapped.hEvent, FALSE, INFINITE, QS_ALLINPUT)) { case WAIT_OBJECT_0: WINECON_GrabChanges(data); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 54d8782a2a..cdf05e9332 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -22,6 +22,7 @@ #include <windef.h> #include <winbase.h> #include <wincon.h> +#include <wine/condrv.h> #include "wineconsole_res.h" @@ -69,6 +70,9 @@ struct inner_data { BOOL in_grab_changes;/* to handle re-entrant calls to WINECON_GrabChanges */ BOOL dying; /* to TRUE when we've been notified by server that child has died */ + OVERLAPPED overlapped; + struct condrv_renderer_event events[256]; + int (*fnMainLoop)(struct inner_data* data); void (*fnPosCursor)(const struct inner_data* data); void (*fnShapeCursor)(struct inner_data* data, int size, int vis, BOOL force); diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bc2aef847e..6ccba13c8a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -27,7 +27,6 @@ #include "winecon_private.h" #include "winnls.h" #include "winuser.h" -#include "wine/condrv.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -242,21 +241,20 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* */ void WINECON_GrabChanges(struct inner_data* data) { - struct condrv_renderer_event evts[256]; + struct condrv_renderer_event *evts = data->events; int i, ev_found; DWORD num; HANDLE h; if (data->in_grab_changes) return; - if (!DeviceIoControl( data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, evts, - sizeof(evts), &num, NULL ) || !num) + if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) { ERR( "failed to get renderer events: %u\n", GetLastError() ); data->dying = TRUE; return; } - num /= sizeof(*evts); + num /= sizeof(data->events[0]); WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */ @@ -400,6 +398,13 @@ void WINECON_GrabChanges(struct inner_data* data) } } data->in_grab_changes = FALSE; + + if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events, + sizeof(data->events), NULL, &data->overlapped) && GetLastError() != ERROR_IO_PENDING) + { + ERR("failed to get renderer events: %u\n", GetLastError()); + data->dying = TRUE; + } } /****************************************************************** @@ -590,6 +595,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); if (data->hProcess) CloseHandle(data->hProcess); + if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); @@ -676,6 +682,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* should always be defined */ } + if (!(data->overlapped.hEvent = CreateEventW(NULL, TRUE, TRUE, NULL))) goto error; + /* the handles here are created without the whistles and bells required by console * (mainly because wineconsole doesn't need it) * - they are not inheritable

1 0

Jacek Caban : server: Remove no longer needed get_console_renderer_events request.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 378ce9e6bea05fed194d44666eabd7a0d25caffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=378ce9e6bea05fed194d4466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:31:40 2020 +0200 server: Remove no longer needed get_console_renderer_events request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 49 ++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 62 +------------------------------------- programs/wineconsole/wineconsole.c | 2 +- server/console.c | 47 ++++++----------------------- server/protocol.def | 52 -------------------------------- server/request.h | 5 --- server/trace.c | 13 -------- 7 files changed, 61 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=378ce9e6bea05fed194d…

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_RENDERER_EVENTS to fetch events.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: a0d325333fb0cba6028a15b924dd115cbbdc0586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d325333fb0cba6028a15b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:49 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_RENDERER_EVENTS to fetch events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e94af41d2b..2820657a70 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -243,20 +243,20 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* void WINECON_GrabChanges(struct inner_data* data) { struct console_renderer_event evts[256]; - int i, num, ev_found; + int i, ev_found; + DWORD num; HANDLE h; if (data->in_grab_changes) return; - SERVER_START_REQ( get_console_renderer_events ) + if (!DeviceIoControl( data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, evts, + sizeof(evts), &num, NULL ) || !num) { - wine_server_set_reply( req, evts, sizeof(evts) ); - req->handle = wine_server_obj_handle( data->hSynchro ); - if (!wine_server_call_err( req )) num = wine_server_reply_size(reply) / sizeof(evts[0]); - else num = 0; + ERR( "failed to get renderer events: %u\n", GetLastError() ); + data->dying = TRUE; + return; } - SERVER_END_REQ; - if (!num) {WINE_WARN("hmm renderer signaled but no events available\n"); return;} + num /= sizeof(*evts); WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */

1 0

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

08 Jul '20

Module: wine Branch: master Commit: 845156cc3dc8c8c6b1b62fcb57bcdfc25c94e100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=845156cc3dc8c8c6b1b62fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:36 2020 +0200 server: Introduce IOCTL_CONDRV_GET_RENDERER_EVENTS ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ server/console.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f0f6d2ea58..c713ce7314 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -29,6 +29,9 @@ #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) +/* console renderer ioctls */ +#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { diff --git a/server/console.c b/server/console.c index ad15578374..a5925adf94 100644 --- a/server/console.c +++ b/server/console.c @@ -116,6 +116,7 @@ struct console_input_events int num_alloc; /* number of allocated events */ int num_used; /* number of actually used events */ struct console_renderer_event *events; + struct async_queue read_q; /* read queue */ }; static const struct object_ops console_input_events_ops = @@ -141,6 +142,8 @@ static const struct object_ops console_input_events_ops = console_input_events_destroy /* destroy */ }; +static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + static const struct fd_ops console_input_events_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ @@ -151,7 +154,7 @@ static const struct fd_ops console_input_events_fd_ops = no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ - default_fd_ioctl, /* ioctl */ + console_input_events_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -300,6 +303,7 @@ static void console_input_events_destroy( struct object *obj ) { struct console_input_events *evts = (struct console_input_events *)obj; assert( obj->ops == &console_input_events_ops ); + free_async_queue( &evts->read_q ); if (evts->fd) release_object( evts->fd ); free( evts->events ); } @@ -319,12 +323,42 @@ static struct fd *console_input_events_get_fd( struct object* obj ) return (struct fd*)grab_object( evts->fd ); } +/* retrieves events from the console's renderer events list */ +static int get_renderer_events( struct console_input_events* evts, struct async *async ) +{ + struct iosb *iosb = async_get_iosb( async ); + data_size_t num; + + num = min( iosb->out_size / sizeof(evts->events[0]), evts->num_used ); + if (num && !(iosb->out_data = malloc( num * sizeof(evts->events[0] )))) + { + async_terminate( async, STATUS_NO_MEMORY ); + release_object( iosb ); + return 0; + } + + iosb->status = STATUS_SUCCESS; + iosb->out_size = iosb->result = num * sizeof(evts->events[0]); + if (num) memcpy( iosb->out_data, evts->events, iosb->result ); + release_object( iosb ); + async_terminate( async, STATUS_ALERTED ); + + if (num && num < evts->num_used) + { + memmove( &evts->events[0], &evts->events[num], + (evts->num_used - num) * sizeof(evts->events[0]) ); + } + evts->num_used -= num; + return 1; +} + /* add an event to the console's renderer events list */ static void console_input_events_append( struct console_input* console, struct console_renderer_event* evt) { struct console_input_events* evts; int collapsed = FALSE; + struct async *async; if (!(evts = console->evt)) return; /* to be done even when evt has been generated by the renderer ? */ @@ -357,7 +391,12 @@ static void console_input_events_append( struct console_input* console, } evts->events[evts->num_used++] = *evt; } - wake_up( &evts->obj, 0 ); + while (evts->num_used && (async = find_pending_async( &evts->read_q ))) + { + get_renderer_events( evts, async ); + release_object( async ); + } + if (evts->num_used) wake_up( &evts->obj, 0 ); } /* retrieves events from the console's renderer events list */ @@ -382,6 +421,7 @@ static struct console_input_events *create_console_input_events(void) if (!(evt = alloc_object( &console_input_events_ops ))) return NULL; evt->num_alloc = evt->num_used = 0; evt->events = NULL; + init_async_queue( &evt->read_q ); if (!(evt->fd = alloc_pseudo_fd( &console_input_events_fd_ops, &evt->obj, 0 ))) { release_object( evt ); @@ -1600,6 +1640,24 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async } } +static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_input_events *evts = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_GET_RENDERER_EVENTS: + set_error( STATUS_PENDING ); + if (evts->num_used) return get_renderer_events( evts, async ); + queue_async( &evts->read_q, async ); + return 1; + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Jacek Caban : server: Create pseudo fd for console_input_events object.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 1320b15dfc87997e60d7a2af70000e5650b83cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=1320b15dfc87997e60d7a2af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:27 2020 +0200 server: Create pseudo fd for console_input_events object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/server/console.c b/server/console.c index d6673dca1b..ad15578374 100644 --- a/server/console.c +++ b/server/console.c @@ -79,6 +79,7 @@ static void console_input_destroy( struct object *obj ); static struct fd *console_input_get_fd( struct object *obj ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); +static enum server_fd_type console_get_fd_type( struct fd *fd ); static const struct object_ops console_input_ops = { @@ -106,13 +107,15 @@ static const struct object_ops console_input_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_input_events_get_fd( struct object *obj ); struct console_input_events { - struct object obj; /* object header */ - int num_alloc; /* number of allocated events */ - int num_used; /* number of actually used events */ - struct console_renderer_event* events; + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ + int num_alloc; /* number of allocated events */ + int num_used; /* number of actually used events */ + struct console_renderer_event *events; }; static const struct object_ops console_input_events_ops = @@ -125,7 +128,7 @@ static const struct object_ops console_input_events_ops = console_input_events_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + console_input_events_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -138,6 +141,21 @@ static const struct object_ops console_input_events_ops = console_input_events_destroy /* destroy */ }; +static const struct fd_ops console_input_events_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 */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + no_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + default_fd_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ +}; + struct font_info { short int width; @@ -201,7 +219,6 @@ static const struct object_ops screen_buffer_ops = screen_buffer_destroy /* destroy */ }; -static enum server_fd_type console_get_fd_type( struct fd *fd ); static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_fd_ops = @@ -283,6 +300,7 @@ static void console_input_events_destroy( struct object *obj ) { struct console_input_events *evts = (struct console_input_events *)obj; assert( obj->ops == &console_input_events_ops ); + if (evts->fd) release_object( evts->fd ); free( evts->events ); } @@ -294,6 +312,13 @@ static int console_input_events_signaled( struct object *obj, struct wait_queue_ return (evts->num_used != 0); } +static struct fd *console_input_events_get_fd( struct object* obj ) +{ + struct console_input_events *evts = (struct console_input_events*)obj; + assert( obj->ops == &console_input_events_ops ); + return (struct fd*)grab_object( evts->fd ); +} + /* add an event to the console's renderer events list */ static void console_input_events_append( struct console_input* console, struct console_renderer_event* evt) @@ -357,6 +382,11 @@ static struct console_input_events *create_console_input_events(void) if (!(evt = alloc_object( &console_input_events_ops ))) return NULL; evt->num_alloc = evt->num_used = 0; evt->events = NULL; + if (!(evt->fd = alloc_pseudo_fd( &console_input_events_fd_ops, &evt->obj, 0 ))) + { + release_object( evt ); + return NULL; + } return evt; }

1 0

Zhiyi Zhang : wined3d: Use valid adapter LUIDs if they are available.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 122a28a31341472fdf25e0f0f3eb85ca0f22493d URL: https://source.winehq.org/git/wine.git/?a=commit;h=122a28a31341472fdf25e0f0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 8 15:58:34 2020 +0800 wined3d: Use valid adapter LUIDs if they are available. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 2 +- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/adapter_gl.c | 6 +++++- dlls/wined3d/adapter_vk.c | 18 +++++++++++------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++---------- dlls/wined3d/utils.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 77 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=122a28a31341472fdf25…

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
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