wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Martin Storsjo : avicap32: Fix compilation with older videodev2.h.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: b10cdce31da978cb458c46a5ac55acd184ab7713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b10cdce31da978cb458c46a5… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Apr 27 22:06:59 2019 +0300 avicap32: Fix compilation with older videodev2.h. Older videodev2.h lack the V4L2_CAP_DEVICE_CAPS define and the device_caps field in the v4l2_capability struct. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/avicap32_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 1c4170e..9e2a99d 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -129,9 +129,11 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi memset(&caps, 0, sizeof(caps)); if (xioctl(fd, VIDIOC_QUERYCAP, &caps) != -1) { BOOL isCaptureDevice; +#ifdef V4L2_CAP_DEVICE_CAPS if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) isCaptureDevice = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; else +#endif isCaptureDevice = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; if (isCaptureDevice) { lstrcpynA(name, (char *)caps.card, namesize);

1 0

Nikolay Sivov : mf: Add stub scheme handler for local file urls.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: df9a047aa2fd8c0cc9e834c62f31fc5a0099fb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9a047aa2fd8c0cc9e834c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 17:26:39 2019 +0300 mf: Add stub scheme handler for local file urls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 + dlls/mf/main.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.idl | 26 ++++++ dlls/mf/mf.spec | 8 +- 4 files changed, 268 insertions(+), 4 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f05364b..5e18ab4 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -6,3 +6,5 @@ C_SRCS = \ main.c \ session.c \ topology.c + +IDL_SRCS = mf.idl diff --git a/dlls/mf/main.c b/dlls/mf/main.c index b3573d7..1b00ea5 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -25,11 +25,246 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" +#include "rpcproxy.h" + +#include "initguid.h" +#include "mf.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static HINSTANCE mf_instance; + +struct class_factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(REFIID riid, void **obj); +}; + +static inline struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IClassFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("%s is not supported.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + + TRACE("%p, %p, %s, %p.\n", iface, outer, debugstr_guid(riid), obj); + + if (outer) + { + *obj = NULL; + return CLASS_E_NOAGGREGATION; + } + + return factory->create_instance(riid, obj); +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("%d.\n", dolock); + + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +struct file_scheme_handler +{ + IMFSchemeHandler IMFSchemeHandler_iface; + LONG refcount; +}; + +static struct file_scheme_handler *impl_from_IMFSchemeHandler(IMFSchemeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct file_scheme_handler, IMFSchemeHandler_iface); +} + +static HRESULT WINAPI file_scheme_handler_QueryInterface(IMFSchemeHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFSchemeHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFSchemeHandler_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI file_scheme_handler_AddRef(IMFSchemeHandler *iface) +{ + struct file_scheme_handler *handler = impl_from_IMFSchemeHandler(iface); + ULONG refcount = InterlockedIncrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", handler, refcount); + + return refcount; +} + +static ULONG WINAPI file_scheme_handler_Release(IMFSchemeHandler *iface) +{ + struct file_scheme_handler *handler = impl_from_IMFSchemeHandler(iface); + ULONG refcount = InterlockedDecrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + heap_free(handler); + + return refcount; +} + +static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *iface, const WCHAR *url, DWORD flags, + IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) +{ + FIXME("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_scheme_handler_EndCreateObject(IMFSchemeHandler *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + FIXME("%p, %p, %p, %p.\n", iface, result, obj_type, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_scheme_handler_CancelObjectCreation(IMFSchemeHandler *iface, IUnknown *cancel_cookie) +{ + FIXME("%p, %p.\n", iface, cancel_cookie); + + return E_NOTIMPL; +} + +static const IMFSchemeHandlerVtbl file_scheme_handler_vtbl = +{ + file_scheme_handler_QueryInterface, + file_scheme_handler_AddRef, + file_scheme_handler_Release, + file_scheme_handler_BeginCreateObject, + file_scheme_handler_EndCreateObject, + file_scheme_handler_CancelObjectCreation, +}; + +static HRESULT file_scheme_handler_construct(REFIID riid, void **obj) +{ + struct file_scheme_handler *handler; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + handler = heap_alloc(sizeof(*handler)); + if (!handler) + return E_OUTOFMEMORY; + + handler->IMFSchemeHandler_iface.lpVtbl = &file_scheme_handler_vtbl; + handler->refcount = 1; + + hr = IMFSchemeHandler_QueryInterface(&handler->IMFSchemeHandler_iface, riid, obj); + IMFSchemeHandler_Release(&handler->IMFSchemeHandler_iface); + + return hr; +} + +static struct class_factory file_scheme_handler_factory = { { &class_factory_vtbl }, file_scheme_handler_construct }; + +static const struct class_object +{ + const GUID *clsid; + IClassFactory *factory; +} +class_objects[] = +{ + { &CLSID_FileSchemeHandler, &file_scheme_handler_factory.IClassFactory_iface }, +}; + +/******************************************************************************* + * DllGetClassObject (mf.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + unsigned int i; + + TRACE("%s, %s, %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + for (i = 0; i < ARRAY_SIZE(class_objects); ++i) + { + if (IsEqualGUID(class_objects[i].clsid, rclsid)) + return IClassFactory_QueryInterface(class_objects[i].factory, riid, obj); + } + + WARN("%s: class not found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow (mf.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (mf.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( mf_instance ); +} + +/*********************************************************************** + * DllUnregisterServer (mf.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( mf_instance ); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -37,6 +272,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + mf_instance = instance; DisableThreadLibraryCalls(instance); break; } diff --git a/dlls/mf/mf.idl b/dlls/mf/mf.idl new file mode 100644 index 0000000..824c246 --- /dev/null +++ b/dlls/mf/mf.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep header register + +[ + helpstring("File scheme handler"), + threading(both), + uuid(477ec299-1421-4bdd-971f-7ccb933f21ad) +] +coclass FileSchemeHandler { } diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 2d02ef8..dd3d6d0 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -2,10 +2,10 @@ @ stub ConvertPropVariant @ stub CopyPropertyStore @ stub CreateNamedPropertyStore -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub ExtractPropVariant @ stub MFCreate3GPMediaSink @ stub MFCreateASFByteStreamPlugin

1 0

Jacek Caban : ntoskrnl.exe: Implement PsGetThreadId.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 82860424bf52bb3dc7b4bd04fcd751466d40e912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82860424bf52bb3dc7b4bd04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 29 16:01:45 2019 +0200 ntoskrnl.exe: Implement PsGetThreadId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 1 + include/ddk/ntddk.h | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9d78fa7..9d75223 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2598,6 +2598,14 @@ NTSTATUS WINAPI PsLookupThreadByThreadId( HANDLE threadid, PETHREAD *thread ) return status; } +/********************************************************************* + * PsGetThreadId (NTOSKRNL.@) + */ +HANDLE WINAPI PsGetThreadId(PETHREAD thread) +{ + TRACE( "%p -> %p\n", thread, thread->kthread.id.UniqueThread ); + return thread->kthread.id.UniqueThread; +} /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26d7570..53070f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -898,7 +898,7 @@ @ stdcall -arch=x86_64 PsGetProcessWow64Process(ptr) @ stub PsGetThreadFreezeCount @ stub PsGetThreadHardErrorsAreDisabled -@ stub PsGetThreadId +@ stdcall PsGetThreadId(ptr) @ stub PsGetThreadProcess @ stub PsGetThreadProcessId @ stub PsGetThreadSessionId diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0fe7ad3..4bbaa79 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -340,6 +340,7 @@ static void test_currentprocess(void) ret = wait_single( thread, 0 ); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(!PsIsSystemThread((PETHREAD)KeGetCurrentThread()), "unexpected system thread\n"); } diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 68599bf..c9254d2 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -217,6 +217,7 @@ NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_ void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); +HANDLE WINAPI PsGetThreadId(PETHREAD); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*);

