April 2019 - Wine-Commits - list.winehq.org

Derek Lesho : ntoskrnl.exe: Implement PsIsSystemThread.
by Alexandre Julliard April 29, 2019

April 29, 2019

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

Jacek Caban : ntoskrnl.exe: Implement PsGetProcessId.
by Alexandre Julliard April 29, 2019

April 29, 2019

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

Nikolay Sivov : mfreadwrite: Return sample timestamp from ReadSample().
by Alexandre Julliard April 29, 2019

April 29, 2019

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 : mf: Add stub scheme handler for local file urls.
by Alexandre Julliard April 29, 2019

April 29, 2019

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

Vijay Kiran Kamuju : virtdisk: Add stub and tests for OpenVirtualDisk.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 081fd1e9972ac1ee0fba66d265e8ecf13217bdf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081fd1e9972ac1ee0fba66d2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 26 05:10:39 2019 +0200 virtdisk: Add stub and tests for OpenVirtualDisk. Based on patch from Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45947 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/virtdisk.c | 41 +++++++++++++++++++++++++++++++++++ dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 14 ++++++++++++ include/virtdisk.h | 49 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index d1f699f..23d0705 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -18,11 +18,13 @@ #include <stdarg.h> #include "windef.h" +#include "initguid.h" #include "virtdisk.h" #include "wine/heap.h" #include "wine/test.h" static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); +static DWORD (WINAPI *pOpenVirtualDisk)(PVIRTUAL_STORAGE_TYPE,PCWSTR,VIRTUAL_DISK_ACCESS_MASK,OPEN_VIRTUAL_DISK_FLAG,POPEN_VIRTUAL_DISK_PARAMETERS,PHANDLE); static void test_GetStorageDependencyInformation(void) { @@ -47,6 +49,38 @@ static void test_GetStorageDependencyInformation(void) CloseHandle(handle); } +static void test_OpenVirtualDisk(void) +{ + DWORD ret; + HANDLE handle; + VIRTUAL_STORAGE_TYPE stgtype; + OPEN_VIRTUAL_DISK_PARAMETERS param; + static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + + ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + stgtype.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN; + stgtype.VendorId = VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN; + ret = pOpenVirtualDisk(&stgtype, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_3; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_2; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_1; + ret = pOpenVirtualDisk(&stgtype, vdisk, 0xffffff, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NONE, &param, &handle); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); +} + START_TEST(virtdisk) { HMODULE module = LoadLibraryA("virtdisk.dll"); @@ -57,8 +91,15 @@ START_TEST(virtdisk) } pGetStorageDependencyInformation = (void *)GetProcAddress( module, "GetStorageDependencyInformation" ); + pOpenVirtualDisk = (void *)GetProcAddress( module, "OpenVirtualDisk" ); + if (pGetStorageDependencyInformation) test_GetStorageDependencyInformation(); else win_skip("GetStorageDependencyInformation is not available\n"); + + if (pOpenVirtualDisk) + test_OpenVirtualDisk(); + else + win_skip("OpenVirtualDisk is not available\n"); } diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 6bd5f14..f35b8df 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -15,7 +15,7 @@ @ stub GetVirtualDiskPhysicalPath @ stub MergeVirtualDisk @ stub MirrorVirtualDisk -@ stub OpenVirtualDisk +@ stdcall OpenVirtualDisk(ptr wstr long long ptr ptr) @ stub ResizeVirtualDisk @ stub SetVirtualDiskInformation @ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 3e6c5c1..2d384cb 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -65,3 +65,17 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_ return ERROR_SUCCESS; } + +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle) +{ + FIXME("(%p, %s, %d, 0x%x, %p, %p): stub\n", type, wine_dbgstr_w(path), mask, flags, param, handle); + + if (!type || !path || (mask & ~VIRTUAL_DISK_ACCESS_ALL) || (flags & ~(OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS | OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE)) || !param) + return ERROR_INVALID_PARAMETER; + + if (param->Version != OPEN_VIRTUAL_DISK_VERSION_1) + return ERROR_INVALID_PARAMETER; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/virtdisk.h b/include/virtdisk.h index b4c07f3..0c81ee1 100644 --- a/include/virtdisk.h +++ b/include/virtdisk.h @@ -27,6 +27,11 @@ extern "C" { #define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 #define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 #define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDX 3 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDSET 4 + +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_MICROSOFT, 0xec984aec, 0xa0f9, 0x47e9, 0x90, 0x1f, 0x71, 0x41, 0x5a, 0x66, 0x34, 0x5b); typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00, @@ -37,6 +42,26 @@ typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10 } ATTACH_VIRTUAL_DISK_FLAG; +typedef enum _OPEN_VIRTUAL_DISK_FLAG { + OPEN_VIRTUAL_DISK_FLAG_NONE = 0x00, + OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS = 0x01, + OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE = 0x02, + OPEN_VIRTUAL_DISK_FLAG_BOOT_DRIVE = 0x04, + OPEN_VIRTUAL_DISK_FLAG_CACHED_IO = 0x08, + OPEN_VIRTUAL_DISK_FLAG_CUSTOM_DIFF_CHAIN = 0x10, + OPEN_VIRTUAL_DISK_FLAG_PARENT_CACHED_IO = 0x20, + OPEN_VIRTUAL_DISK_FLAG_VHDSET_FILE_ONLY = 0x40, + OPEN_VIRTUAL_DISK_FLAG_IGNORE_RELATIVE_PARENT_LOCATOR = 0x80, + OPEN_VIRTUAL_DISK_FLAG_NO_WRITE_HARDENING = 0x100 +} OPEN_VIRTUAL_DISK_FLAG; + +typedef enum _OPEN_VIRTUAL_DISK_VERSION { + OPEN_VIRTUAL_DISK_VERSION_UNSCPECIFIED, + OPEN_VIRTUAL_DISK_VERSION_1, + OPEN_VIRTUAL_DISK_VERSION_2, + OPEN_VIRTUAL_DISK_VERSION_3 +} OPEN_VIRTUAL_DISK_VERSION; + typedef enum _ATTACH_VIRTUAL_DISK_VERSION { ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED, ATTACH_VIRTUAL_DISK_VERSION_1 @@ -156,6 +181,27 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { } DUMMYUNIONNAME; } EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; +typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS +{ + OPEN_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG RWDepth; + } Version1; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + } Version2; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + GUID SnapshotId; + } Version3; + } DUMMYUNIONNAME; +} OPEN_VIRTUAL_DISK_PARAMETERS, *POPEN_VIRTUAL_DISK_PARAMETERS; + typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 { DEPENDENT_DISK_FLAG DependencyTypeFlags; @@ -196,6 +242,9 @@ typedef struct _VIRTUAL_DISK_PROGRESS { DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle); + #ifdef __cplusplus } #endif

1 0

Louis Lenders : user32: Added GetPointerType stub.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 34408796b9521c965c6d81a96fa5174aade4addb URL: https://source.winehq.org/git/wine.git/?a=commit;h=34408796b9521c965c6d81a9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 26 14:21:03 2019 +0200 user32: Added GetPointerType stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45765 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/misc.c | 16 +++++++++++ dlls/user32/tests/input.c | 32 ++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 93ecc1b..c58d51a 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -17,7 +17,7 @@ @ stub GetPointerPenInfoHistory @ stub GetPointerTouchInfo @ stub GetPointerTouchInfoHistory -@ stub GetPointerType +@ stdcall GetPointerType(long ptr) user32.GetPointerType @ stub GetRawPointerDeviceData @ stub InitializeTouchInjection @ stub InjectTouchInput diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9f..1a03d70 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -664,6 +664,22 @@ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value) return TRUE; } +/********************************************************************** + * GetPointerType [USER32.@] + */ +BOOL WINAPI GetPointerType(UINT32 id, POINTER_INPUT_TYPE *type) +{ + FIXME("(%d %p): stub\n", id, type); + + if(!id || !type) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *type = PT_MOUSE; + return TRUE; +} static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 625de3d..4a9be55 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -78,6 +78,7 @@ static struct { static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); +static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); @@ -165,6 +166,7 @@ static void init_function_pointers(void) GET_PROC(SendInput); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); + GET_PROC(GetPointerType); GET_PROC(GetRawInputDeviceList); GET_PROC(GetRawInputDeviceInfoW); GET_PROC(GetRawInputDeviceInfoA); @@ -2800,6 +2802,31 @@ static void test_input_message_source(void) UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); } +static void test_GetPointerType(void) +{ + BOOL ret; + POINTER_INPUT_TYPE type = -1; + UINT id = 0; + + SetLastError(0xdeadbeef); + ret = pGetPointerType(id, NULL); + ok(!ret, "GetPointerType should have failed.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetPointerType(id, &type); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + ok(!ret, "GetPointerType failed, got type %d for %u.\n", type, id ); + ok(type == -1, " type %d\n", type ); + + id = 1; + ret = pGetPointerType(id, &type); + ok(ret, "GetPointerType failed, got type %d for %u.\n", type, id ); + ok(type == PT_MOUSE, " type %d\n", type ); +} + START_TEST(input) { POINT pos; @@ -2845,4 +2872,9 @@ START_TEST(input) win_skip("GetCurrentInputMessageSource is not available\n"); SetCursorPos( pos.x, pos.y ); + + if(pGetPointerType) + test_GetPointerType(); + else + win_skip("GetPointerType is not available\n"); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d5b8597..f9a4ae2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -356,6 +356,7 @@ @ stdcall GetParent(long) @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) +@ stdcall GetPointerType(long ptr) @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) diff --git a/include/winuser.h b/include/winuser.h index 28b9b1f..a489cb7 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3833,6 +3833,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL); WINUSERAPI HWND WINAPI GetOpenClipboardWindow(void); WINUSERAPI HWND WINAPI GetParent(HWND); WINUSERAPI BOOL WINAPI GetPhysicalCursorPos(POINT*); +WINUSERAPI BOOL WINAPI GetPointerType(UINT32,POINTER_INPUT_TYPE *); WINUSERAPI INT WINAPI GetPriorityClipboardFormat(UINT*,INT); WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*); WINUSERAPI BOOL WINAPI GetProcessDpiAwarenessInternal(HANDLE,DPI_AWARENESS*);

