wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Nikolay Sivov : mfplay: Implement GetSupportedRates().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: b39b55a10be6b294b626b4b2800a81beab4f5029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39b55a10be6b294b626b4b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:04 2021 +0300 mfplay: Implement GetSupportedRates(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index ddc83e9f441..3aa03103240 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -722,11 +722,23 @@ static HRESULT WINAPI media_player_GetRate(IMFPMediaPlayer *iface, float *rate) return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, float *slowest_rate, float *fastest_rate) +static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, + float *slowest_rate, float *fastest_rate) { - FIXME("%p, %d, %p, %p.\n", iface, forward, slowest_rate, fastest_rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateSupport *rs; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %d, %p, %p.\n", iface, forward, slowest_rate, fastest_rate); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rs))) + { + if (SUCCEEDED(hr = IMFRateSupport_GetSlowestRate(rs, forward ? MFRATE_FORWARD : MFRATE_REVERSE, FALSE, slowest_rate))) + hr = IMFRateSupport_GetFastestRate(rs, forward ? MFRATE_FORWARD : MFRATE_REVERSE, FALSE, fastest_rate); + IMFRateSupport_Release(rs); + } + + return hr; } static HRESULT WINAPI media_player_GetState(IMFPMediaPlayer *iface, MFP_MEDIAPLAYER_STATE *state)

1 0

Nikolay Sivov : mfplay: Implement GetDuration() for media items.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 4c77a97037b35d8fed52a9aebe7b86c32412f086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c77a97037b35d8fed52a9ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:03 2021 +0300 mfplay: Implement GetDuration() for media items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 9ef926f00f6..ddc83e9f441 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -407,9 +407,11 @@ static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protect static HRESULT WINAPI media_item_GetDuration(IMFPMediaItem *iface, REFGUID format, PROPVARIANT *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(format), value); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), value); + + return IMFPresentationDescriptor_GetItem(item->pd, &MF_PD_DURATION, value); } static HRESULT WINAPI media_item_GetNumberOfStreams(IMFPMediaItem *iface, DWORD *count)

1 0

Nikolay Sivov : mfplay: Forward playback control methods to the session.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: c3c51485fbdad050cc0b347545a23e647fadf86a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c51485fbdad050cc0b3475… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:02 2021 +0300 mfplay: Forward playback control methods to the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 16592f2b3b6..9ef926f00f6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -651,23 +651,31 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) static HRESULT WINAPI media_player_Play(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + PROPVARIANT pos; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + pos.vt = VT_EMPTY; + return IMFMediaSession_Start(player->session, &GUID_NULL, &pos); } static HRESULT WINAPI media_player_Pause(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + return IMFMediaSession_Pause(player->session); } static HRESULT WINAPI media_player_Stop(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + return IMFMediaSession_Stop(player->session); } static HRESULT WINAPI media_player_FrameStep(IMFPMediaPlayer *iface)

1 0