1 0

Jacek Caban : ntoskrnl.exe: Implement PsGetProcessId.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: eb1146a50056b7b4b4f1f44be0e71e97f8ba2c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1146a50056b7b4b4f1f44b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 29 16:01:34 2019 +0200 ntoskrnl.exe: Implement PsGetProcessId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 +++- dlls/ntoskrnl.exe/tests/driver.c | 2 ++ include/ddk/ntddk.h | 1 + 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 48e9656..9d78fa7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2462,6 +2462,7 @@ static void *create_process_object( HANDLE handle ) process->header.Type = 3; process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + NtQueryInformationProcess( handle, ProcessBasicInformation, &process->info, sizeof(process->info), NULL ); return process; } @@ -2503,6 +2504,15 @@ NTSTATUS WINAPI PsLookupProcessByProcessId( HANDLE processid, PEPROCESS *process return status; } +/********************************************************************* + * PsGetProcessId (NTOSKRNL.@) + */ +HANDLE WINAPI PsGetProcessId(PEPROCESS process) +{ + TRACE( "%p -> %lx\n", process, process->info.UniqueProcessId ); + return (HANDLE)process->info.UniqueProcessId; +} + static void *create_thread_object( HANDLE handle ) { @@ -4240,16 +4250,6 @@ void WINAPI ExfUnblockPushLock( EX_PUSH_LOCK *lock, PEX_PUSH_LOCK_WAIT_BLOCK blo } /********************************************************************* - * PsGetProcessId (NTOSKRNL.@) - */ -HANDLE WINAPI PsGetProcessId(PEPROCESS process) -{ - FIXME("stub: %p\n", process); - - return 0; -} - -/********************************************************************* * FsRtlRegisterFileSystemFilterCallbacks (NTOSKRNL.@) */ NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, PFS_FILTER_CALLBACKS callbacks) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 1265056..295ff73 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -28,8 +28,10 @@ struct _OBJECT_TYPE void (*release)(void*); /* called when the last reference is released */ }; -struct _EPROCESS { +struct _EPROCESS +{ DISPATCHER_HEADER header; + PROCESS_BASIC_INFORMATION info; }; struct _KTHREAD diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 66fdcaf..0fe7ad3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -334,6 +334,8 @@ static void test_currentprocess(void) ret = wait_single(current, 0); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ok(PsGetProcessId(current) == PsGetCurrentProcessId(), "process IDs don't match\n"); + thread = PsGetCurrentThread(); ret = wait_single( thread, 0 ); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 719ba67..68599bf 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -216,6 +216,7 @@ NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); +HANDLE WINAPI PsGetProcessId(PEPROCESS); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*);