1 0

Michael Stefaniuc : mscoree: Remove a redundant NULL check before heap_free().
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 5bd1b2652c844a2522131bd26feb95231f718986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd1b2652c844a2522131bd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:20 2019 +0200 mscoree: Remove a redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 95f6a9a..13619bd 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1707,8 +1707,7 @@ static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UIN ret = TRUE; end: - if (assembly_info) - heap_free(assembly_info); + heap_free(assembly_info); if (guid_info.hActCtx) ReleaseActCtx(guid_info.hActCtx);

1 0

Michael Stefaniuc : ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 4905bc740d4ed3e391212d332a2527048c8fb61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4905bc740d4ed3e391212d33… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:21 2019 +0200 ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9d75223..d8756a8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -293,7 +293,7 @@ static CRITICAL_SECTION obref_cs; static CRITICAL_SECTION_DEBUG obref_critsect_debug = { 0, 0, &obref_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &obref_critsect_debug.ProcessLocksList, &obref_critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": obref_cs") } }; static CRITICAL_SECTION obref_cs = { &obref_critsect_debug, -1, 0, 0, 0, 0 }; @@ -396,7 +396,7 @@ static CRITICAL_SECTION handle_map_cs; static CRITICAL_SECTION_DEBUG handle_map_critsect_debug = { 0, 0, &handle_map_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &handle_map_critsect_debug.ProcessLocksList, &handle_map_critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": handle_map_cs") } }; static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 };

1 0

Martin Storsjo : qcap: Fix compilation with older videodev2.h.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 2c42d5ee4d98e4de7316dd56e56ec273d21ff2e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c42d5ee4d98e4de7316dd56… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Apr 27 22:07:00 2019 +0300 qcap: 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/qcap/v4l.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index dcc5925..f0875f7 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -577,8 +577,10 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) goto error; } +#ifdef V4L2_CAP_DEVICE_CAPS if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) caps.capabilities = caps.device_caps; +#endif if (!(caps.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {

1 0

Jacek Caban : ntoskrnl.exe: Implement PsGetThreadId.
by Alexandre Julliard April 29, 2019

April 29, 2019

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

Derek Lesho : ntoskrnl.exe: Export and set PsInitialSystemProcess.
by Alexandre Julliard April 29, 2019

April 29, 2019

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

Alexandre Julliard : extrac32: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 7cbae6b62c0bf885bacfecbe3b9d57b8e413d70f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cbae6b62c0bf885bacfecbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:52:02 2019 +0200 extrac32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/extrac32/Makefile.in | 3 ++- programs/extrac32/extrac32.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index 246ef09..cda7a84 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -1,6 +1,7 @@ MODULE = extrac32.exe -APPMODE = -mwindows -municode IMPORTS = shell32 setupapi shlwapi user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ extrac32.c diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 7ab936e..c557ff0 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <windows.h> #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> #include <shlobj.h> -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(extrac32); @@ -38,7 +38,7 @@ static void create_target_directory(LPWSTR Target) WCHAR dir[MAX_PATH]; int res; - strcpyW(dir, Target); + lstrcpyW(dir, Target); *PathFindFileNameW(dir) = 0; /* Truncate file name */ if(!PathIsDirectoryW(dir)) { @@ -118,7 +118,7 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - snprintfW(msg, ARRAY_SIZE(msg), overwriteMsg, destination); + swprintf(msg, ARRAY_SIZE(msg), overwriteMsg, destination); if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) return; } @@ -137,9 +137,9 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) BOOL new_arg; WINE_TRACE("cmdline: %s\n", wine_dbgstr_w(cmdline)); - str = HeapAlloc(GetProcessHeap(), 0, (strlenW(cmdline) + 1) * sizeof(WCHAR)); + str = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); if(!str) return NULL; - strcpyW(str, cmdline); + lstrcpyW(str, cmdline); argv = HeapAlloc(GetProcessHeap(), 0, (max_argc + 1) * sizeof(LPWSTR)); if(!argv) { @@ -154,7 +154,7 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) { new_arg = FALSE; /* Check character */ - if(isspaceW(*str)) /* white space */ + if(iswspace(*str)) /* white space */ { if(state == INSIDE_ARG) { @@ -257,7 +257,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho break; } /* Get parameters for commands */ - check = toupperW( argv[i][1] ); + check = towupper( argv[i][1] ); switch(check) { case 'A':

1 0

Alexandre Julliard : dxdiag: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: d846e49a746e71baa1a3fc1aeedcb7719f21588d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d846e49a746e71baa1a3fc1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:52:43 2019 +0200 dxdiag: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/Makefile.in | 3 ++- programs/dxdiag/information.c | 6 ++---- programs/dxdiag/main.c | 20 +++++++++----------- programs/dxdiag/output.c | 4 +--- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 437cc5e..aeab69e 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,7 +1,8 @@ MODULE = dxdiag.exe -APPMODE = -mwindows -municode IMPORTS = dxguid ole32 oleaut32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ information.c \ main.c \ diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index ec2b2b5..e30aa89 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -23,8 +23,6 @@ #include <dxdiag.h> #include "wine/debug.h" -#include "wine/unicode.h" - #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -69,10 +67,10 @@ static BOOL property_to_string(IDxDiagContainer *container, const WCHAR *propert { WCHAR *bstr = V_BSTR(&var); - *output = HeapAlloc(GetProcessHeap(), 0, (strlenW(bstr) + 1) * sizeof(WCHAR)); + *output = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(bstr) + 1) * sizeof(WCHAR)); if (*output) { - strcpyW(*output, bstr); + lstrcpyW(*output, bstr); ret = TRUE; } } diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index b073674..4533236 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -23,8 +23,6 @@ #include <dxdiag.h> #include "wine/debug.h" -#include "wine/unicode.h" - #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -61,7 +59,7 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type cmdline++; /* Ignore filename quoting, if any. */ - if (*cmdline == '"' && (endptr = strrchrW(cmdline, '"'))) + if (*cmdline == '"' && (endptr = wcsrchr(cmdline, '"'))) { /* Reject a string with only one quote. */ if (cmdline == endptr) @@ -70,7 +68,7 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type cmdline++; } else - endptr = cmdline + strlenW(cmdline); + endptr = cmdline + lstrlenW(cmdline); len = endptr - cmdline; if (len == 0 || len >= filename_len) @@ -80,14 +78,14 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type filename[len] = '\0'; /* Append an extension appropriate for the output type if the filename does not have one. */ - if (!strrchrW(filename, '.')) + if (!wcsrchr(filename, '.')) { const WCHAR *filename_ext = get_output_extension(output_type); - if (len + strlenW(filename_ext) >= filename_len) + if (len + lstrlenW(filename_ext) >= filename_len) return FALSE; - strcatW(filename, filename_ext); + lstrcatW(filename, filename_ext); } return TRUE; @@ -145,17 +143,17 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info ARRAY_SIZE(info->outfile)); case 'W': case 'w': - if (strncmpiW(cmdline, whql_colonW, 5)) + if (wcsnicmp(cmdline, whql_colonW, 5)) return FALSE; cmdline += 5; - if (!strncmpiW(cmdline, offW, 3)) + if (!wcsnicmp(cmdline, offW, 3)) { info->whql_check = FALSE; cmdline += 2; } - else if (!strncmpiW(cmdline, onW, 2)) + else if (!wcsnicmp(cmdline, onW, 2)) { info->whql_check = TRUE; cmdline++; @@ -167,7 +165,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 'd': case 'D': - if (strncmpiW(cmdline, dontskipW, 8)) + if (wcsnicmp(cmdline, dontskipW, 8)) return FALSE; cmdline += 8; break; diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index b1e0f18..50240fb 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -26,8 +26,6 @@ #include <stdio.h> #include "wine/debug.h" -#include "wine/unicode.h" - #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -98,7 +96,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) { - DWORD value_lenW = strlenW(value); + DWORD value_lenW = lstrlenW(value); DWORD value_lenA = WideCharToMultiByte(CP_ACP, 0, value, value_lenW, NULL, 0, NULL, NULL); DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); char sprintf_fmt[1 + 10 + 3 + 1];

1 0

Alexandre Julliard : attrib: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 45442d270cc59e1625c4a59c2816dd5939fb3dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=45442d270cc59e1625c4a59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:42:47 2019 +0200 attrib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/Makefile.in | 3 ++- programs/attrib/attrib.c | 37 ++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in index 644bb9a..a346690 100644 --- a/programs/attrib/Makefile.in +++ b/programs/attrib/Makefile.in @@ -1,7 +1,8 @@ MODULE = attrib.exe -APPMODE = -mconsole -municode IMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = attrib.c RC_SRCS = attrib.rc diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 79a599a..73e2f60 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -20,7 +20,6 @@ #include <windows.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "attrib.h" WINE_DEFAULT_DEBUG_CHANNEL(attrib); @@ -156,8 +155,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (recurse) { /* Build spec to search for */ - strcpyW(buffer, rootdir); - strcatW(buffer, starW); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, starW); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); @@ -169,13 +168,13 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) continue; /* Build new root dir to go searching in */ - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); - strcatW(buffer, slashW); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); + lstrcatW(buffer, slashW); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -185,8 +184,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } /* Build spec to search for */ - strcpyW(buffer, rootdir); - strcatW(buffer, filespec); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, filespec); WINE_TRACE("Searching for files as '%s'\n", wine_dbgstr_w(buffer)); /* Search for files in the location with the filespec supplied */ @@ -198,7 +197,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -209,8 +208,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, fd.dwFileAttributes |= attrib_set; if (!fd.dwFileAttributes) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { @@ -233,8 +232,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) { flags[7] = 'C'; } - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); ATTRIB_wprintf(fmt, flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; @@ -260,13 +259,13 @@ int wmain(int argc, WCHAR *argv[]) int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !strcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - strcpyW(name, starW); + lstrcpyW(name, starW); while (i < argc) { WCHAR *param = argv[i++]; @@ -295,7 +294,7 @@ int wmain(int argc, WCHAR *argv[]) WINE_FIXME("Unknown option %s\n", debugstr_w(param)); } } else if (param[0]) { - strcpyW(originalname, param); + lstrcpyW(originalname, param); } } @@ -305,7 +304,7 @@ int wmain(int argc, WCHAR *argv[]) GetFullPathNameW(originalname, ARRAY_SIZE(curdir), curdir, &namepart); WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); if (namepart) { - strcpyW(name, namepart); + lstrcpyW(name, namepart); *namepart = 0; } else { name[0] = 0; @@ -313,7 +312,7 @@ int wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (strpbrkW(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse,