Nikolay Sivov : mfplay: Update player state on session state changes.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 11f4927fedafca7a61b973941dd56442f68bf18e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f4927fedafca7a61b97394… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:01 2021 +0300 mfplay: Update player state on session state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 85 insertions(+), 14 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6fbbc0f4632..16592f2b3b6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -70,8 +70,10 @@ struct media_player IMFSourceResolver *resolver; IMFMediaSession *session; MFP_CREATION_OPTIONS options; + MFP_MEDIAPLAYER_STATE state; HWND event_window; HWND output_window; + CRITICAL_SECTION cs; }; struct generic_event @@ -215,8 +217,8 @@ static const IUnknownVtbl media_event_vtbl = media_event_Release, }; -static HRESULT media_event_create(MFP_EVENT_TYPE event_type, HRESULT hr, - IMFPMediaPlayer *player, struct media_event **event) +static HRESULT media_event_create(struct media_player *player, MFP_EVENT_TYPE event_type, + HRESULT hr, struct media_event **event) { struct media_event *object; @@ -227,9 +229,9 @@ static HRESULT media_event_create(MFP_EVENT_TYPE event_type, HRESULT hr, object->refcount = 1; object->u.header.eEventType = event_type; object->u.header.hrEvent = hr; - object->u.header.pMediaPlayer = player; + object->u.header.pMediaPlayer = &player->IMFPMediaPlayer_iface; IMFPMediaPlayer_AddRef(object->u.header.pMediaPlayer); - /* FIXME: set player state field */ + object->u.header.eState = player->state; /* FIXME: set properties for some events? */ *event = object; @@ -254,6 +256,16 @@ static LRESULT WINAPI media_player_event_proc(HWND hwnd, UINT msg, WPARAM wparam return DefWindowProcW(hwnd, msg, wparam, lparam); } +static void media_player_set_state(struct media_player *player, MFP_MEDIAPLAYER_STATE state) +{ + if (player->state != MFP_MEDIAPLAYER_STATE_SHUTDOWN) + { + if (state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + IMFMediaSession_Shutdown(player->session); + player->state = state; + } +} + static HRESULT WINAPI media_item_QueryInterface(IMFPMediaItem *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -628,6 +640,7 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) if (player->session) IMFMediaSession_Release(player->session); DestroyWindow(player->event_window); + DeleteCriticalSection(&player->cs); heap_free(player); platform_shutdown(); @@ -708,9 +721,13 @@ static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOO static HRESULT WINAPI media_player_GetState(IMFPMediaPlayer *iface, MFP_MEDIAPLAYER_STATE *state) { - FIXME("%p, %p.\n", iface, state); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, state); + + *state = player->state; + + return S_OK; } static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface, @@ -928,9 +945,15 @@ static HRESULT WINAPI media_player_RemoveAllEffects(IMFPMediaPlayer *iface) static HRESULT WINAPI media_player_Shutdown(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&player->cs); + media_player_set_state(player, MFP_MEDIAPLAYER_STATE_SHUTDOWN); + LeaveCriticalSection(&player->cs); + + return S_OK; } static const IMFPMediaPlayerVtbl media_player_vtbl = @@ -1108,7 +1131,7 @@ static HRESULT WINAPI media_player_resolver_callback_Invoke(IMFAsyncCallback *if if (FAILED(hr)) WARN("Failed to set media source, hr %#x.\n", hr); - if (FAILED(media_event_create(MFP_EVENT_TYPE_MEDIAITEM_CREATED, hr, &player->IMFPMediaPlayer_iface, &event))) + if (FAILED(media_event_create(player, MFP_EVENT_TYPE_MEDIAITEM_CREATED, hr, &event))) { WARN("Failed to create event object.\n"); IUnknown_Release(state); @@ -1195,14 +1218,61 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFAsyncResult *result) { struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); - IMFMediaEvent *event; - HRESULT hr; - - if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &event))) + MediaEventType session_event_type = MEUnknown; + struct media_event *event = NULL; + IMFMediaEvent *session_event; + MFP_MEDIAPLAYER_STATE state; + MFP_EVENT_TYPE event_type; + HRESULT hr, event_status; + + if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; + IMFMediaEvent_GetType(session_event, &session_event_type); + IMFMediaEvent_GetStatus(session_event, &event_status); + + switch (session_event_type) + { + case MESessionStarted: + case MESessionStopped: + case MESessionPaused: + if (session_event_type == MESessionStarted) + { + event_type = MFP_EVENT_TYPE_PLAY; + state = MFP_MEDIAPLAYER_STATE_PLAYING; + } + else if (session_event_type == MESessionStopped) + { + event_type = MFP_EVENT_TYPE_STOP; + state = MFP_MEDIAPLAYER_STATE_STOPPED; + } + else + { + event_type = MFP_EVENT_TYPE_PAUSE; + state = MFP_MEDIAPLAYER_STATE_PAUSED; + } + + EnterCriticalSection(&player->cs); + media_player_set_state(player, state); + media_event_create(player, event_type, event_status, &event); + LeaveCriticalSection(&player->cs); + + /* FIXME: set pMediaItem */ + media_player_queue_event(player, event); + IUnknown_Release(&event->IUnknown_iface); + + break; + default: + ; + } + + if (event) + { + IUnknown_Release(&event->IUnknown_iface); + } + IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); - IMFMediaEvent_Release(event); + IMFMediaEvent_Release(session_event); return S_OK; } @@ -1240,6 +1310,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C IMFPMediaPlayerCallback_AddRef(object->callback); object->options = options; object->output_window = window; + InitializeCriticalSection(&object->cs); if (FAILED(hr = CreatePropertyStore(&object->propstore))) goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver)))

1 0

