wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Lukáš Krejčí : mciqtz32: Don' t overflow seek times during multiplication.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 1d9a3f6d12322891a2af4aadd66a92ea66479233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d9a3f6d12322891a2af4aad… Author: Lukáš Krejčí <lskrejci(a)gmail.com> Date: Wed May 29 08:42:10 2019 +0200 mciqtz32: Don't overflow seek times during multiplication. Seek times are of type REFERENCE_TIME (64-bit), but the multiplication is done in DWORD (32-bit). Signed-off-by: Lukáš Krejčí <lskrejci(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 1aec326..ec4a8b5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -422,20 +422,19 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms wma->mci_flags = dwFlags; IMediaSeeking_GetTimeFormat(wma->seek, &format); if (dwFlags & MCI_FROM) { + wma->seek_start = lpParms->dwFrom; if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - wma->seek_start = lpParms->dwFrom * 10000; - else - wma->seek_start = lpParms->dwFrom; + wma->seek_start *= 10000; + start_flags = AM_SEEKING_AbsolutePositioning; } else { wma->seek_start = 0; start_flags = AM_SEEKING_NoPositioning; } if (dwFlags & MCI_TO) { + wma->seek_stop = lpParms->dwTo; if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - wma->seek_stop = lpParms->dwTo * 10000; - else - wma->seek_stop = lpParms->dwTo; + wma->seek_stop *= 10000; } else { wma->seek_stop = 0; IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop);

1 0

Huw Davies : kernel32: Move the implementation of GetTickCount() to kernel32.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 13e11d3fcbcf8790e031c4bc52f5f550b1377b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e11d3fcbcf8790e031c4bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 30 09:49:08 2019 +0100 kernel32: Move the implementation of GetTickCount() to kernel32. Fixes regression caused by 3e927c4aec9dbeef930b83f62ee0651b8c147247. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47265 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/time.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/ntdll_misc.h | 4 ---- dlls/ntdll/time.c | 2 +- 5 files changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5f3f1fa..c01f132 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -858,8 +858,8 @@ @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stdcall GetTickCount() ntdll.NtGetTickCount -@ stdcall -ret64 GetTickCount64() ntdll.NtGetTickCount +@ stdcall GetTickCount() +@ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 00fcc6b..737affc 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -38,6 +38,9 @@ #elif defined(HAVE_MACHINE_LIMITS_H) #include <machine/limits.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -64,6 +67,33 @@ static inline LONGLONG filetime_to_longlong( const FILETIME *ft ) return (((LONGLONG)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; } +#define TICKSPERSEC 10000000 +#define TICKSPERMSEC 10000 + +/* return a monotonic time counter, in Win32 ticks */ +static inline ULONGLONG monotonic_counter(void) +{ + LARGE_INTEGER counter; + +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + + NtQueryPerformanceCounter( &counter, NULL ); + return counter.QuadPart; +} + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -1528,3 +1558,30 @@ BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) RtlQueryUnbiasedInterruptTime(time); return TRUE; } + +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} + +/*********************************************************************** + * GetTickCount (KERNEL32.@) + * + * Get the number of milliseconds the system has been running. + * + * PARAMS + * None. + * + * RETURNS + * The current tick count. + * + * NOTES + * The value returned will wrap around every 2^32 milliseconds. + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 050ebc7..aeb9735 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -194,7 +194,7 @@ @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent -@ stdcall -ret64 NtGetTickCount() get_tick_count64 +@ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(long) @ stub NtImpersonateClientOfPort @@ -1142,7 +1142,7 @@ @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent -@ stdcall -private -ret64 ZwGetTickCount() get_tick_count64 +@ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 2d83f54..3463ebd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -268,8 +268,4 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); /* string functions */ int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); - -/* time functions */ -ULONGLONG WINAPI get_tick_count64( void ); -#define NtGetTickCount get_tick_count64 #endif diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 41e4563..20de627 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -557,7 +557,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH get_tick_count64(void) +ULONG WINAPI NtGetTickCount(void) { return monotonic_counter() / TICKSPERMSEC; }

1 0

Nikolay Sivov : mf: Implement ProcessSample() for unclocked mode.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 81e16e90c4825ac238a42fe83333444ea465b76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e16e90c4825ac238a42fe8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 30 14:46:15 2019 +0300 mf: Implement ProcessSample() for unclocked mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e2766c0..d19496d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -58,6 +58,7 @@ struct sample_grabber IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; enum sink_state state; + UINT32 ignore_clock; CRITICAL_SECTION cs; }; @@ -245,11 +246,76 @@ static HRESULT WINAPI sample_grabber_stream_GetMediaTypeHandler(IMFStreamSink *i return S_OK; } +static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFSample *sample) +{ + LONGLONG sample_time, sample_duration = 0; + IMFMediaBuffer *buffer; + DWORD flags, size; + GUID major_type; + BYTE *data; + HRESULT hr; + + hr = IMFMediaType_GetMajorType(grabber->media_type, &major_type); + + if (SUCCEEDED(hr)) + hr = IMFSample_GetSampleTime(sample, &sample_time); + + if (FAILED(IMFSample_GetSampleDuration(sample, &sample_duration))) + sample_duration = 0; + + if (SUCCEEDED(hr)) + hr = IMFSample_GetSampleFlags(sample, &flags); + + if (SUCCEEDED(hr)) + { + if (FAILED(IMFSample_ConvertToContiguousBuffer(sample, &buffer))) + return E_UNEXPECTED; + + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &size))) + { + hr = IMFSampleGrabberSinkCallback_OnProcessSample(grabber->callback, &major_type, flags, sample_time, + sample_duration, data, size); + IMFMediaBuffer_Unlock(buffer); + } + + IMFMediaBuffer_Release(buffer); + } + + return hr; +} + static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { - FIXME("%p, %p.\n", iface, sample); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); + LONGLONG sampletime; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, sample); + + if (!sample) + return S_OK; + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + EnterCriticalSection(&stream->sink->cs); + + if (stream->sink->state == SINK_STATE_RUNNING) + { + hr = IMFSample_GetSampleTime(sample, &sampletime); + + if (SUCCEEDED(hr)) + { + if (stream->sink->ignore_clock) + hr = sample_grabber_report_sample(stream->sink, sample); + else + FIXME("Sample scheduling is not implemented.\n"); + } + } + + LeaveCriticalSection(&stream->sink->cs); + + return hr; } static HRESULT WINAPI sample_grabber_stream_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type, @@ -905,6 +971,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use IMFSampleGrabberSinkCallback_AddRef(object->callback); object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); + IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); InitializeCriticalSection(&object->cs); if (FAILED(hr = sample_grabber_create_stream(object, &object->stream)))