1 0

Derek Lesho : ntoskrnl.exe: Implement PsIsSystemThread.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 1c2d5172425f0570c719e1cd4ba31a877ff01c60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2d5172425f0570c719e1cd… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Mon Apr 29 16:01:20 2019 +0200 ntoskrnl.exe: Implement PsIsSystemThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 +++++ dlls/ntoskrnl.exe/tests/driver.c | 2 ++ include/ddk/ntifs.h | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d7f57ba..48e9656 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3057,6 +3057,15 @@ HANDLE WINAPI PsGetCurrentThreadId(void) /*********************************************************************** + * PsIsSystemThread (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI PsIsSystemThread(PETHREAD thread) +{ + return thread->kthread.process == PsInitialSystemProcess; +} + + +/*********************************************************************** * PsGetVersion (NTOSKRNL.EXE.@) */ BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_STRING *version ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7a80206..26d7570 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -908,7 +908,7 @@ @ stdcall PsImpersonateClient(ptr ptr long long long) @ extern PsInitialSystemProcess @ stub PsIsProcessBeingDebugged -@ stub PsIsSystemThread +@ stdcall PsIsSystemThread(ptr) @ stub PsIsThreadImpersonating @ stub PsIsThreadTerminating @ stub PsJobType diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index e580522..1265056 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -39,6 +39,11 @@ struct _KTHREAD CLIENT_ID id; }; +struct _ETHREAD +{ + struct _KTHREAD kthread; +}; + void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN; NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8dbae9d..66fdcaf 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -337,6 +337,8 @@ static void test_currentprocess(void) thread = PsGetCurrentThread(); ret = wait_single( thread, 0 ); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ok(!PsIsSystemThread((PETHREAD)KeGetCurrentThread()), "unexpected system thread\n"); } static void sleep(void) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index ec4d1d5..2c61329 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void);

1 0