1 0

Zebediah Figura : winegcc: Add support for -fno-PIC.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: d97e544387e69d31842c3302915975711b0b405a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97e544387e69d31842c3302… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 23:04:54 2019 -0500 winegcc: Add support for -fno-PIC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 46b67ce..d339139 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -208,6 +208,7 @@ struct options int wine_builtin; int unwind_tables; int strip; + int pic; const char* wine_objdir; const char* output_name; const char* image_base; @@ -684,7 +685,10 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-DWINE_UNICODE_NATIVE"); } strarray_add(comp_args, "-D_REENTRANT"); - strarray_add(comp_args, "-fPIC"); + if (opts->pic) + strarray_add(comp_args, "-fPIC"); + else + strarray_add(comp_args, "-fno-PIC"); } if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) @@ -1026,7 +1030,7 @@ static void build(struct options* opts) if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_add(spec_args, "-D_REENTRANT"); - strarray_add(spec_args, "-fPIC"); + if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); if (fake_module) { @@ -1345,6 +1349,7 @@ int main(int argc, char **argv) opts.linker_args = strarray_alloc(); opts.compiler_args = strarray_alloc(); opts.winebuild_args = strarray_alloc(); + opts.pic = 1; /* determine the processor type */ if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; @@ -1466,6 +1471,10 @@ int main(int argc, char **argv) opts.unwind_tables = 1; else if (!strcmp("-fno-asynchronous-unwind-tables", argv[i])) opts.unwind_tables = 0; + else if (!strcmp("-fPIC", argv[i]) || !strcmp("-fpic", argv[i])) + opts.pic = 1; + else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) + opts.pic = 0; break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg));

1 0