Nikolay Sivov : mfplay: Create per-player session instance.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 7e9d294711a7abe96a237d9750d039f42c1fd903 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9d294711a7abe96a237d97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:00 2021 +0300 mfplay: Create per-player session instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 479aca40890..6fbbc0f4632 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -63,10 +63,12 @@ struct media_player IPropertyStore IPropertyStore_iface; IMFAsyncCallback resolver_callback; IMFAsyncCallback events_callback; + IMFAsyncCallback session_events_callback; LONG refcount; IMFPMediaPlayerCallback *callback; IPropertyStore *propstore; IMFSourceResolver *resolver; + IMFMediaSession *session; MFP_CREATION_OPTIONS options; HWND event_window; HWND output_window; @@ -121,6 +123,11 @@ static struct media_player *impl_from_events_IMFAsyncCallback(IMFAsyncCallback * return CONTAINING_RECORD(iface, struct media_player, events_callback); } +static struct media_player *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_player, session_events_callback); +} + static struct media_item *impl_from_IMFPMediaItem(IMFPMediaItem *iface) { return CONTAINING_RECORD(iface, struct media_item, IMFPMediaItem_iface); @@ -618,6 +625,8 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) IPropertyStore_Release(player->propstore); if (player->resolver) IMFSourceResolver_Release(player->resolver); + if (player->session) + IMFMediaSession_Release(player->session); DestroyWindow(player->event_window); heap_free(player); @@ -1170,6 +1179,43 @@ static const IMFAsyncCallbackVtbl media_player_events_callback_vtbl = media_player_events_callback_Invoke, }; +static ULONG WINAPI media_player_session_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); + return IMFPMediaPlayer_AddRef(&player->IMFPMediaPlayer_iface); +} + +static ULONG WINAPI media_player_session_events_callback_Release(IMFAsyncCallback *iface) +{ + struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); + return IMFPMediaPlayer_Release(&player->IMFPMediaPlayer_iface); +} + +static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, + IMFAsyncResult *result) +{ + struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); + IMFMediaEvent *event; + HRESULT hr; + + if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &event))) + return S_OK; + + IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); + IMFMediaEvent_Release(event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl media_player_session_events_callback_vtbl = +{ + media_player_callback_QueryInterface, + media_player_session_events_callback_AddRef, + media_player_session_events_callback_Release, + media_player_callback_GetParameters, + media_player_session_events_callback_Invoke, +}; + HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { @@ -1187,6 +1233,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C object->IPropertyStore_iface.lpVtbl = &media_player_propstore_vtbl; object->resolver_callback.lpVtbl = &media_player_resolver_callback_vtbl; object->events_callback.lpVtbl = &media_player_events_callback_vtbl; + object->session_events_callback.lpVtbl = &media_player_session_events_callback_vtbl; object->refcount = 1; object->callback = callback; if (object->callback) @@ -1197,6 +1244,10 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) goto failed; + if (FAILED(hr = MFCreateMediaSession(NULL, &object->session))) + goto failed; + if (FAILED(hr = IMFMediaSession_BeginGetEvent(object->session, &object->session_events_callback, NULL))) + goto failed; if (!(object->options & MFP_OPTION_FREE_THREADED_CALLBACK)) { object->event_window = CreateWindowW(eventclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE,

1 0

Nikolay Sivov : mfplay: Implement GetVideoWindow().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 0f18e5f81d44ca9daea91cd0f199dc8b7e751f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f18e5f81d44ca9daea91cd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:06:59 2021 +0300 mfplay: Implement GetVideoWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 ++++++++++++------ dlls/mfplay/tests/mfplay.c | 8 +++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 246704c2799..479aca40890 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -69,6 +69,7 @@ struct media_player IMFSourceResolver *resolver; MFP_CREATION_OPTIONS options; HWND event_window; + HWND output_window; }; struct generic_event @@ -862,11 +863,15 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *hwnd) +static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *window) { - FIXME("%p, %p.\n", iface, hwnd); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + *window = player->output_window; + + return S_OK; } static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) @@ -1166,12 +1171,12 @@ static const IMFAsyncCallbackVtbl media_player_events_callback_vtbl = }; HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, - IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) + IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; HRESULT hr; - TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player); + TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1184,9 +1189,10 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C object->events_callback.lpVtbl = &media_player_events_callback_vtbl; object->refcount = 1; object->callback = callback; - object->options = options; if (object->callback) IMFPMediaPlayerCallback_AddRef(object->callback); + object->options = options; + object->output_window = window; if (FAILED(hr = CreatePropertyStore(&object->propstore))) goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 64347265c40..6d82f630075 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -83,6 +83,7 @@ static void test_create_player(void) IPropertyStore *propstore; IMFPMediaPlayer *player; IUnknown *unk, *unk2; + HWND window; HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); @@ -108,8 +109,13 @@ static void test_create_player(void) IMFPMediaPlayer_Release(player); - hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, (HWND)0x1, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoWindow(player, &window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(window == (HWND)0x1, "Unexpected window.\n"); + IMFPMediaPlayer_Release(player); }