Derek Lesho : ntoskrnl.exe: Export and set PsInitialSystemProcess.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 1064e20a3f7a70b5662ff59d1aa21bdb1576c30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1064e20a3f7a70b5662ff59d… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Mon Apr 29 16:00:40 2019 +0200 ntoskrnl.exe: Export and set PsInitialSystemProcess. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 53a1bcd..d7f57ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -939,6 +939,8 @@ static void unload_driver( struct wine_rb_entry *entry, void *context ) CloseServiceHandle( (void *)service_handle ); } +PEPROCESS PsInitialSystemProcess = NULL; + /*********************************************************************** * wine_ntoskrnl_main_loop (Not a Windows API) */ @@ -952,6 +954,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) void *in_buff = NULL; HANDLE handles[2]; + /* Set the system process global before setting up the request thread trickery */ + PsInitialSystemProcess = IoGetCurrentProcess(); request_thread = GetCurrentThreadId(); handles[0] = stop_event; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 633a8c4..7a80206 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -906,7 +906,7 @@ @ stub PsGetThreadWin32Thread @ stdcall PsGetVersion(ptr ptr ptr ptr) @ stdcall PsImpersonateClient(ptr ptr long long long) -@ stub PsInitialSystemProcess +@ extern PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @ stub PsIsSystemThread @ stub PsIsThreadImpersonating

1 0

Jacek Caban : ntoskrnl.exe: Implement IoGetCurrentProcess.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 6ebc223955417f111de337a4de371a4b58f804ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebc223955417f111de337a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 29 16:00:32 2019 +0200 ntoskrnl.exe: Implement IoGetCurrentProcess. Based on patch by Derek Lesho. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29460 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++-- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b353839..53a1bcd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2477,8 +2477,7 @@ POBJECT_TYPE PsProcessType = &process_type; */ PEPROCESS WINAPI IoGetCurrentProcess(void) { - FIXME("() stub\n"); - return NULL; + return KeGetCurrentThread()->process; } /*********************************************************************** @@ -2505,6 +2504,7 @@ static void *create_thread_object( HANDLE handle ) { THREAD_BASIC_INFORMATION info; struct _KTHREAD *thread; + HANDLE process; if (!(thread = alloc_kernel_object( PsThreadType, handle, sizeof(*thread), 0 ))) return NULL; @@ -2512,7 +2512,15 @@ static void *create_thread_object( HANDLE handle ) thread->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) + { thread->id = info.ClientId; + if ((process = OpenProcess( PROCESS_QUERY_INFORMATION, FALSE, HandleToUlong(thread->id.UniqueProcess) ))) + { + kernel_object_from_handle( process, PsProcessType, (void**)&thread->process ); + NtClose( process ); + } + } + return thread; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 5f30961..e580522 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -35,6 +35,7 @@ struct _EPROCESS { struct _KTHREAD { DISPATCHER_HEADER header; + PEPROCESS process; CLIENT_ID id; }; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 030c955..8dbae9d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -321,14 +321,19 @@ static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) static void test_currentprocess(void) { + DISPATCHER_HEADER *header; PEPROCESS current; PETHREAD thread; NTSTATUS ret; current = IoGetCurrentProcess(); -todo_wine ok(current != NULL, "Expected current process to be non-NULL\n"); + header = (DISPATCHER_HEADER*)current; + ok(header->Type == 3, "header->Type != 3, = %u\n", header->Type); + ret = wait_single(current, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + thread = PsGetCurrentThread(); ret = wait_single( thread, 0 ); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret);

1 0

Nikolay Sivov : mfreadwrite: Return sample timestamp from ReadSample().
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 2be769d648197bebc5d9121454a8296f95bb9433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be769d648197bebc5d91214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:40:03 2019 +0300 mfreadwrite: Return sample timestamp from ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e396dcd..aeb86db 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -850,6 +850,15 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, LeaveCriticalSection(&stream->cs); TRACE("Got sample %p.\n", *sample); + + if (timestamp) + { + /* TODO: it's possible timestamp has to be set for some events. + For MEEndOfStream it's correct to return 0. */ + *timestamp = 0; + if (*sample) + IMFSample_GetSampleTime(*sample, timestamp); + } } return S_OK;

1 0

Nikolay Sivov : mfplat: Improve method traces.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 4837234e84d99659fff8fcba3808c303f15da0b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4837234e84d99659fff8fcba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:37:50 2019 +0300 mfplat: Improve method traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++-- dlls/mfplat/main.c | 35 ++++++++++++++++++++--------------- dlls/mfplat/mediatype.c | 12 ++++++------ dlls/mfplat/mfplat_private.h | 33 +++++++++++++++++++++++++++++++++ dlls/mfplat/queue.c | 1 + 5 files changed, 62 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4837234e84d99659fff8…