Jactry Zeng : kernel32/tests: Avoid a crash on WinXP and Win2K.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 642919382f817e6c5c0b1b7a54aacaa7fd5ab416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=642919382f817e6c5c0b1b7a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 29 11:40:43 2019 +0800 kernel32/tests: Avoid a crash on WinXP and Win2K. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8dea3b3..188689a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVO static BOOL (WINAPI *pInitOnceBeginInitialize)(PINIT_ONCE,DWORD,BOOL*,LPVOID*); static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); +static BOOL (WINAPI *pInitializeCriticalSectionEx)(CRITICAL_SECTION*,DWORD,DWORD); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); @@ -2648,8 +2649,14 @@ static void test_crit_section(void) ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + if (!pInitializeCriticalSectionEx) + { + win_skip("InitializeCriticalSectionEx isn't available, skipping tests.\n"); + return; + } + memset(&cs, 0, sizeof(cs)); - ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); @@ -2672,6 +2679,7 @@ START_TEST(sync) pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); + pInitializeCriticalSectionEx = (void *)GetProcAddress(hdll, "InitializeCriticalSectionEx"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock"); pAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "AcquireSRWLockExclusive"); pAcquireSRWLockShared = (void *)GetProcAddress(hdll, "AcquireSRWLockShared");

1 0

Zebediah Figura : quartz: Convert media type registration to IRegistrar mechanism.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: b743cfe4fbbf34ece89c8ae019d68a24923c4b87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b743cfe4fbbf34ece89c8ae0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:09 2019 -0500 quartz: Convert media type registration to IRegistrar mechanism. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/{version.rc => quartz.rc} | 3 + dlls/quartz/quartz.rgs | 82 +++++++++ dlls/quartz/regsvr.c | 305 ---------------------------------- 4 files changed, 86 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b743cfe4fbbf34ece89c…

1 0

Zebediah Figura : evr/tests: Rewrite test_evr_filter_aggregation().
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: b92619f092abbc24693cce0bce8ca5235b9b918b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b92619f092abbc24693cce0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:11 2019 -0500 evr/tests: Rewrite test_evr_filter_aggregation(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 134 +++++++++++++++++++++++++++++++++ dlls/evr/tests/filter.c | 179 --------------------------------------------- 3 files changed, 135 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b92619f092abbc24693c…

1 0

Alexandre Julliard : eject: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 5bf6ab713dd5f62dabac00b924924626d334dd39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf6ab713dd5f62dabac00b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:46:50 2019 +0200 eject: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/eject/Makefile.in | 3 ++- programs/eject/eject.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index 07955d6..16c76c4 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -1,4 +1,5 @@ MODULE = eject.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = eject.c diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 483ac21..09922be 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -20,8 +20,6 @@ #define WIN32_LEAN_AND_MEAN -#include "config.h" - #include <windows.h> #include <winioctl.h> #include <ntddstor.h>

1 0

Alexandre Julliard : control: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 3efefad87deec2b03a826331e03bef9203581f81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3efefad87deec2b03a826331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:46:34 2019 +0200 control: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/control/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index 6efa1e5..c90fca4 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -1,5 +1,6 @@ MODULE = control.exe -APPMODE = -mwindows -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = control.c

1 0

Zebediah Figura : quartz: Avoid importing shlwapi.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 5c06f4e4d5b1301e0257c7ccce830713d6da7972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c06f4e4d5b1301e0257c7cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:10 2019 -0500 quartz: Avoid importing shlwapi. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/filesource.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 4e5f18d..56ca40d 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index fc3e508..e53db99 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -100,8 +100,7 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU return E_POINTER; /* Get the part of the name that matters */ - extension = PathFindExtensionW(pszFileName); - if (*extension != '.') + if (!(extension = strrchrW(pszFileName, '.'))) return E_FAIL; l = RegOpenKeyExW(hkeyExtensions, extension, 0, KEY_READ, &hsub);

1 0

Alexandre Julliard : clock: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 3e25a1b26f83ff3054754c261da65ac3a4932f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e25a1b26f83ff3054754c26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:46:22 2019 +0200 clock: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/Makefile.in | 3 ++- programs/clock/winclock.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index d4e8d65..060e2ff 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -1,7 +1,8 @@ MODULE = clock.exe -APPMODE = -mwindows IMPORTS = comdlg32 shell32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ main.c \ winclock.c diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index 53c3821..bfa04bd 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -23,8 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <math.h> #include <stdlib.h>

1 0

Alexandre Julliard : expand: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: b5e2f767b6834f6e7daeeab298e29fcbc6d0c763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e2f767b6834f6e7daeeab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:47:01 2019 +0200 expand: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/expand/Makefile.in | 3 ++- programs/expand/expand.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in index 0e83e63..b6dd16b 100644 --- a/programs/expand/Makefile.in +++ b/programs/expand/Makefile.in @@ -1,5 +1,6 @@ MODULE = expand.exe -APPMODE = -mconsole IMPORTS = setupapi +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = expand.c diff --git a/programs/expand/expand.c b/programs/expand/expand.c index ea7bfdf..cf7eb20 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -26,18 +26,18 @@ #include <lzexpand.h> #include <setupapi.h> -static int myprintf(const char* format, ...) +static int WINAPIV myprintf(const char* format, ...) { - va_list va; + __ms_va_list va; char tmp[8192]; DWORD w = 0; int len; - va_start(va, format); + __ms_va_start(va, format); len = vsnprintf(tmp, sizeof(tmp), format, va); if (len > 0) WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL); - va_end(va); + __ms_va_end(va); return w; }

1 0

Alexandre Julliard : cabarc: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: c7c9b45544811cceea101cd3dd947d538deed07a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c9b45544811cceea101cd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:45:59 2019 +0200 cabarc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/Makefile.in | 3 ++- programs/cabarc/cabarc.c | 48 +++++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/programs/cabarc/Makefile.in b/programs/cabarc/Makefile.in index 73aefc9..94e0e83 100644 --- a/programs/cabarc/Makefile.in +++ b/programs/cabarc/Makefile.in @@ -1,5 +1,6 @@ MODULE = cabarc.exe -APPMODE = -mconsole -municode IMPORTS = cabinet +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = cabarc.c diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 04f2a9f..7050d8c 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <stdlib.h> @@ -29,7 +26,6 @@ #include "fci.h" #include "fdi.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cabarc); @@ -329,17 +325,17 @@ static void create_directories( const WCHAR *name ) WCHAR *path, *p; /* create the directory/directories */ - path = cab_alloc( (strlenW(name) + 1) * sizeof(WCHAR) ); - strcpyW(path, name); + path = cab_alloc( (lstrlenW(name) + 1) * sizeof(WCHAR) ); + lstrcpyW(path, name); - p = strchrW(path, '\\'); + p = wcschr(path, '\\'); while (p != NULL) { *p = 0; if (!CreateDirectoryW( path, NULL )) WINE_TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); *p = '\\'; - p = strchrW(p+1, '\\'); + p = wcschr(p+1, '\\'); } cab_free( path ); } @@ -352,10 +348,10 @@ static BOOL match_files( const WCHAR *name ) if (!*opt_files) return TRUE; for (i = 0; opt_files[i]; i++) { - unsigned int len = strlenW( opt_files[i] ); + unsigned int len = lstrlenW( opt_files[i] ); /* FIXME: do smarter matching, and wildcards */ if (!len) continue; - if (strncmpiW( name, opt_files[i], len )) continue; + if (wcsnicmp( name, opt_files[i], len )) continue; if (opt_files[i][len - 1] == '\\' || !name[len] || name[len] == '\\') return TRUE; } return FALSE; @@ -428,15 +424,15 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION } else { - if ((file = strrchrW( nameW, '\\' ))) file++; + if ((file = wcsrchr( nameW, '\\' ))) file++; else file = nameW; } if (opt_dest_dir) { - path = cab_alloc( (strlenW(opt_dest_dir) + strlenW(file) + 1) * sizeof(WCHAR) ); - strcpyW( path, opt_dest_dir ); - strcatW( path, file ); + path = cab_alloc( (lstrlenW(opt_dest_dir) + lstrlenW(file) + 1) * sizeof(WCHAR) ); + lstrcpyW( path, opt_dest_dir ); + lstrcatW( path, file ); } else path = file; @@ -521,11 +517,11 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) WIN32_FIND_DATAW data; BOOL ret = TRUE; - if (!(buffer = cab_alloc( (strlenW(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; - strcpyW( buffer, dir ); - p = buffer + strlenW( buffer ); + if (!(buffer = cab_alloc( (lstrlenW(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; + lstrcpyW( buffer, dir ); + p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, wildcardW ); + lstrcpyW( p, wildcardW ); if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) { @@ -535,7 +531,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) if (data.cFileName[0] == '.' && data.cFileName[1] == '.' && !data.cFileName[2]) continue; if (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) continue; - strcpyW( p, data.cFileName ); + lstrcpyW( p, data.cFileName ); if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ret = add_directory( fci, buffer ); else @@ -595,7 +591,7 @@ static int new_cabinet( char *cab_dir ) for (file = opt_files; *file; file++) { - if (!strcmpW( *file, plusW )) + if (!lstrcmpW( *file, plusW )) FCIFlushFolder( fci, fci_get_next_cab, fci_status ); else if (!(ret = add_file_or_directory( fci, *file ))) break; @@ -646,7 +642,7 @@ int wmain( int argc, WCHAR *argv[] ) { case 'd': argv++; argc--; - opt_cabinet_size = atoiW( argv[1] ); + opt_cabinet_size = wcstol( argv[1], NULL, 10 ); if (opt_cabinet_size < 50000) { WINE_MESSAGE( "cabarc: Cabinet size must be at least 50000\n" ); @@ -658,12 +654,12 @@ int wmain( int argc, WCHAR *argv[] ) return 0; case 'i': argv++; argc--; - opt_cabinet_id = atoiW( argv[1] ); + opt_cabinet_id = wcstol( argv[1], NULL, 10 ); break; case 'm': argv++; argc--; - if (!strcmpiW( argv[1], noneW )) opt_compression = tcompTYPE_NONE; - else if (!strcmpiW( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; + if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; + else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { char *arg = strdupWtoA( CP_ACP, argv[1] ); @@ -679,7 +675,7 @@ int wmain( int argc, WCHAR *argv[] ) break; case 's': argv++; argc--; - opt_reserve_space = atoiW( argv[1] ); + opt_reserve_space = wcstol( argv[1], NULL, 10 ); break; case 'v': opt_verbose++; @@ -729,7 +725,7 @@ int wmain( int argc, WCHAR *argv[] ) if (argc > 1) /* check for destination dir as last argument */ { WCHAR *last = argv[argc - 1]; - if (last[0] && last[strlenW(last) - 1] == '\\') + if (last[0] && last[lstrlenW(last) - 1] == '\\') { opt_dest_dir = last; argv[--argc] = NULL;

1 0

Zebediah Figura : evr/tests: Add tests for filter interfaces.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 70526d552d52575db3932160d0fa26f387d96ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=70526d552d52575db3932160… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:12 2019 -0500 evr/tests: Add tests for filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index f90b91d..34db51c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -21,6 +21,18 @@ #define COBJMACROS #include "dshow.h" #include "wine/test.h" +#include "d3d9.h" +#include "initguid.h" +#include "dxva2api.h" + +static IBaseFilter *create_evr(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} static ULONG get_refcount(void *iface) { @@ -124,11 +136,53 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_evr(); + ULONG ref; + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + todo_wine check_interface(filter, &IID_IMediaPosition, TRUE); + todo_wine check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IDirectXVideoMemoryConfiguration, FALSE); + check_interface(filter, &IID_IMemInputPin, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); test_aggregation(); + test_interfaces(); CoUninitialize(); }

1 0

Alexandre Julliard : Wine release 4.7
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: website Branch: master Commit: 02736f542477189934e0ae4f432c031a42a135ae URL: https://source.winehq.org/git/website.git/?a=commit;h=02736f542477189934e0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 22:31:17 2019 +0200 Wine release 4.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019042601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019042601.xml b/news/en/2019042601.xml new file mode 100644 index 0000000..cacdf4b --- /dev/null +++ b/news/en/2019042601.xml @@ -0,0 +1,17 @@ +<news> +<date>April 26, 2019</date> +<title>Wine 4.7 Released</title> +<body> + The Wine development release 4.7 is now available. + <a href="{$root}/announce/4.7">What's new</a> in this release: +<ul> + <li>Support for builtin libraries in PE format even on Unix.</li> + <li>Updated version of the Mono engine.</li> + <li>More implementation of the Debug Engine DLL.</li> + <li>Support for the Command Link standard control.</li> + <li>Improved Edit control sizing in CJK locales.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Qian Hong : advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 48821e2b16dc6e98774a5aa3b21fdf28fda6c556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48821e2b16dc6e98774a5aa3… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Apr 25 09:14:27 2019 +0200 advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1c26228..0ceb71f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2876,19 +2876,21 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access, static void test_process_security(void) { BOOL res; + PTOKEN_USER user; PTOKEN_OWNER owner; PTOKEN_PRIMARY_GROUP group; - PSID AdminSid = NULL, UsersSid = NULL; + PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL; PACL Acl = NULL, ThreadAcl = NULL; SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; SECURITY_ATTRIBUTES psa, tsa; HANDLE token, event; - DWORD size; + DWORD size, acc_size, dom_size, ret; SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; PSID EveryoneSid = NULL; + SID_NAME_USE use; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -2920,7 +2922,8 @@ static void test_process_security(void) owner = HeapAlloc(GetProcessHeap(), 0, size); res = GetTokenInformation( token, TokenOwner, owner, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); - AdminSid = ((TOKEN_OWNER*)owner)->Owner; + AdminSid = owner->Owner; + test_sid_str(AdminSid); res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res); @@ -2930,13 +2933,34 @@ static void test_process_security(void) group = HeapAlloc(GetProcessHeap(), 0, size); res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); - UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup; + UsersSid = group->PrimaryGroup; + test_sid_str(UsersSid); + + acc_size = sizeof(account); + dom_size = sizeof(domain); + ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); + ok(ret, "LookupAccountSid failed with %d\n", ret); + todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); + todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + + res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); + ok(!res, "Expected failure, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + user = HeapAlloc(GetProcessHeap(), 0, size); + res = GetTokenInformation( token, TokenUser, user, size, &size ); + ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); + UserSid = user->User.Sid; + test_sid_str(UserSid); + todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); CloseHandle( token ); if (!res) { HeapFree(GetProcessHeap(), 0, group); HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, Acl); return; } @@ -3043,6 +3067,7 @@ static void test_process_security(void) CloseHandle( event ); HeapFree(GetProcessHeap(), 0, group); HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); HeapFree(GetProcessHeap(), 0, ThreadAcl);

1 0

Erich E. Hoover : advapi32: Move the DACL combining code into a separate routine.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 9aac7ca191e137eca6c7d820e0de1a84d42ef50a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aac7ca191e137eca6c7d820… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 25 11:36:14 2019 +0200 advapi32: Move the DACL combining code into a separate routine. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 79 +++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6891fee..c2c45ac 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5964,6 +5964,48 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) return TRUE; } +static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) +{ + ACL *combined; + int i; + + /* initialize a combined DACL containing both inherited and new ACEs */ + combined = heap_alloc_zero(child->AclSize+parent->AclSize); + if (!combined) + return STATUS_NO_MEMORY; + + memcpy(combined, child, child->AclSize); + combined->AclSize = child->AclSize+parent->AclSize; + + /* copy the inherited ACEs */ + for (i=0; i<parent->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(parent, i, (void*)&ace)) + continue; + if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) + continue; + if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != + (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) + { + FIXME("unsupported flags: %x\n", ace->AceFlags); + continue; + } + + if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) + ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); + ace->AceFlags &= ~INHERIT_ONLY_ACE; + ace->AceFlags |= INHERITED_ACE; + + if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding inherited ACE\n"); + } + + *result = combined; + return STATUS_SUCCESS; +} + /****************************************************************************** * SetSecurityInfo [ADVAPI32.@] */ @@ -6063,41 +6105,10 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, if (!err) { - int i; - - dacl = heap_alloc_zero(pDacl->AclSize+parent_dacl->AclSize); - if (!dacl) - { - LocalFree(parent_sd); - return ERROR_NOT_ENOUGH_MEMORY; - } - memcpy(dacl, pDacl, pDacl->AclSize); - dacl->AclSize = pDacl->AclSize+parent_dacl->AclSize; - - for (i=0; i<parent_dacl->AceCount; i++) - { - ACE_HEADER *ace; - - if (!GetAce(parent_dacl, i, (void*)&ace)) - continue; - if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) - continue; - if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != - (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) - { - FIXME("unsupported flags: %x\n", ace->AceFlags); - continue; - } - - if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) - ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); - ace->AceFlags &= ~INHERIT_ONLY_ACE; - ace->AceFlags |= INHERITED_ACE; - - if(!AddAce(dacl, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) - WARN("error adding inherited ACE\n"); - } + status = combine_dacls(parent_dacl, pDacl, &dacl); LocalFree(parent_sd); + if (status != STATUS_SUCCESS) + return RtlNtStatusToDosError(status); } } else

1 0

Alexandre Julliard : Release 4.7.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 6e3f39a4c59fd529c7b532dcde1bb8c37c467b35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e3f39a4c59fd529c7b532dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 22:29:20 2019 +0200 Release 4.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 900 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 5 files changed, 395 insertions(+), 529 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e3f39a4c59fd529c7b5…

1 0

Tag wine-4.7 : Alexandre Julliard : Release 4.7
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: refs/tags/wine-4.7 Tag: 11bfcb26833d751970088079b10fa26987011368 URL: https://source.winehq.org/git/wine.git/?a=tag;h=11bfcb26833d751970088079b10… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 22:29:20 2019 +0200 Release 4.7

1 0