1 0

Zebediah Figura : ntoskrnl/tests: Keep the test output file open for the entire duration each driver is loaded.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: e3ca290a4c0302da35c70e655ee7d38a33f7c871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ca290a4c0302da35c70e65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:25 2021 -0500 ntoskrnl/tests: Keep the test output file open for the entire duration each driver is loaded. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 53 +++++++++++++--------------------- dlls/ntoskrnl.exe/tests/driver_netio.c | 24 +++++++-------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++-- 3 files changed, 35 insertions(+), 48 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6d46314216b..0d991cd98d6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1781,8 +1781,6 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_stack_limits(); test_completion(); - winetest_cleanup(); - irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); @@ -2104,15 +2102,11 @@ static void test_permanence(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; - struct main_test_input *test_input = (struct main_test_input *)buffer; - NTSTATUS status; + struct main_test_input *test_input = buffer; if (!buffer) return STATUS_ACCESS_VIOLATION; - if ((status = winetest_init())) - return status; - pExEventObjectType = get_proc_address("ExEventObjectType"); ok(!!pExEventObjectType, "ExEventObjectType not found\n"); @@ -2520,6 +2514,8 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) IoDeleteDevice(upper_device); IoDeleteDevice(lower_device); + + winetest_cleanup(); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) @@ -2528,6 +2524,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) NTSTATUS status; void *obj; + if ((status = winetest_init())) + return status; + DbgPrint("loading driver\n"); driver_obj = driver; @@ -2547,38 +2546,26 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); RtlInitUnicodeString(&nameW, L"\\Driver\\WineTestDriver"); - if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) - return status; - if (obj != driver) - { - ObDereferenceObject(obj); - return STATUS_UNSUCCESSFUL; - } + status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj); + ok(!status, "got %#x\n", status); + ok(obj == driver, "expected %p, got %p\n", driver, obj); ObDereferenceObject(obj); RtlInitUnicodeString(&nameW, L"\\Device\\WineTestDriver"); RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); - if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) - { - status = IoCreateSymbolicLink(&linkW, &nameW); - lower_device->Flags &= ~DO_DEVICE_INITIALIZING; - } - - if (!status) - { - RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device); + ok(!status, "failed to create device, status %#x\n", status); + status = IoCreateSymbolicLink(&linkW, &nameW); + ok(!status, "failed to create link, status %#x\n", status); + lower_device->Flags &= ~DO_DEVICE_INITIALIZING; - status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); - } + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); + ok(!status, "failed to create device, status %#x\n", status); - if (!status) - { - IoAttachDeviceToDeviceStack(upper_device, lower_device); - upper_device->Flags &= ~DO_DEVICE_INITIALIZING; - } + IoAttachDeviceToDeviceStack(upper_device, lower_device); + upper_device->Flags &= ~DO_DEVICE_INITIALIZING; - return status; + return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ec8161d2424..ea9cfd1a4c5 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -466,21 +466,15 @@ static void test_wsk_connect_socket(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; - NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; - if ((status = winetest_init())) - return status; - netio_init(); test_wsk_get_address_info(); test_wsk_listen_socket(); test_wsk_connect_socket(); - winetest_cleanup(); - irp->IoStatus.Information = 0; return STATUS_SUCCESS; } @@ -533,6 +527,8 @@ static VOID WINAPI driver_unload(DRIVER_OBJECT *driver) IoDeleteSymbolicLink(&linkW); IoDeleteDevice(device_obj); + + winetest_cleanup(); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) @@ -540,6 +536,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) UNICODE_STRING nameW, linkW; NTSTATUS status; + if ((status = winetest_init())) + return status; + DbgPrint("Loading driver.\n"); driver_obj = driver; @@ -552,12 +551,11 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) RtlInitUnicodeString(&nameW, device_name); RtlInitUnicodeString(&linkW, driver_link); - if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &device_obj))) - { - status = IoCreateSymbolicLink(&linkW, &nameW); - device_obj->Flags &= ~DO_DEVICE_INITIALIZING; - } + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &device_obj); + ok(!status, "failed to create device, status %#x\n", status); + status = IoCreateSymbolicLink(&linkW, &nameW); + ok(!status, "failed to create link, status %#x\n", status); + device_obj->Flags &= ~DO_DEVICE_INITIALIZING; - return status; + return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4f7afed171c..4981709034c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -405,8 +405,6 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - cat_okfile(); - heap_free(test_input); } @@ -931,6 +929,8 @@ static void test_driver_netio(struct testsign_context *ctx) unload_driver(service); ret = DeleteFileW(filename); ok(ret, "DeleteFile failed: %u\n", GetLastError()); + + cat_okfile(); } static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) @@ -1272,6 +1272,8 @@ START_TEST(ntoskrnl) ret = DeleteFileW(filename2); ok(ret, "DeleteFile failed: %u\n", GetLastError()); + cat_okfile(); + test_driver3(&ctx); subtest("driver_netio"); test_driver_netio(&ctx);