1 0

Nikolay Sivov : mfplat: Add sample grabber attributes to debug tracing helper.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 1778775f47db0a6a32b5816bf2124480c283f692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1778775f47db0a6a32b5816b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 30 14:46:14 2019 +0300 mfplat: Add sample grabber attributes to debug tracing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1009f40..460f21e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -657,6 +657,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MFSampleExtension_3DVideo_SampleFormat), + X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TIME), X(MF_TOPOLOGY_PLAYBACK_FRAMERATE), @@ -701,8 +702,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_DISABLE_PREROLL), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), - X(MF_SOURCE_READER_D3D_MANAGER), X(MF_SINK_WRITER_D3D_MANAGER), + X(MF_SOURCE_READER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), @@ -717,6 +718,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), X(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY), + X(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK), X(MFSampleExtension_ForwardedDecodeUnitType), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS),

1 0

Nikolay Sivov : mf: Maintain sample grabber sink state.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 2dba94b27816fa3633744eecb3898ba3cee58d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dba94b27816fa3633744eec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 30 14:46:13 2019 +0300 mf: Maintain sample grabber sink state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 68 +++++++++++++++++++++++++++++++++++++++++++------ include/mfidl.idl | 3 +++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index d501e08..e2766c0 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -28,6 +28,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +enum sink_state +{ + SINK_STATE_STOPPED = 0, + SINK_STATE_RUNNING, +}; + struct sample_grabber; struct sample_grabber_stream @@ -51,6 +57,7 @@ struct sample_grabber struct sample_grabber_stream *stream; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; + enum sink_state state; CRITICAL_SECTION cs; }; @@ -685,32 +692,77 @@ static ULONG WINAPI sample_grabber_clock_sink_Release(IMFClockStateSink *iface) return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); } +static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_state state) +{ + static const DWORD events[] = + { + MEStreamSinkStopped, /* SINK_STATE_STOPPED */ + MEStreamSinkStarted, /* SINK_STATE_RUNNING */ + }; + BOOL set_state = FALSE; + + EnterCriticalSection(&grabber->cs); + + switch (grabber->state) + { + case SINK_STATE_STOPPED: + set_state = state == SINK_STATE_RUNNING; + break; + case SINK_STATE_RUNNING: + set_state = state == SINK_STATE_STOPPED; + break; + default: + ; + } + + if (set_state) + { + grabber->state = state; + if (grabber->stream) + IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } + + LeaveCriticalSection(&grabber->cs); +} + static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + + sample_grabber_set_state(grabber, SINK_STATE_RUNNING); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + sample_grabber_set_state(grabber, SINK_STATE_STOPPED); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + sample_grabber_set_state(grabber, SINK_STATE_RUNNING); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) diff --git a/include/mfidl.idl b/include/mfidl.idl index 2421c06..93e20a6 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -820,3 +820,6 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH, 0xc8cc113f cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x41a6, 0x4b79, 0x89, 0x7a, 0x1a, 0xb0, 0xe5, 0x2b, 0x4a, 0x1b);") cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);") + +cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") +cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Jacek Caban : ntoskrnl.exe: Set IRP caller thread.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 828ac9880d540c30dc40f8878436a436ffea8d0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=828ac9880d540c30dc40f887… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 13:12:25 2019 +0200 ntoskrnl.exe: Set IRP caller thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/tests/driver.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index df8c4c1..7ef3159 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1363,6 +1363,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, irp->UserBuffer = out_buff; irp->UserIosb = iosb; irp->UserEvent = event; + irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); return irp; } @@ -1415,6 +1416,7 @@ PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG majorfunc, DEVICE_OBJECT *device irp->UserIosb = iosb; irp->UserEvent = NULL; irp->UserBuffer = buffer; + irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); return irp; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c08452b..468b183 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -239,6 +239,8 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) ok(irpsp->DeviceObject == device, "unexpected DeviceObject\n"); ok(irpsp->FileObject->DeviceObject == device, "unexpected FileObject->DeviceObject\n"); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); + ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), + "IRP thread is not the current thread\n"); } static void test_mdl_map(void) @@ -751,6 +753,8 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); + ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), + "IRP thread is not the current thread\n"); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); @@ -773,6 +777,8 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); + ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), + "IRP thread is not the current thread\n"); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); @@ -1698,6 +1704,8 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); ok(irpsp->DeviceObject == device, "device != DeviceObject\n"); + ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), + "IRP thread is not the current thread\n"); IoMarkIrpPending(irp); return STATUS_PENDING; }