Alexandre Julliard : makefiles: Don' t allow using system headers with msvcrt.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 87f7818f4b7573d82a663736afbc2094a4006355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f7818f4b7573d82a663736… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 12:51:43 2019 +0200 makefiles: Don't allow using system headers with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index a051281..05c574d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1526,6 +1526,15 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } } + + if (pFile->type == INCL_SYSTEM && make->use_msvcrt) + { + if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", + pFile->included_by->file->name, pFile->included_line, pFile->name ); + exit(1); + } + if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */

1 0

Damjan Jovanovic : avicap32: Verify v4l devices can capture before returning them.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 862566a2b0ea1f5fe8181aa20f595dc40178081f URL: https://source.winehq.org/git/wine.git/?a=commit;h=862566a2b0ea1f5fe8181aa2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 23 03:15:16 2019 +0200 avicap32: Verify v4l devices can capture before returning them. /dev/video* device nodes aren't all capture devices, and returning those that aren't results in devenum reporting them to applications, which will later fail when opening them with IMoniker::BindToObject(). avicap32 already tries to call VIDIOC_QUERYCAP to check whether it's dealing with a v4l device, but it does not check a successful result any further. Get it to verify the device supports the V4L2_CAP_VIDEO_CAPTURE flag, like we do in qcap/v4l.c. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/avicap32_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 445656c..1c4170e 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -128,11 +128,18 @@ 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) { - lstrcpynA(name, (char *)caps.card, namesize); - snprintf(version, versionsize, "%s v%u.%u.%u", (char *)caps.driver, (caps.version >> 16) & 0xFF, + BOOL isCaptureDevice; + if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) + isCaptureDevice = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; + else + isCaptureDevice = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; + if (isCaptureDevice) { + lstrcpynA(name, (char *)caps.card, namesize); + snprintf(version, versionsize, "%s v%u.%u.%u", (char *)caps.driver, (caps.version >> 16) & 0xFF, (caps.version >> 8) & 0xFF, caps.version & 0xFF); + } close(fd); - return TRUE; + return isCaptureDevice; } if (errno != EINVAL && errno != 515)

1 0

Vijay Kiran Kamuju : advapi32/tests: Add additional tests for NtAccessCheck.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: a7b8e84567ef68e29649ebc6cb4af4ad043daf43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b8e84567ef68e29649ebc6… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 24 23:02:42 2019 +0200 advapi32/tests: Add additional tests for NtAccessCheck. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 65 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0ceb71f..a220147 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1343,11 +1343,13 @@ static void test_AccessCheck(void) if(pNtAccessCheck) { + DWORD ntPrivSetLen = sizeof(PRIVILEGE_SET); + /* Generic access mask - no privilegeset buffer */ SetLastError(0xdeadbeef); Access = ntAccessStatus = 0x1abe11ed; ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, - NULL, &PrivSetLen, &Access, &ntAccessStatus); + NULL, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); ok(ntret == STATUS_ACCESS_VIOLATION, "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); @@ -1355,6 +1357,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); /* Generic access mask - no returnlength */ SetLastError(0xdeadbeef); @@ -1381,6 +1384,66 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - zero returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = 0; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == 0, "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Generic access mask - insufficient returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = sizeof(PRIVILEGE_SET)-1; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET)-1, "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Key access mask - zero returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = 0; + ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Key access mask - insufficient returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = sizeof(PRIVILEGE_SET)-1; + ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); } else win_skip("NtAccessCheck unavailable. Skipping.\n");

1 0

Erich E. Hoover : advapi32: Fix the initialization of combined DACLs when the new DACL is empty.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 92ee3543e549b02a916c2b6d4bcc9335d35b435e URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ee3543e549b02a916c2b6d… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 25 11:36:15 2019 +0200 advapi32: Fix the initialization of combined DACLs when the new DACL is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38423 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c2c45ac..4b2876d 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5966,6 +5966,7 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) { + NTSTATUS status; ACL *combined; int i; @@ -5974,8 +5975,23 @@ static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) if (!combined) return STATUS_NO_MEMORY; - memcpy(combined, child, child->AclSize); - combined->AclSize = child->AclSize+parent->AclSize; + status = RtlCreateAcl(combined, parent->AclSize+child->AclSize, ACL_REVISION); + if (status != STATUS_SUCCESS) + { + heap_free(combined); + return status; + } + + /* copy the new ACEs */ + for (i=0; i<child->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(child, i, (void*)&ace)) + continue; + if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding new ACE\n"); + } /* copy the inherited ACEs */ for (i=0; i<parent->AceCount; i++)

1 0

Vijay Kiran Kamuju : include: Add missing structures for ACE and Tokens in winnt.h.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: ec8bc65b30cb2a759aecde7b5f94501fa04153b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8bc65b30cb2a759aecde7b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 26 12:54:43 2019 +0200 include: Add missing structures for ACE and Tokens in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index b5393f5..0e011cd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4345,6 +4345,19 @@ typedef struct _SID_AND_ATTRIBUTES { DWORD Attributes; } SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; +typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; +typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY; + +#define SID_HASH_SIZE 32 + +typedef ULONG_PTR SID_HASH_ENTRY, *PSID_HASH_ENTRY; + +typedef struct _SID_AND_ATTRIBUTES_HASH { + DWORD SidCount; + PSID_AND_ATTRIBUTES SidAttr; + SID_HASH_ENTRY Hash[SID_HASH_SIZE]; +} SID_AND_ATTRIBUTES_HASH, *PSID_AND_ATTRIBUTES_HASH; + /* security entities */ #define SECURITY_NULL_RID __MSABI_LONG(0x00000000) #define SECURITY_WORLD_RID __MSABI_LONG(0x00000000) @@ -4848,10 +4861,43 @@ typedef struct _TOKEN_MANDATORY_LABEL { SID_AND_ATTRIBUTES Label; } TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; +#define TOKEN_MANDATORY_POLICY_OFF 0x0 +#define TOKEN_MANDATORY_POLICY_NO_WRITEUP 0x1 +#define TOKEN_MANDATORY_POLICY_NEW_PROCESS_MIN 0x2 +#define TOKEN_MANDATORY_POLICY_VALID_MASK 0x3 + +typedef struct _TOKEN_MANDATORY_POLICY { + DWORD Policy; +} TOKEN_MANDATORY_POLICY, *PTOKEN_MANDATORY_POLICY; + typedef struct _TOKEN_APPCONTAINER_INFORMATION { PSID TokenAppContainer; } TOKEN_APPCONTAINER_INFORMATION, * PTOKEN_APPCONTAINER_INFORMATION; +#define POLICY_AUDIT_SUBCATEGORY_COUNT 53 + +typedef struct _TOKEN_AUDIT_POLICY { + BYTE PerUserPolicy[((POLICY_AUDIT_SUBCATEGORY_COUNT) >> 1) + 1]; +} TOKEN_AUDIT_POLICY, *PTOKEN_AUDIT_POLICY; + +typedef struct _TOKEN_ACCESS_INFORMATION { + PSID_AND_ATTRIBUTES_HASH SidHash; + PSID_AND_ATTRIBUTES_HASH RestrictedSidHash; + PTOKEN_PRIVILEGES Privileges; + LUID AuthenticationId; + TOKEN_TYPE TokenType; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + TOKEN_MANDATORY_POLICY MandatoryPolicy; + DWORD Flags; +} TOKEN_ACCESS_INFORMATION, *PTOKEN_ACCESS_INFORMATION; + +typedef struct _TOKEN_CONTROL { + LUID TokenId; + LUID AuthenticationId; + LUID ModifiedId; + TOKEN_SOURCE TokenSource; +} TOKEN_CONTROL, *PTOKEN_CONTROL; + /* * ACLs of NT */ @@ -4938,9 +4984,106 @@ typedef struct _SYSTEM_MANDATORY_LABEL_ACE { DWORD SidStart; } SYSTEM_MANDATORY_LABEL_ACE,*PSYSTEM_MANDATORY_LABEL_ACE; +typedef struct _ACCESS_ALLOWED_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_OBJECT_ACE, *PACCESS_ALLOWED_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_DENIED_OBJECT_ACE, *PACCESS_DENIED_OBJECT_ACE; + +typedef struct _SYSTEM_AUDIT_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_AUDIT_OBJECT_ACE, *PSYSTEM_AUDIT_OBJECT_ACE; + +typedef struct _SYSTEM_ALARM_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_ALARM_OBJECT_ACE, *PSYSTEM_ALARM_OBJECT_aCE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_ACE,*PACCESS_ALLOWED_CALLBACK_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_ACE,*PACCESS_DENIED_CALLBACK_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_ACE,*PSYSTEM_AUDIT_CALLBACK_ACE; + +typedef struct _SYSTEM_ALARM_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} SYSTEM_ALARM_CALLBACK_ACE,*PSYSTEM_ALARM_CALLBACK_ACE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE; + +typedef struct _SYSTEM_ALARM_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_ALARM_CALLBACK_OBJECT_ACE, *PSYSTEM_ALARM_CALLBACK_OBJECT_ACE; + #define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 #define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 #define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 +#define SYSTEM_MANDATORY_LABEL_VALID_MASK 0x7 typedef enum tagSID_NAME_USE { SidTypeUser = 1,

1 0