1 0

Zebediah Figura : ntoskrnl/tests: Create the driver output file only once.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: cfa7006f799e1d746710ba6af3ef0520e77397a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa7006f799e1d746710ba6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:24 2021 -0500 ntoskrnl/tests: Create the driver output file only once. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 22fddfd3192..4f7afed171c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -366,7 +366,9 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } -static void cat_okfile(HANDLE okfile) +static HANDLE okfile; + +static void cat_okfile(void) { char buffer[512]; DWORD size; @@ -390,16 +392,9 @@ static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - HANDLE okfile; DWORD size; BOOL res; - /* Create a temporary file that the driver will write ok/trace output to. */ - - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); - test_input = heap_alloc( sizeof(*test_input) ); test_input->process_id = GetCurrentProcessId(); test_input->teststr_offset = (SIZE_T)((BYTE *)&teststr - (BYTE *)NtCurrentTeb()->Peb->ImageBaseAddress); @@ -410,11 +405,9 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - cat_okfile(okfile); + cat_okfile(); heap_free(test_input); - CloseHandle(okfile); - DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); } static void test_basic_ioctl(void) @@ -1235,6 +1228,10 @@ START_TEST(ntoskrnl) test_data->winetest_report_success = winetest_report_success; test_data->winetest_debug = winetest_debug; + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) goto out; @@ -1285,4 +1282,6 @@ out: testsign_cleanup(&ctx); UnmapViewOfFile(test_data); CloseHandle(mapping); + CloseHandle(okfile); + DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); }

1 0

Zebediah Figura : ntoskrnl/tests: Separate a helper to print the contents of the driver output file.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 57d438b5d33ce605c1c0c17ce33eab6e4bea57cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d438b5d33ce605c1c0c17c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:23 2021 -0500 ntoskrnl/tests: Separate a helper to print the contents of the driver output file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d0320fbb2b4..22fddfd3192 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -366,19 +366,37 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } +static void cat_okfile(HANDLE okfile) +{ + char buffer[512]; + DWORD size; + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + + do + { + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + SetEndOfFile(okfile); + + winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); +} + static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - char buffer[512]; HANDLE okfile; DWORD size; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ, + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); @@ -392,12 +410,7 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - do { - ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); - printf("%.*s", size, buffer); - } while (size == sizeof(buffer)); - - winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + cat_okfile(okfile); heap_free(test_input); CloseHandle(okfile);

1 0