1 0

Jacek Caban : server: Associate create and close IRPs with current thread.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 7f0883ae88a9943155426bba2265eae9efc65744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0883ae88a9943155426bba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 13:12:17 2019 +0200 server: Associate create and close IRPs with current thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ server/device.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index b61e970..c08452b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -54,6 +54,7 @@ static int winetest_report_success; static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType; static PEPROCESS *pPsInitialSystemProcess; +static void *create_caller_thread; void WINAPI ObfReferenceObject( void *obj ); @@ -356,6 +357,8 @@ static void test_current_thread(BOOL is_system) ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); + if (!is_system) + ok(create_caller_thread == KeGetCurrentThread(), "thread is not create caller thread\n"); ret = ObOpenObjectByPointer(current, OBJ_KERNEL_HANDLE, NULL, PROCESS_QUERY_INFORMATION, NULL, KernelMode, &process_handle); ok(!ret, "ObOpenObjectByPointer failed: %#x\n", ret); @@ -1644,6 +1647,7 @@ static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); last_created_file = irpsp->FileObject; + create_caller_thread = KeGetCurrentThread(); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); diff --git a/server/device.c b/server/device.c index bc27108..d3e2a84 100644 --- a/server/device.c +++ b/server/device.c @@ -475,7 +475,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, if ((irp = create_irp( file, &params, NULL ))) { - add_irp_to_queue( device->manager, irp, NULL ); + add_irp_to_queue( device->manager, irp, current ); release_object( irp ); } } @@ -523,7 +523,7 @@ static int device_file_close_handle( struct object *obj, struct process *process if ((irp = create_irp( file, &params, NULL ))) { - add_irp_to_queue( file->device->manager, irp, NULL ); + add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); } }

1 0

Jacek Caban : ntoskrnl.exe: Dispatch server IRPs in critical region.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: e80b507f1e0ded2eee92a75248b81b8ea9ecc767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e80b507f1e0ded2eee92a752… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 13:11:59 2019 +0200 ntoskrnl.exe: Dispatch server IRPs in critical region. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/tests/driver.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 14b5a1a..df8c4c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -602,7 +602,9 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte context->irp = irp; device->CurrentIrp = irp; + KeEnterCriticalRegion(); IoCallDriver( device, irp ); + KeLeaveCriticalRegion(); device->CurrentIrp = NULL; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 69a7d78..b61e970 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -386,7 +386,6 @@ static void test_critical_region(BOOL is_dispatcher) KeLeaveCriticalRegion(); result = KeAreApcsDisabled(); - todo_wine_if(is_dispatcher) ok(result == is_dispatcher || broken(is_dispatcher && !result), "KeAreApcsDisabled returned %x\n", result); }