Alexandre Julliard : include/msvcrt: Add stdint.h header.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: ba2ca27dfe67e4f60a0a246b354390ef992f497c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba2ca27dfe67e4f60a0a246b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 12:50:34 2019 +0200 include/msvcrt: Add stdint.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/stdint.h | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 09c84d8..4a0f927 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -437,6 +437,7 @@ SOURCES = \ msvcrt/share.h \ msvcrt/signal.h \ msvcrt/stddef.h \ + msvcrt/stdint.h \ msvcrt/stdio.h \ msvcrt/stdlib.h \ msvcrt/string.h \ diff --git a/include/msvcrt/stdint.h b/include/msvcrt/stdint.h new file mode 100644 index 0000000..d228071 --- /dev/null +++ b/include/msvcrt/stdint.h @@ -0,0 +1,211 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +/* ISO C9x 7.18 Integer types <stdint.h> + * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * Contributor: Danny Smith <danny_r_smith_2001(a)yahoo.co.nz> + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Date: 2000-12-02 + */ + + +#ifndef _STDINT_H +#define _STDINT_H + +#include <crtdefs.h> + +#define __need_wint_t +#define __need_wchar_t +#include <stddef.h> + +/* 7.18.1.1 Exact-width integer types */ +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef short int16_t; +typedef unsigned short uint16_t; +typedef int int32_t; +typedef unsigned uint32_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; + +/* 7.18.1.2 Minimum-width integer types */ +typedef signed char int_least8_t; +typedef unsigned char uint_least8_t; +typedef short int_least16_t; +typedef unsigned short uint_least16_t; +typedef int int_least32_t; +typedef unsigned uint_least32_t; +typedef long long int_least64_t; +typedef unsigned long long uint_least64_t; + +/* 7.18.1.3 Fastest minimum-width integer types + * Not actually guaranteed to be fastest for all purposes + * Here we use the exact-width types for 8 and 16-bit ints. + */ +typedef signed char int_fast8_t; +typedef unsigned char uint_fast8_t; +typedef short int_fast16_t; +typedef unsigned short uint_fast16_t; +typedef int int_fast32_t; +typedef unsigned int uint_fast32_t; +typedef long long int_fast64_t; +typedef unsigned long long uint_fast64_t; + +/* 7.18.1.5 Greatest-width integer types */ +typedef long long intmax_t; +typedef unsigned long long uintmax_t; + +/* 7.18.2 Limits of specified-width integer types */ +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) || \ + defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L + +/* 7.18.2.1 Limits of exact-width integer types */ +#define INT8_MIN (-128) +#define INT16_MIN (-32768) +#define INT32_MIN (-2147483647 - 1) +#define INT64_MIN (-9223372036854775807LL - 1) + +#define INT8_MAX 127 +#define INT16_MAX 32767 +#define INT32_MAX 2147483647 +#define INT64_MAX 9223372036854775807LL + +#define UINT8_MAX 255 +#define UINT16_MAX 65535 +#define UINT32_MAX 0xffffffffU /* 4294967295U */ +#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ + +/* 7.18.2.2 Limits of minimum-width integer types */ +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST64_MIN INT64_MIN + +#define INT_LEAST8_MAX INT8_MAX +#define INT_LEAST16_MAX INT16_MAX +#define INT_LEAST32_MAX INT32_MAX +#define INT_LEAST64_MAX INT64_MAX + +#define UINT_LEAST8_MAX UINT8_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define UINT_LEAST64_MAX UINT64_MAX + +/* 7.18.2.3 Limits of fastest minimum-width integer types */ +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST64_MIN INT64_MIN + +#define INT_FAST8_MAX INT8_MAX +#define INT_FAST16_MAX INT16_MAX +#define INT_FAST32_MAX INT32_MAX +#define INT_FAST64_MAX INT64_MAX + +#define UINT_FAST8_MAX UINT8_MAX +#define UINT_FAST16_MAX UINT16_MAX +#define UINT_FAST32_MAX UINT32_MAX +#define UINT_FAST64_MAX UINT64_MAX + +/* 7.18.2.4 Limits of integer types capable of holding + object pointers */ +#ifdef _WIN64 +#define INTPTR_MIN INT64_MIN +#define INTPTR_MAX INT64_MAX +#define UINTPTR_MAX UINT64_MAX +#else +#define INTPTR_MIN INT32_MIN +#define INTPTR_MAX INT32_MAX +#define UINTPTR_MAX UINT32_MAX +#endif + +/* 7.18.2.5 Limits of greatest-width integer types */ +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX + +/* 7.18.3 Limits of other integer types */ +#ifdef _WIN64 +#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MAX INT64_MAX +#else +#define PTRDIFF_MIN INT32_MIN +#define PTRDIFF_MAX INT32_MAX +#endif + +#define SIG_ATOMIC_MIN INT32_MIN +#define SIG_ATOMIC_MAX INT32_MAX + +#ifndef SIZE_MAX +#ifdef _WIN64 +#define SIZE_MAX UINT64_MAX +#else +#define SIZE_MAX UINT32_MAX +#endif +#endif + +#ifndef WCHAR_MIN /* also in wchar.h */ +#define WCHAR_MIN 0U +#define WCHAR_MAX 0xffffU +#endif + +/* + * wint_t is unsigned short for compatibility with MS runtime + */ +#define WINT_MIN 0U +#define WINT_MAX 0xffffU + +#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */ + + +/* 7.18.4 Macros for integer constants */ +#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) || \ + defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L + +/* 7.18.4.1 Macros for minimum-width integer constants + + Accoding to Douglas Gwyn <gwyn(a)arl.mil>: + "This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC + 9899:1999 as initially published, the expansion was required + to be an integer constant of precisely matching type, which + is impossible to accomplish for the shorter types on most + platforms, because C99 provides no standard way to designate + an integer constant with width less than that of type int. + TC1 changed this to require just an integer constant + *expression* with *promoted* type." + + The trick used here is from Clive D W Feather. +*/ + +#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val)) +#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val)) +#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val)) +/* The 'trick' doesn't work in C89 for long long because, without + suffix, (val) will be evaluated as int, not intmax_t */ +#define INT64_C(val) val##LL + +#define UINT8_C(val) (val) +#define UINT16_C(val) (val) +#define UINT32_C(val) (val##U) +#define UINT64_C(val) val##ULL + +/* 7.18.4.2 Macros for greatest-width integer constants */ +#define INTMAX_C(val) val##LL +#define UINTMAX_C(val) val##ULL + +#endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */ + +#endif /* _STDINT_H */

1 0

Erich E. Hoover : kernel32: NeedCurrentDirectoryForExePath does not use the registry.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 2295d937a8ae917deb739999ff4f81d474f7f122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2295d937a8ae917deb739999… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 17 10:57:25 2019 +0200 kernel32: NeedCurrentDirectoryForExePath does not use the registry. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cf1c768..b8f49bd 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1991,8 +1991,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathW( LPCWSTR name ) 'I','n','E','x','e','P','a','t','h',0}; WCHAR env_val; - /* MSDN mentions some 'registry location'. We do not use registry. */ - FIXME("(%s): partial stub\n", debugstr_w(name)); + TRACE("(%s)\n", debugstr_w(name)); if (strchrW(name, '\\')) return TRUE;

1 0

Damjan Jovanovic : devenum: Iterate over all avicap devices instead of giving up at the first failure.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 779633acde995ceffdc4fd509fc023f0d8493d29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=779633acde995ceffdc4fd50… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 23 03:15:23 2019 +0200 devenum: Iterate over all avicap devices instead of giving up at the first failure. Some /dev/video* device nodes aren't capture devices, so capGetDriverDescriptionW() will fail for them, but there could still be valid ones later on. Iterate over all 10 instead of giving up at the first failure. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 3f986f7..83ff3b4 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -793,7 +793,7 @@ static void register_avicap_devices(void) { if (!capGetDriverDescriptionW(i, friendlyname, ARRAY_SIZE(friendlyname), version, ARRAY_SIZE(version))) - break; + continue; name[5] = '0' + i;

1 0

Nikolay Sivov : mfplat: Add partial implementation of ConvertToContiguousBuffer().
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: 2e9a036f9a263c3a7d66834a44cfc8bdbbcbb346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9a036f9a263c3a7d66834a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 26 09:56:49 2019 +0300 mfplat: Add partial implementation of ConvertToContiguousBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 24 +++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 524398a..27ae44a 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -686,9 +686,29 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) { - FIXME("%p, %p.\n", iface, buffer); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->cs); + + if (sample->buffer_count == 0) + hr = E_UNEXPECTED; + else if (sample->buffer_count == 1) + { + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); + } + else + { + FIXME("Samples with multiple buffers are not supported.\n"); + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&sample->cs); + + return hr; } static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 571d57a..541b236 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1475,6 +1475,53 @@ static void test_sample(void) IMFAttributes_Release(attributes); IMFSample_Release(sample); + + /* ConvertToContiguousBuffer() */ + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer); + ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMemoryBuffer(16, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer instance.\n"); + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer instance.\n"); + IMFMediaBuffer_Release(buffer2); + + hr = MFCreateMemoryBuffer(16, &buffer2); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected buffer count %u.\n", count); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); +todo_wine + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); +todo_wine + ok(count == 1, "Unexpected buffer count %u.\n", count); + + IMFSample_Release(sample); } struct test_callback

1 0

Alistair Leslie-Hughes : dinput: Don't report SysMouse/ Keyboard devices as supporting Force Feedback.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: b3c5062f3650dff0e41aeb83481afd32a170b639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c5062f3650dff0e41aeb83… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 26 01:09:56 2019 +0000 dinput: Don't report SysMouse/Keyboard devices as supporting Force Feedback. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 6 ++++++ dlls/dinput/mouse.c | 6 ++++++ dlls/dinput/tests/joystick.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 642d0c0..42c0759 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -215,6 +215,9 @@ static HRESULT keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { @@ -233,6 +236,9 @@ static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 141b922..f3ec8e4 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -158,6 +158,9 @@ static HRESULT mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { @@ -176,6 +179,9 @@ static HRESULT mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 69e95d0..631ea57 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -270,6 +270,29 @@ static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static BOOL CALLBACK EnumAllFeedback(const DIDEVICEINSTANCEA *lpddi, void *pvRef) +{ + trace("---- Device Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + lpddi->tszProductName, + lpddi->tszInstanceName, + lpddi->dwDevType, + wine_dbgstr_guid(&lpddi->guidProduct), + wine_dbgstr_guid(&lpddi->guidInstance), + lpddi->wUsagePage, + lpddi->wUsage); + + ok(!(IsEqualGUID(&GUID_SysMouse, &lpddi->guidProduct) || IsEqualGUID(&GUID_SysKeyboard, &lpddi->guidProduct)), "Invalid device returned.\n"); + + return DIENUM_CONTINUE; +} + static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { HRESULT hr; @@ -870,6 +893,24 @@ static void joystick_tests(DWORD version) trace(" Version Not Supported\n"); } +static void test_enum_feedback(void) +{ + HRESULT hr; + IDirectInputA *pDI; + ULONG ref; + HINSTANCE hInstance = GetModuleHandleW(NULL); + + hr = DirectInputCreateA(hInstance, 0x0700, &pDI, NULL); + ok(hr==DI_OK||hr==DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreateA() failed: %08x\n", hr); + if (hr==DI_OK && pDI!=0) { + hr = IDirectInput_EnumDevices(pDI, 0, EnumAllFeedback, NULL, DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK); + ok(hr==DI_OK,"IDirectInput_EnumDevices() failed: %08x\n", hr); + ref = IDirectInput_Release(pDI); + ok(ref==0,"IDirectInput_Release() reference count = %d\n", ref); + } else if (hr==DIERR_OLDDIRECTINPUTVERSION) + trace(" Version Not Supported\n"); +} + START_TEST(joystick) { CoInitialize(NULL); @@ -878,5 +919,7 @@ START_TEST(joystick) joystick_tests(0x0500); joystick_tests(0x0300); + test_enum_feedback(); + CoUninitialize(); }

1 0

Detlef Riekenberg : kernel32/pipe: Avoid a crash in a test.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: wine Branch: master Commit: f5636dea60492aba0c47c565d4384baeff23495a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5636dea60492aba0c47c565… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 23 19:19:21 2019 +0200 kernel32/pipe: Avoid a crash in a test. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3f30cce..cab069d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3572,10 +3572,12 @@ static void test_namedpipe_session_id(void) create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); - SetLastError(0xdeadbeef); - ret = pGetNamedPipeClientSessionId(server, NULL); - ok(!ret, "success\n"); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + if (0) /* crashes on recent Windows */ + { + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, NULL); + ok(!ret, "success\n"); + } id = 0; ret = pGetNamedPipeClientSessionId(server, &id);