Zebediah Figura : ntoskrnl/tests: Write test counts to the shared memory section.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 553eb70ebf7c3e3af5e9b42ab32c278e34f829fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=553eb70ebf7c3e3af5e9b42a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:22 2021 -0500 ntoskrnl/tests: Write test counts to the shared memory section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 7 +------ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/driver_netio.c | 6 +----- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 33 ++++++++++++++++----------------- dlls/ntoskrnl.exe/tests/utils.h | 30 ++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c5e0bdf754f..6d46314216b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1770,7 +1770,6 @@ static PIO_WORKITEM main_test_work_item; static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) { IRP *irp = context; - void *buffer = irp->AssociatedIrp.SystemBuffer; IoFreeWorkItem(main_test_work_item); main_test_work_item = NULL; @@ -1784,9 +1783,8 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) winetest_cleanup(); - *((LONG *)buffer) = failures; irp->IoStatus.Status = STATUS_SUCCESS; - irp->IoStatus.Information = sizeof(failures); + irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); } @@ -2105,15 +2103,12 @@ static void test_permanence(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; struct main_test_input *test_input = (struct main_test_input *)buffer; NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(failures)) - return STATUS_BUFFER_TOO_SMALL; if ((status = winetest_init())) return status; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index cdf706b9830..397dd528e84 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -43,6 +43,7 @@ struct test_data int running_under_wine; int winetest_report_success; int winetest_debug; + int successes, failures, skipped, todo_successes, todo_failures; }; struct main_test_input diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index 55b5688ff53..ec8161d2424 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -465,14 +465,11 @@ static void test_wsk_connect_socket(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(failures)) - return STATUS_BUFFER_TOO_SMALL; if ((status = winetest_init())) return status; @@ -484,8 +481,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st winetest_cleanup(); - *((LONG *)buffer) = failures; - irp->IoStatus.Information = sizeof(failures); + irp->IoStatus.Information = 0; return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 92cbfa6a329..d0320fbb2b4 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -47,6 +47,8 @@ static const GUID GUID_NULL; static HANDLE device; +static struct test_data *test_data; + static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); @@ -369,10 +371,9 @@ static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - DWORD written, read; - LONG new_failures; char buffer[512]; HANDLE okfile; + DWORD size; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ @@ -387,17 +388,16 @@ static void main_test(void) test_input->modified_value = &modified_value; modified_value = 0; - res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), - &new_failures, sizeof(new_failures), &written, NULL); + res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), NULL, 0, &size, NULL); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - ok(written == sizeof(new_failures), "got size %x\n", written); + ok(!size, "got size %u\n", size); - /* Print the ok/trace output and then add to our failure count. */ do { - ReadFile(okfile, buffer, sizeof(buffer), &read, NULL); - printf("%.*s", read, buffer); - } while (read == sizeof(buffer)); - winetest_add_failures(new_failures); + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); heap_free(test_input); CloseHandle(okfile); @@ -1193,7 +1193,6 @@ START_TEST(ntoskrnl) WCHAR filename[MAX_PATH], filename2[MAX_PATH]; struct testsign_context ctx; SC_HANDLE service, service2; - struct test_data *data; BOOL ret, is_wow64; HANDLE mapping; DWORD written; @@ -1216,12 +1215,12 @@ START_TEST(ntoskrnl) return; mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, - 0, sizeof(*data), "Global\\winetest_ntoskrnl_section"); + 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); ok(!!mapping, "got error %u\n", GetLastError()); - data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); - data->running_under_wine = !strcmp(winetest_platform, "wine"); - data->winetest_report_success = winetest_report_success; - data->winetest_debug = winetest_debug; + test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + test_data->running_under_wine = !strcmp(winetest_platform, "wine"); + test_data->winetest_report_success = winetest_report_success; + test_data->winetest_debug = winetest_debug; subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) @@ -1271,6 +1270,6 @@ START_TEST(ntoskrnl) out: testsign_cleanup(&ctx); - UnmapViewOfFile(data); + UnmapViewOfFile(test_data); CloseHandle(mapping); } diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f743e88097a..60a5e4d1255 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -88,6 +88,13 @@ static inline NTSTATUS winetest_init(void) static inline void winetest_cleanup(void) { + struct test_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + void *addr = NULL; + HANDLE section; + if (winetest_debug) { kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", @@ -95,6 +102,29 @@ static inline void winetest_cleanup(void) todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); } + + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + + if (!ZwOpenSection(&section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr)) + { + if (!ZwMapViewOfSection(section, NtCurrentProcess(), &addr, + 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE)) + { + data = addr; + + InterlockedExchangeAdd(&data->successes, successes); + InterlockedExchangeAdd(&data->failures, failures); + InterlockedExchangeAdd(&data->skipped, skipped); + InterlockedExchangeAdd(&data->todo_successes, todo_successes); + InterlockedExchangeAdd(&data->todo_failures, todo_failures); + + ZwUnmapViewOfSection(NtCurrentProcess(), addr); + } + ZwClose(section); + } + ZwClose(okfile); }

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
87
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 April 2021