1 0

Jacek Caban : server: Use current thread for IRP calls without associated thread.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 49b834bb42150183c0d707a328a6bf54c7bc010b URL: https://source.winehq.org/git/wine.git/?a=commit;h=49b834bb42150183c0d707a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 13:11:52 2019 +0200 server: Use current thread for IRP calls without associated thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/device.c b/server/device.c index ee7df5a..bc27108 100644 --- a/server/device.c +++ b/server/device.c @@ -951,12 +951,14 @@ DECL_HANDLER(get_next_device_request) if ((ptr = list_head( &manager->requests ))) { + struct thread *thread; + irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); - if (irp->thread) - { - reply->client_thread = get_kernel_object_ptr( manager, &irp->thread->obj ); - reply->client_tid = get_thread_id( irp->thread ); - } + + thread = irp->thread ? irp->thread : current; + reply->client_thread = get_kernel_object_ptr( manager, &thread->obj ); + reply->client_tid = get_thread_id( thread ); + iosb = irp->iosb; reply->in_size = iosb->in_size; if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW );

1 0

Derek Lesho : ntoskrnl.exe: Implement KeAreApcsDisabled.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 51a732163fc3db25cba059a24bbccc2d34d5be51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a732163fc3db25cba059a2… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Thu May 30 13:11:42 2019 +0200 ntoskrnl.exe: Implement KeAreApcsDisabled. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 23 +++++++++++++++++++++++ include/ddk/ntddk.h | 1 + 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b5d89f6..14b5a1a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3569,7 +3569,8 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ */ void WINAPI KeEnterCriticalRegion(void) { - FIXME(": stub\n"); + TRACE( "semi-stub\n" ); + KeGetCurrentThread()->critical_region++; } /*********************************************************************** @@ -3577,7 +3578,18 @@ void WINAPI KeEnterCriticalRegion(void) */ void WINAPI KeLeaveCriticalRegion(void) { - FIXME(": stub\n"); + TRACE( "semi-stub\n" ); + KeGetCurrentThread()->critical_region--; +} + +/*********************************************************************** + * KeAreApcsDisabled (NTOSKRNL.@) + */ +BOOLEAN WINAPI KeAreApcsDisabled(void) +{ + unsigned int critical_region = KeGetCurrentThread()->critical_region; + TRACE( "%u\n", critical_region ); + return !!critical_region; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 72ebdc1..7c93705 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -523,7 +523,7 @@ @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable -@ stub KeAreApcsDisabled +@ stdcall KeAreApcsDisabled() @ stub KeAttachProcess @ stub KeBugCheck @ stub KeBugCheckEx diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index c003788..03b4432 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -41,6 +41,7 @@ struct _KTHREAD DISPATCHER_HEADER header; PEPROCESS process; CLIENT_ID id; + unsigned int critical_region; }; struct _ETHREAD diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 73fc2fb..69a7d78 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -370,6 +370,27 @@ static void test_current_thread(BOOL is_system) ok(!ret, "ZwClose failed: %#x\n", ret); } +static void test_critical_region(BOOL is_dispatcher) +{ + BOOLEAN result; + + KeEnterCriticalRegion(); + KeEnterCriticalRegion(); + + result = KeAreApcsDisabled(); + ok(result == TRUE, "KeAreApcsDisabled returned %x\n", result); + KeLeaveCriticalRegion(); + + result = KeAreApcsDisabled(); + ok(result == TRUE, "KeAreApcsDisabled returned %x\n", result); + KeLeaveCriticalRegion(); + + result = KeAreApcsDisabled(); + todo_wine_if(is_dispatcher) + ok(result == is_dispatcher || broken(is_dispatcher && !result), + "KeAreApcsDisabled returned %x\n", result); +} + static void sleep(void) { LARGE_INTEGER timeout; @@ -1490,6 +1511,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) main_test_work_item = NULL; test_current_thread(TRUE); + test_critical_region(FALSE); test_call_driver(device); test_cancel_irp(device); @@ -1546,6 +1568,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_irp_struct(irp, device); test_current_thread(FALSE); + test_critical_region(TRUE); test_mdl_map(); test_init_funcs(); test_load_driver(); diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index d6ecbae..4afef81 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -216,6 +216,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +BOOLEAN WINAPI KeAreApcsDisabled(void); NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *);

1 0

← Newer
1
2
3
4
5
6
7
8
...
102
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 May 2019