1 0

Józef Kucia : include: Use "do { } while (0)" when VKD3D_NO_{TRACE, DEBUG}_MESSAGES is defined.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: 1172e66f6d2fa9fe3d788d051d33cabb314e4245 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1172e66f6d2fa9fe3d788d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:01 2019 +0200 include: Use "do { } while (0)" when VKD3D_NO_{TRACE, DEBUG}_MESSAGES is defined. In order to handle the following construct correctly: if (...) TRACE(...); Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 5d798ef..418e2c4 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -24,12 +24,12 @@ #include <stdarg.h> #ifdef VKD3D_NO_TRACE_MESSAGES -#define TRACE(args...) +#define TRACE(args...) do { } while (0) #endif #ifdef VKD3D_NO_DEBUG_MESSAGES -#define WARN(args...) -#define FIXME(args...) +#define WARN(args...) do { } while (0) +#define FIXME(args...) do { } while (0) #endif enum vkd3d_dbg_level

1 0

Józef Kucia : vkd3d-shader: Use specialization constants by default for shader parameters.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: 004f33432ae506664441d01443244f8ad4be2502 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=004f33432ae506664441d01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:06 2019 +0200 vkd3d-shader: Use specialization constants by default for shader parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 94 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1ab005f..aa3351b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2012,6 +2012,8 @@ struct vkd3d_dxbc_compiler uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; + uint32_t current_spec_constant_id; + uint32_t binding_idx; const struct vkd3d_shader_scan_info *scan_info; @@ -2499,51 +2501,93 @@ static const struct vkd3d_shader_parameter *vkd3d_dxbc_compiler_get_shader_param return NULL; } -static uint32_t vkd3d_shader_get_default_spec_constant_value(enum vkd3d_shader_parameter_name name) +static const struct vkd3d_spec_constant_info +{ + enum vkd3d_shader_parameter_name name; + uint32_t default_value; + const char *debug_name; +} +vkd3d_shader_parameters[] = +{ + {VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, 1, "sample_count"}, +}; + +static const struct vkd3d_spec_constant_info *get_spec_constant_info(enum vkd3d_shader_parameter_name name) { - switch (name) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(vkd3d_shader_parameters); ++i) { - case VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT: - return 1; + if (vkd3d_shader_parameters[i].name == name) + return &vkd3d_shader_parameters[i]; + } - default: - FIXME("Unhandled parameter name %#x.\n", name); - return 0; + FIXME("Unhandled parameter name %#x.\n", name); + return NULL; +} + +static uint32_t vkd3d_dxbc_compiler_alloc_spec_constant_id(struct vkd3d_dxbc_compiler *compiler) +{ + if (!compiler->current_spec_constant_id && compiler->compile_args) + { + const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + unsigned int i, id; + + for (i = 0, id = 0; i < compile_args->parameter_count; ++i) + { + const struct vkd3d_shader_parameter *current = &compile_args->parameters[i]; + + if (current->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) + id = max(current->u.specialization_constant.id, id); + } + + compiler->current_spec_constant_id = id + 1; } + + return compiler->current_spec_constant_id++; +} + +static uint32_t vkd3d_dxbc_compiler_emit_spec_constant(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_parameter_name name, uint32_t spec_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_spec_constant_info *info; + uint32_t type_id, id, default_value; + + info = get_spec_constant_info(name); + default_value = info ? info->default_value : 0; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + id = vkd3d_spirv_build_op_spec_constant(builder, type_id, default_value); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationSpecId, spec_id); + + if (info) + vkd3d_spirv_build_op_name(builder, id, "%s", info->debug_name); + + return id; } static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_parameter_name name) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_parameter *parameter; - uint32_t type_id, id; if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) { - FIXME("Unresolved shader parameter %#x.\n", name); - goto fail; + WARN("Unresolved shader parameter %#x.\n", name); + goto default_parameter; } if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) - { return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); - } - else if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - id = vkd3d_spirv_build_op_spec_constant(builder, - type_id, vkd3d_shader_get_default_spec_constant_value(name)); - vkd3d_spirv_build_op_decorate1(builder, - id, SpvDecorationSpecId, parameter->u.specialization_constant.id); - return id; - } + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) + return vkd3d_dxbc_compiler_emit_spec_constant(compiler, name, parameter->u.specialization_constant.id); FIXME("Unhandled parameter type %#x.\n", parameter->type); -fail: - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); +default_parameter: + return vkd3d_dxbc_compiler_emit_spec_constant(compiler, + name, vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler)); } static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Implement sampleinfo for rasterizer.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: f510e93948a931f557597888ebd99935efa79d1c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f510e93948a931f55759788… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:04 2019 +0200 vkd3d-shader: Implement sampleinfo for rasterizer. Also adds initial infrastructure for more flexible shader parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 48 +++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 57 +++++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/state.c | 2 ++ 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cfb0263..28c3274 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -90,6 +90,50 @@ enum vkd3d_shader_binding_flag VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_BINDING_FLAG), }; +enum vkd3d_shader_parameter_type +{ + VKD3D_SHADER_PARAMETER_TYPE_UNKNOWN, + VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT, + VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, +}; + +enum vkd3d_shader_parameter_data_type +{ + VKD3D_SHADER_PARAMETER_DATA_TYPE_UNKNOWN, + VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32, +}; + +enum vkd3d_shader_parameter_name +{ + VKD3D_SHADER_PARAMETER_NAME_UNKNOWN, + VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, +}; + +struct vkd3d_shader_parameter_immediate_constant +{ + union + { + uint32_t u32; + } u; +}; + +struct vkd3d_shader_parameter_specialization_constant +{ + uint32_t id; +}; + +struct vkd3d_shader_parameter +{ + enum vkd3d_shader_parameter_name name; + enum vkd3d_shader_parameter_type type; + enum vkd3d_shader_parameter_data_type data_type; + union + { + struct vkd3d_shader_parameter_immediate_constant immediate_constant; + struct vkd3d_shader_parameter_specialization_constant specialization_constant; + } u; +}; + struct vkd3d_shader_resource_binding { enum vkd3d_shader_descriptor_type type; @@ -185,6 +229,10 @@ struct vkd3d_shader_compile_arguments const void *next; enum vkd3d_shader_target target; + + unsigned int parameter_count; + struct vkd3d_shader_parameter *parameters; + bool dual_source_blending; const unsigned int *output_swizzles; unsigned int output_swizzle_count; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 738fcc9..81830e3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2477,6 +2477,46 @@ static uint32_t vkd3d_dxbc_compiler_emit_array_variable(struct vkd3d_dxbc_compil return vkd3d_spirv_build_op_variable(builder, stream, ptr_type_id, storage_class, 0); } +static const struct vkd3d_shader_parameter *vkd3d_dxbc_compiler_get_shader_parameter( + struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_parameter_name name) +{ + const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + unsigned int i; + + for (i = 0; compile_args && i < compile_args->parameter_count; ++i) + { + if (compile_args->parameters[i].name == name) + return &compile_args->parameters[i]; + } + + return NULL; +} + +static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_parameter_name name) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_parameter *parameter; + uint32_t id; + + if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) + { + FIXME("Unresolved shader parameter %#x.\n", name); + goto fail; + } + + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) + { + return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); + } + + FIXME("Unhandled parameter type %#x.\n", parameter->type); + +fail: + id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, id); +} + static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_component_type component_type, unsigned int component_count, uint32_t val_id, unsigned int val_component_idx, unsigned int val_component_count) @@ -7563,21 +7603,24 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t constituents[VKD3D_VEC4_SIZE]; - struct vkd3d_shader_image image; uint32_t type_id, val_id; unsigned int i; if (src->reg.type == VKD3DSPR_RASTERIZER) { - FIXME("Rasterizer not supported.\n"); - return; + val_id = vkd3d_dxbc_compiler_emit_uint_shader_parameter(compiler, + VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT); } + else + { + struct vkd3d_shader_image image; - vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - val_id = vkd3d_spirv_build_op_image_query_samples(builder, type_id, image.image_id); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_samples(builder, type_id, image.image_id); + } constituents[0] = val_id; for (i = 1; i < VKD3D_VEC4_SIZE; ++i) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 980d9ed..a6b5fdd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2074,6 +2074,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_compile_args.parameter_count = 0; + ps_compile_args.parameters = NULL; ps_compile_args.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count;

1 0