1 0

Nikolay Sivov : mfplat: Improve thread safety for IStream-based stream.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 60f610660d61e1bb849daf7b3acdafa27fcf3541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f610660d61e1bb849daf7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:37:49 2019 +0300 mfplat: Improve thread safety for IStream-based stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 64 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 13c48cf..14bde4a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2730,11 +2730,18 @@ static HRESULT WINAPI bytestream_stream_SetLength(IMFByteStream *iface, QWORD le { struct bytestream *stream = impl_from_IMFByteStream(iface); ULARGE_INTEGER size; + HRESULT hr; TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(length)); + EnterCriticalSection(&stream->cs); + size.QuadPart = length; - return IStream_SetSize(stream->stream, size); + hr = IStream_SetSize(stream->stream, size); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) @@ -2754,7 +2761,9 @@ static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + EnterCriticalSection(&stream->cs); stream->position = position; + LeaveCriticalSection(&stream->cs); return S_OK; } @@ -2767,12 +2776,14 @@ static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL TRACE("%p, %p.\n", iface, ret); - if (FAILED(hr = IStream_Stat(stream->stream, &statstg, STATFLAG_NONAME))) - return hr; + EnterCriticalSection(&stream->cs); - *ret = stream->position >= statstg.cbSize.QuadPart; + if (SUCCEEDED(hr = IStream_Stat(stream->stream, &statstg, STATFLAG_NONAME))) + *ret = stream->position >= statstg.cbSize.QuadPart; - return S_OK; + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) @@ -2783,12 +2794,16 @@ static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); + EnterCriticalSection(&stream->cs); + position.QuadPart = stream->position; - if (FAILED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - return hr; + if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) + { + if (SUCCEEDED(hr = IStream_Read(stream->stream, buffer, size, read_len))) + stream->position += *read_len; + } - if (SUCCEEDED(hr = IStream_Read(stream->stream, buffer, size, read_len))) - stream->position += *read_len; + LeaveCriticalSection(&stream->cs); return hr; } @@ -2801,12 +2816,16 @@ static HRESULT WINAPI bytestream_stream_Write(IMFByteStream *iface, const BYTE * TRACE("%p, %p, %u, %p.\n", iface, buffer, size, written); + EnterCriticalSection(&stream->cs); + position.QuadPart = stream->position; - if (FAILED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - return hr; + if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) + { + if (SUCCEEDED(hr = IStream_Write(stream->stream, buffer, size, written))) + stream->position += *written; + } - if (SUCCEEDED(hr = IStream_Write(stream->stream, buffer, size, written))) - stream->position += *written; + LeaveCriticalSection(&stream->cs); return hr; } @@ -2815,9 +2834,12 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ DWORD flags, QWORD *current) { struct bytestream *stream = impl_from_IMFByteStream(iface); + HRESULT hr = S_OK; TRACE("%p, %u, %s, %#x, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); + EnterCriticalSection(&stream->cs); + switch (origin) { case msoBegin: @@ -2828,12 +2850,14 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ break; default: WARN("Unknown origin mode %d.\n", origin); - return E_INVALIDARG; + hr = E_INVALIDARG; } *current = stream->position; - return S_OK; + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_Flush(IMFByteStream *iface) @@ -2948,6 +2972,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i op = impl_async_stream_op_from_IUnknown(object); + EnterCriticalSection(&stream->cs); + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { @@ -2956,9 +2982,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i } IMFAsyncResult_SetStatus(op->caller, hr); - - EnterCriticalSection(&stream->cs); list_add_tail(&stream->pending, &op->entry); + LeaveCriticalSection(&stream->cs); MFInvokeCallback(op->caller); @@ -2979,6 +3004,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * op = impl_async_stream_op_from_IUnknown(object); + EnterCriticalSection(&stream->cs); + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { @@ -2987,9 +3014,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * } IMFAsyncResult_SetStatus(op->caller, hr); - - EnterCriticalSection(&stream->cs); list_add_tail(&stream->pending, &op->entry); + LeaveCriticalSection(&stream->cs); MFInvokeCallback(op->caller);

1 0

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