Józef Kucia : vkd3d-shader: Add support for specialization constants.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: 63d12751bbccb9eabd15e8bd6f019eaab15a94d8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63d12751bbccb9eabd15e8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:05 2019 +0200 vkd3d-shader: Add support for specialization constants. Allows reusing the same SPIR-V binary with different shader parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 81830e3..1ab005f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1062,6 +1062,13 @@ static uint32_t vkd3d_spirv_get_op_constant_composite(struct vkd3d_spirv_builder constituents, constituent_count, vkd3d_spirv_build_op_constant_composite); } +static uint32_t vkd3d_spirv_build_op_spec_constant(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t value) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->global_stream, + SpvOpSpecConstant, result_type, value); +} + static uint32_t vkd3d_spirv_build_op_variable(struct vkd3d_spirv_builder *builder, struct vkd3d_spirv_stream *stream, uint32_t type_id, uint32_t storage_class, uint32_t initializer) { @@ -2492,12 +2499,25 @@ static const struct vkd3d_shader_parameter *vkd3d_dxbc_compiler_get_shader_param return NULL; } +static uint32_t vkd3d_shader_get_default_spec_constant_value(enum vkd3d_shader_parameter_name name) +{ + switch (name) + { + case VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT: + return 1; + + default: + FIXME("Unhandled parameter name %#x.\n", name); + return 0; + } +} + static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_parameter_name name) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_parameter *parameter; - uint32_t id; + uint32_t type_id, id; if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) { @@ -2509,12 +2529,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc { return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); } + else if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) + { + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + id = vkd3d_spirv_build_op_spec_constant(builder, + type_id, vkd3d_shader_get_default_spec_constant_value(name)); + vkd3d_spirv_build_op_decorate1(builder, + id, SpvDecorationSpecId, parameter->u.specialization_constant.id); + return id; + } FIXME("Unhandled parameter type %#x.\n", parameter->type); fail: - id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, id); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); } static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Fix write mask for shader inputs.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: 2bdc63d682320c492fc165dd25d462d2ef6466b2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2bdc63d682320c492fc165d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:02 2019 +0200 vkd3d-shader: Fix write mask for shader inputs. Shader inputs with non-contiguous write masks (e.g. xyw) were not handled properly in rare cases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8795020..738fcc9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2772,19 +2772,25 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler uint32_t type_id, ptr_type_id, indexes[1], reg_id, val_id; unsigned int component_idx, reg_component_count; enum vkd3d_component_type component_type; + unsigned int skipped_component_mask; assert(reg->type != VKD3DSPR_IMMCONST); assert(vkd3d_write_mask_component_count(write_mask) == 1); component_idx = vkd3d_write_mask_get_component_idx(write_mask); component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); + skipped_component_mask = ~reg_info->write_mask & ((VKD3DSP_WRITEMASK_0 << component_idx) - 1); + if (skipped_component_mask) + component_idx -= vkd3d_write_mask_component_count(skipped_component_mask); component_type = vkd3d_component_type_from_data_type(reg->data_type); reg_component_count = vkd3d_write_mask_component_count(reg_info->write_mask); - if (!(reg_info->write_mask & (VKD3DSP_WRITEMASK_0 << component_idx))) - ERR("Invalid component_idx for register %#x, %u (write_mask %#x).\n", - reg->type, reg->idx[0].offset, reg_info->write_mask); + if (component_idx >= vkd3d_write_mask_component_count(reg_info->write_mask)) + { + ERR("Invalid component_idx %u for register %#x, %u (write_mask %#x).\n", + component_idx, reg->type, reg->idx[0].offset, reg_info->write_mask); + } type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); reg_id = reg_info->id; @@ -3602,6 +3608,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi SpvStorageClass storage_class; struct rb_entry *entry = NULL; bool use_private_var = false; + unsigned int write_mask; unsigned int array_size; unsigned int reg_idx; uint32_t i, index; @@ -3635,6 +3642,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi builtin = get_spirv_builtin_for_sysval(compiler, sysval); + write_mask = signature_element->mask & 0xff; + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) @@ -3650,12 +3659,14 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask & 0xff); } - use_private_var = builtin && builtin->fixup_pfn; + if ((use_private_var = builtin && builtin->fixup_pfn)) + write_mask = dst->write_mask; if (input_component_count != VKD3D_VEC4_SIZE && vkd3d_count_signature_elements_for_reg(shader_signature, reg_idx) > 1) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; + write_mask = VKD3DSP_WRITEMASK_ALL; } storage_class = SpvStorageClassInput; @@ -3692,8 +3703,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (!entry) { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_var ? VKD3D_TYPE_FLOAT : component_type, - use_private_var ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff); + use_private_var ? VKD3D_TYPE_FLOAT : component_type, write_mask); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);

1 0

Józef Kucia : tests: Add more tests for shader input components.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: ac7b007fc770f87bb7925899516dbf081e9998f8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ac7b007fc770f87bb792589… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:03 2019 +0200 tests: Add more tests for shader input components. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 167 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 85 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ac7b007fc770f87bb79…

1 0

Józef Kucia : vkd3d-shader: Make sure that specialization constants are emitted once.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: def3a71513f2877a6420a79d486167f7951f7a34 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=def3a71513f2877a6420a79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:07 2019 +0200 vkd3d-shader: Make sure that specialization constants are emitted once. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 50 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index aa3351b..6332ef5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1967,6 +1967,12 @@ struct vkd3d_shader_phase size_t function_location; }; +struct vkd3d_shader_spec_constant +{ + enum vkd3d_shader_parameter_name name; + uint32_t id; +}; + struct vkd3d_hull_shader_variables { uint32_t tess_level_outer_id; @@ -2012,8 +2018,6 @@ struct vkd3d_dxbc_compiler uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; - uint32_t current_spec_constant_id; - uint32_t binding_idx; const struct vkd3d_shader_scan_info *scan_info; @@ -2023,6 +2027,11 @@ struct vkd3d_dxbc_compiler unsigned int shader_phase_count; struct vkd3d_shader_phase *shader_phases; size_t shader_phases_size; + + uint32_t current_spec_constant_id; + unsigned int spec_constant_count; + struct vkd3d_shader_spec_constant *spec_constants; + size_t spec_constants_size; }; static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) @@ -2564,13 +2573,39 @@ static uint32_t vkd3d_dxbc_compiler_emit_spec_constant(struct vkd3d_dxbc_compile if (info) vkd3d_spirv_build_op_name(builder, id, "%s", info->debug_name); + if (vkd3d_array_reserve((void **)&compiler->spec_constants, &compiler->spec_constants_size, + compiler->spec_constant_count + 1, sizeof(*compiler->spec_constants))) + { + struct vkd3d_shader_spec_constant *constant = &compiler->spec_constants[compiler->spec_constant_count++]; + constant->name = name; + constant->id = id; + } + return id; } +static uint32_t vkd3d_dxbc_compiler_get_spec_constant(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_parameter_name name, uint32_t spec_id) +{ + unsigned int i; + + for (i = 0; i < compiler->spec_constant_count; ++i) + { + if (compiler->spec_constants[i].name == name) + return compiler->spec_constants[i].id; + } + + if (!spec_id) + spec_id = vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler); + + return vkd3d_dxbc_compiler_emit_spec_constant(compiler, name, spec_id); +} + static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_parameter_name name) { const struct vkd3d_shader_parameter *parameter; + uint32_t spec_constant_id = 0; if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) { @@ -2580,14 +2615,14 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); - if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - return vkd3d_dxbc_compiler_emit_spec_constant(compiler, name, parameter->u.specialization_constant.id); - FIXME("Unhandled parameter type %#x.\n", parameter->type); + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) + spec_constant_id = parameter->u.specialization_constant.id; + else + FIXME("Unhandled parameter type %#x.\n", parameter->type); default_parameter: - return vkd3d_dxbc_compiler_emit_spec_constant(compiler, - name, vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler)); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, spec_constant_id); } static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler, @@ -8265,6 +8300,7 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) rb_destroy(&compiler->symbol_table, vkd3d_symbol_free, NULL); vkd3d_free(compiler->shader_phases); + vkd3d_free(compiler->spec_constants); vkd3d_free(compiler); }

1 0

Józef Kucia : tests: Add test for GetRenderTargetSampleCount().
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: 853e6b9726de9575e24b79c88bab045558557e1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=853e6b9726de9575e24b79c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:09 2019 +0200 tests: Add test for GetRenderTargetSampleCount(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 43dd8ac..5f2e6b1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27546,6 +27546,67 @@ static void test_coverage(void) destroy_test_context(&context); } +static void test_shader_get_render_target_sample_count(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const float black[4]; + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_Target + { + return GetRenderTargetSampleCount(); + } + +#endif + 0x43425844, 0x74404d37, 0xad6f88e4, 0xb006ea57, 0xf07d9e2a, 0x00000001, 0x000000a4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000002c, 0x00000050, 0x0000000b, + 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x0400006f, 0x001020f2, 0x00000000, 0x0000e00a, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct vec4 sample_count = {8.0f, 8.0f, 8.0f, 8.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.sample_desc.Count = 8; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + pso_desc.SampleDesc.Count = desc.sample_desc.Count; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, black, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &sample_count, 0); + + destroy_test_context(&context); +} + static void test_shader_eval_attribute(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28561,6 +28622,7 @@ START_TEST(d3d12) run_test(test_multisample_rendering); run_test(test_sample_mask); run_test(test_coverage); + run_test(test_shader_get_render_target_sample_count); run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output);

1 0

Józef Kucia : vkd3d: Pass sample count to shader compiler.
by Alexandre Julliard April 26, 2019

April 26, 2019

Module: vkd3d Branch: master Commit: 90bd84bf83d352ecd718029bdbafc60d8d97b8fd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90bd84bf83d352ecd718029… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 26 12:37:08 2019 +0200 vkd3d: Pass sample count to shader compiler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a6b5fdd..edf3399 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1878,6 +1878,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_compile_arguments ps_compile_args; + struct vkd3d_shader_parameter ps_shader_parameters[1]; struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; @@ -2071,11 +2072,16 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_shader_parameters[0].name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT; + ps_shader_parameters[0].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; + ps_shader_parameters[0].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; + ps_shader_parameters[0].u.immediate_constant.u.u32 = sample_count; + ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; - ps_compile_args.parameter_count = 0; - ps_compile_args.parameters = NULL; + ps_compile_args.parameter_count = ARRAY_SIZE(ps_shader_parameters); + ps_compile_args.parameters = ps_shader_parameters; ps_compile_args.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count;

1 0