June 2020 - Wine-devel - list.winehq.org

[PATCH 1/6] jscript: Support ES5 Array.prototype.sort arguments handling.
by Jacek Caban 03 Jun '20

03 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 33 ++++++++++++++++----------------- dlls/jscript/tests/api.js | 13 +++++++++++++ dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-)

1 0

[PATCH 08/12] winmm/tests: Introduce compare_uint helper.
by Jacek Caban 03 Jun '20

03 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winmm/tests/mixer.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

2 1

[PATCH 09/12] winmm: Introduce compare_uint helper.
by Jacek Caban 03 Jun '20

03 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winmm/joystick.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)

3 2

[PATCH v2] ole2.dll16: Add stub WriteFmtUserTypeStg function
by Vijay Kiran Kamuju 03 Jun '20

03 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48822 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] ole32: Use an object for Regsitered DragDrop windows. (resend)
by Alistair Leslie-Hughes 03 Jun '20

03 Jun '20

The BCG library registers just about every window it creates for Drag and Drop. The current method creates a file for each window registered for DnD, and in the case of a large application that uses BCG, 1000's of files can be created. Reducing the amount of file an application can use. The new way, uses an unique guid for each regsitered window and then use that guid to lookup whether it supports Drag and Drop. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ole32/ole2.c | 183 ++++++++++++---------------------------- dlls/winex11.drv/xdnd.c | 68 +++++---------- 2 files changed, 73 insertions(+), 178 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6653fac342..531085739f 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -114,10 +114,13 @@ static const WCHAR prop_olemenuW[] = static const WCHAR prop_oledroptarget[] = {'O','l','e','D','r','o','p','T','a','r','g','e','t','I','n','t','e','r','f','a','c','e',0}; -/* property to store Marshalled IDropTarget pointer */ +/* property to store Marshalled Atom value */ static const WCHAR prop_marshalleddroptarget[] = {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; +static const WCHAR prop_marshalledcookie[] = + {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','C','o','o','k','i','e',0}; + static const WCHAR emptyW[] = { 0 }; /****************************************************************************** @@ -276,9 +279,9 @@ HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) { * This handle belongs to the process that called RegisterDragDrop. * See get_droptarget_local_handle(). */ -static inline HANDLE get_droptarget_handle(HWND hwnd) +static inline ATOM get_droptarget_handle(HWND hwnd) { - return GetPropW(hwnd, prop_marshalleddroptarget); + return HandleToULong(GetPropW(hwnd, prop_marshalleddroptarget)); } /************************************************************* @@ -291,91 +294,6 @@ static inline BOOL is_droptarget(HWND hwnd) return get_droptarget_handle(hwnd) != 0; } -/************************************************************* - * get_droptarget_local_handle - * - * Retrieve a handle to the map containing the marshalled IDropTarget. - * The handle should be closed when finished with. - */ -static HANDLE get_droptarget_local_handle(HWND hwnd) -{ - HANDLE handle, local_handle = 0; - - handle = get_droptarget_handle(hwnd); - - if(handle) - { - DWORD pid; - HANDLE process; - - GetWindowThreadProcessId(hwnd, &pid); - process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid); - if(process) - { - DuplicateHandle(process, handle, GetCurrentProcess(), &local_handle, 0, FALSE, DUPLICATE_SAME_ACCESS); - CloseHandle(process); - } - } - return local_handle; -} - -/*********************************************************************** - * create_map_from_stream - * - * Helper for RegisterDragDrop. Creates a file mapping object - * with the contents of the provided stream. The stream must - * be a global memory backed stream. - */ -static HRESULT create_map_from_stream(IStream *stream, HANDLE *map) -{ - HGLOBAL hmem; - DWORD size; - HRESULT hr; - void *data; - - hr = GetHGlobalFromStream(stream, &hmem); - if(FAILED(hr)) return hr; - - size = GlobalSize(hmem); - *map = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, NULL); - if(!*map) return E_OUTOFMEMORY; - - data = MapViewOfFile(*map, FILE_MAP_WRITE, 0, 0, size); - memcpy(data, GlobalLock(hmem), size); - GlobalUnlock(hmem); - UnmapViewOfFile(data); - return S_OK; -} - -/*********************************************************************** - * create_stream_from_map - * - * Creates a stream from the provided map. - */ -static HRESULT create_stream_from_map(HANDLE map, IStream **stream) -{ - HRESULT hr = E_OUTOFMEMORY; - HGLOBAL hmem; - void *data; - MEMORY_BASIC_INFORMATION info; - - data = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); - if(!data) return hr; - - VirtualQuery(data, &info, sizeof(info)); - TRACE("size %d\n", (int)info.RegionSize); - - hmem = GlobalAlloc(GMEM_MOVEABLE, info.RegionSize); - if(hmem) - { - memcpy(GlobalLock(hmem), data, info.RegionSize); - GlobalUnlock(hmem); - hr = CreateStreamOnHGlobal(hmem, TRUE, stream); - } - UnmapViewOfFile(data); - return hr; -} - /* This is to work around apps which break COM rules by not implementing * IDropTarget::QueryInterface(). Windows doesn't expose this because it * doesn't call CoMarshallInterface() in RegisterDragDrop(). @@ -528,18 +446,29 @@ static IDropTarget* WrapDropTarget( HWND hwnd ) static IDropTarget* get_droptarget_pointer(HWND hwnd) { IDropTarget *droptarget = NULL; - HANDLE map; - IStream *stream; + ATOM atom; + WCHAR guid_str[40]; + GUID guid; + HRESULT hr; + + atom = get_droptarget_handle(hwnd); + if (!atom) return NULL; - map = get_droptarget_local_handle(hwnd); - if(!map) return NULL; + if (GlobalGetAtomNameW(atom, guid_str, ARRAY_SIZE(guid_str)) == 0) + return NULL; - if(SUCCEEDED(create_stream_from_map(map, &stream))) + if (CLSIDFromString(guid_str, &guid) != S_OK) { - CoUnmarshalInterface(stream, &IID_IDropTarget, (void**)&droptarget); - IStream_Release(stream); + ERR("Failed to convert string %s\n", debugstr_w(guid_str)); + return NULL; } - CloseHandle(map); + + hr = CoGetClassObject(&guid, CLSCTX_SERVER, NULL, &IID_IDropTarget, (void**)&droptarget); + if (FAILED(hr)) + { + WARN("CoGetClassObject failed (0x%08x)\n", hr); + } + return droptarget; } @@ -550,9 +479,9 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) { DWORD pid = 0; HRESULT hr; - IStream *stream; - HANDLE map; IDropTarget *wrapper; + GUID guid; + DWORD cookie; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -590,37 +519,38 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) * "OleDropTargetInterface" prop for compatibility with Windows. */ - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - if(FAILED(hr)) return hr; + CoCreateGuid(&guid); /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ wrapper = WrapDropTarget( hwnd ); if(!wrapper) { - IStream_Release(stream); return E_OUTOFMEMORY; } - hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)wrapper, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + + hr = CoRegisterClassObject(&guid, (IUnknown*)wrapper, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, + &cookie); + if (FAILED(hr)) + ERR("Failed to register class 0x%08x\n", hr); IDropTarget_Release(wrapper); if(SUCCEEDED(hr)) { - hr = create_map_from_stream(stream, &map); - if(SUCCEEDED(hr)) - { - IDropTarget_AddRef(pDropTarget); - SetPropW(hwnd, prop_oledroptarget, pDropTarget); - SetPropW(hwnd, prop_marshalleddroptarget, map); - } - else - { - LARGE_INTEGER zero; - zero.QuadPart = 0; - IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); - CoReleaseMarshalData(stream); - } + WCHAR *guid_str; + ATOM atom; + + IDropTarget_AddRef(pDropTarget); + SetPropW(hwnd, prop_oledroptarget, pDropTarget); + + StringFromCLSID(&guid, &guid_str); + + atom = GlobalAddAtomW(guid_str); + + SetPropW(hwnd, prop_marshalleddroptarget, ULongToHandle(atom)); + SetPropW(hwnd, prop_marshalledcookie, ULongToHandle(cookie)); + + CoTaskMemFree(guid_str); } - IStream_Release(stream); return hr; } @@ -630,10 +560,9 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) */ HRESULT WINAPI RevokeDragDrop(HWND hwnd) { - HANDLE map; - IStream *stream; + ATOM atom; IDropTarget *drop_target; - HRESULT hr; + DWORD cookie; TRACE("(%p)\n", hwnd); @@ -644,24 +573,20 @@ HRESULT WINAPI RevokeDragDrop(HWND hwnd) } /* no registration data */ - if (!(map = get_droptarget_handle(hwnd))) + if (!(atom = get_droptarget_handle(hwnd))) return DRAGDROP_E_NOTREGISTERED; drop_target = GetPropW(hwnd, prop_oledroptarget); if(drop_target) IDropTarget_Release(drop_target); + cookie = HandleToULong(GetPropW(hwnd, prop_marshalledcookie)); RemovePropW(hwnd, prop_oledroptarget); RemovePropW(hwnd, prop_marshalleddroptarget); - hr = create_stream_from_map(map, &stream); - if(SUCCEEDED(hr)) - { - CoReleaseMarshalData(stream); - IStream_Release(stream); - } - CloseHandle(map); + CoRevokeClassObject(cookie); + GlobalDeleteAtom(atom); - return hr; + return S_OK; } /*********************************************************************** diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0cd2ad8892..0e61ecd15d 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -85,69 +85,39 @@ static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Based on functions in dlls/ole32/ole2.c */ -static HANDLE get_droptarget_local_handle(HWND hwnd) +static ATOM get_droptarget_local_handle(HWND hwnd) { static const WCHAR prop_marshalleddroptarget[] = {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; - HANDLE handle; - HANDLE local_handle = 0; - - handle = GetPropW(hwnd, prop_marshalleddroptarget); - if (handle) - { - DWORD pid; - HANDLE process; - - GetWindowThreadProcessId(hwnd, &pid); - process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid); - if (process) - { - DuplicateHandle(process, handle, GetCurrentProcess(), &local_handle, 0, FALSE, DUPLICATE_SAME_ACCESS); - CloseHandle(process); - } - } - return local_handle; + return HandleToULong(GetPropW(hwnd, prop_marshalleddroptarget)); } -static HRESULT create_stream_from_map(HANDLE map, IStream **stream) +static IDropTarget* get_droptarget_pointer(HWND hwnd) { - HRESULT hr = E_OUTOFMEMORY; - HGLOBAL hmem; - void *data; - MEMORY_BASIC_INFORMATION info; + IDropTarget *droptarget = NULL; + ATOM atom; + WCHAR guid_str[40]; + GUID guid; + HRESULT hr; - data = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); - if(!data) return hr; + atom = get_droptarget_local_handle(hwnd); + if (!atom) return NULL; - VirtualQuery(data, &info, sizeof(info)); - TRACE("size %d\n", (int)info.RegionSize); + if (GlobalGetAtomNameW(atom, guid_str, ARRAY_SIZE(guid_str)) == 0) + return NULL; - hmem = GlobalAlloc(GMEM_MOVEABLE, info.RegionSize); - if(hmem) + if (CLSIDFromString(guid_str, &guid) != S_OK) { - memcpy(GlobalLock(hmem), data, info.RegionSize); - GlobalUnlock(hmem); - hr = CreateStreamOnHGlobal(hmem, TRUE, stream); + ERR("Failed to convert string %s\n", debugstr_w(guid_str)); + return NULL; } - UnmapViewOfFile(data); - return hr; -} - -static IDropTarget* get_droptarget_pointer(HWND hwnd) -{ - IDropTarget *droptarget = NULL; - HANDLE map; - IStream *stream; - map = get_droptarget_local_handle(hwnd); - if(!map) return NULL; - - if(SUCCEEDED(create_stream_from_map(map, &stream))) + hr = CoGetClassObject(&guid, CLSCTX_SERVER, NULL, &IID_IDropTarget, (void**)&droptarget); + if (FAILED(hr)) { - CoUnmarshalInterface(stream, &IID_IDropTarget, (void**)&droptarget); - IStream_Release(stream); + ERR("CoGetClassObject failed (0x%08x)\n", hr); } - CloseHandle(map); + return droptarget; } -- 2.26.2

2 1

[PATCH v4 11/11] ntoskrnl.exe/tests: Add initial test for netio.sys.
by Paul Gofman 03 Jun '20

03 Jun '20

Test driver should import netio.sys which is available since Vista, so a new test driver is needed to preserve XP compatibility for the existing tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v4: - fix IRP completion in main_test(); - remove redundant (and potentially dangerous) IoMarkIrpPending() in driver_iocontrol(). dlls/ntoskrnl.exe/tests/Makefile.in | 4 + dlls/ntoskrnl.exe/tests/driver4.c | 246 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 59 ++++++- 3 files changed, 301 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 7946b8de220..06c06671ca1 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -7,6 +7,8 @@ driver2_IMPORTS = winecrt0 ntoskrnl driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver3_IMPORTS = winecrt0 ntoskrnl driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver4_IMPORTS = winecrt0 ntoskrnl netio +driver4_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ @@ -15,4 +17,6 @@ SOURCES = \ driver2.spec \ driver3.c \ driver3.spec \ + driver4.c \ + driver4.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index e69de29bb2d..2fe6072ec58 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -0,0 +1,246 @@ +/* + * ntoskrnl.exe testing framework + * + * Copyright 2020 Paul Gofman 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/ntddk.h" +#include "ddk/ntifs.h" +#include "ddk/wdm.h" +#include "ddk/wsk.h" + +#include "driver.h" + +#include "utils.h" + +static DRIVER_OBJECT *driver_obj; +static DEVICE_OBJECT *lower_device, *upper_device; + +static unsigned int create_count, close_count; + +static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4"; +static const WCHAR device_name[] = L"\\Device\\WineTestDriver4"; +static const WCHAR upper_name[] = L"\\Device\\WineTestUpper4"; + +static FILE_OBJECT *last_created_file; +static void *create_caller_thread; +static PETHREAD create_irp_thread; + +static POBJECT_TYPE *pIoDriverObjectType; + +static WSK_CLIENT_NPI client_npi; +static WSK_REGISTRATION registration; +static WSK_PROVIDER_NPI provider_npi; + +static void netio_init(void) +{ + const WSK_CLIENT_DISPATCH client_dispatch = + { + MAKE_WSK_VERSION(1, 0), 0, NULL + }; + + NTSTATUS status; + + client_npi.Dispatch = &client_dispatch; + status = WskRegister(&client_npi, &registration); + todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + status = WskCaptureProviderNPI(&registration, WSK_INFINITE_WAIT, &provider_npi); + todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); +} + +static void netio_uninit(void) +{ + WskReleaseProviderNPI(&registration); + WskDeregister(&registration); +} + +static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + void *buffer = irp->AssociatedIrp.SystemBuffer; + struct test_input *test_input = buffer; + OBJECT_ATTRIBUTES attr = {0}; + UNICODE_STRING pathU; + IO_STATUS_BLOCK io; + + if (!buffer) + return STATUS_ACCESS_VIOLATION; + if (length < sizeof(failures)) + return STATUS_BUFFER_TOO_SMALL; + + attr.Length = sizeof(attr); + RtlInitUnicodeString(&pathU, test_input->path); + running_under_wine = test_input->running_under_wine; + winetest_debug = test_input->winetest_debug; + winetest_report_success = test_input->winetest_report_success; + attr.ObjectName = &pathU; + attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ + ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + + netio_init(); + + if (winetest_debug) + { + kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + } + ZwClose(okfile); + + *((LONG *)buffer) = failures; + irp->IoStatus.Information = sizeof(failures); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI driver_iocontrol(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS status = STATUS_NOT_SUPPORTED; + + switch (stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_WINETEST_MAIN_TEST: + status = main_test(device, irp, stack); + break; + case IOCTL_WINETEST_DETACH: + IoDetachDevice(lower_device); + status = STATUS_SUCCESS; + break; + default: + break; + } + + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + return status; +} + +static NTSTATUS WINAPI driver_create(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); + + last_created_file = irpsp->FileObject; + ++create_count; + if (context) + *context = create_count; + irpsp->FileObject->FsContext = context; + create_caller_thread = KeGetCurrentThread(); + create_irp_thread = irp->Tail.Overlay.Thread; + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI driver_close(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + + netio_uninit(); + + ++close_count; + if (stack->FileObject->FsContext) + ExFreePool(stack->FileObject->FsContext); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static VOID WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + UNICODE_STRING linkW; + + DbgPrint("Unloading driver.\n"); + + RtlInitUnicodeString(&linkW, driver_link); + IoDeleteSymbolicLink(&linkW); + + IoDeleteDevice(upper_device); + IoDeleteDevice(lower_device); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) +{ + static const WCHAR IoDriverObjectTypeW[] = L"IoDriverObjectType"; + static const WCHAR driver_nameW[] = L"\\Driver\\WineTestDriver4"; + UNICODE_STRING nameW, linkW; + NTSTATUS status; + void *obj; + + DbgPrint("Loading driver.\n"); + + driver_obj = driver; + + driver->DriverUnload = driver_unload; + driver->MajorFunction[IRP_MJ_CREATE] = driver_create; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_iocontrol; + driver->MajorFunction[IRP_MJ_CLOSE] = driver_close; + + RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); + pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); + + RtlInitUnicodeString(&nameW, driver_nameW); + if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) + return status; + if (obj != driver) + { + ObDereferenceObject(obj); + return STATUS_UNSUCCESSFUL; + } + ObDereferenceObject(obj); + + RtlInitUnicodeString(&nameW, device_name); + RtlInitUnicodeString(&linkW, driver_link); + + if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) + { + status = IoCreateSymbolicLink(&linkW, &nameW); + lower_device->Flags &= ~DO_DEVICE_INITIALIZING; + } + + if (!status) + { + RtlInitUnicodeString(&nameW, upper_name); + + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); + } + + if (!status) + { + IoAttachDeviceToDeviceStack(upper_device, lower_device); + upper_device->Flags &= ~DO_DEVICE_INITIALIZING; + } + + return status; +} diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 8d2da92455a..c2afee3dfe9 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -109,17 +109,25 @@ static SC_HANDLE load_driver(char *filename, const char *resname, const char *dr return service; } -static BOOL start_driver(HANDLE service) +static BOOL start_driver(HANDLE service, BOOL vista_plus) { SERVICE_STATUS status; BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); - if (!ret && (GetLastError() == ERROR_DRIVER_BLOCKED || GetLastError() == ERROR_INVALID_IMAGE_HASH)) + if (!ret && (GetLastError() == ERROR_DRIVER_BLOCKED || GetLastError() == ERROR_INVALID_IMAGE_HASH + || (vista_plus && GetLastError() == ERROR_FILE_NOT_FOUND))) { - /* If Secure Boot is enabled or the machine is 64-bit, it will reject an unsigned driver. */ - skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); + if (vista_plus && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("Windows Vista or newer is required to run this service.\n"); + } + else + { + /* If Secure Boot is enabled or the machine is 64-bit, it will reject an unsigned driver. */ + skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); + } DeleteService(service); CloseServiceHandle(service); return FALSE; @@ -143,13 +151,14 @@ static BOOL start_driver(HANDLE service) return TRUE; } +static ULONG64 modified_value; + static void main_test(void) { static const WCHAR dokW[] = {'d','o','k',0}; WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; DWORD len, written, read; - ULONG64 modified_value; UNICODE_STRING pathU; LONG new_failures; char buffer[512]; @@ -178,8 +187,6 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(new_failures), "got size %x\n", written); - todo_wine ok(modified_value == 0xdeadbeeffeedcafe, "Got unexpected value %#I64x.\n", modified_value); - okfile = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(okfile != INVALID_HANDLE_VALUE, "failed to create %s: %u\n", wine_dbgstr_w(pathW), GetLastError()); @@ -506,6 +513,37 @@ static void test_driver3(void) DeleteFileA(filename); } +void test_driver4(void) +{ + char filename[MAX_PATH]; + SC_HANDLE service; + DWORD written; + BOOL ret; + + if (!(service = load_driver(filename, "driver4.dll", "WineTestDriver4"))) + return; + + if (!start_driver(service, TRUE)) + { + DeleteFileA(filename); + return; + } + + device = CreateFileA("\\\\.\\WineTestDriver4", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + main_test(); + + ret = DeviceIoControl(device, IOCTL_WINETEST_DETACH, NULL, 0, NULL, 0, &written, NULL); + ok(ret, "DeviceIoControl failed: %u\n", GetLastError()); + + CloseHandle(device); + + unload_driver(service); + ret = DeleteFileA(filename); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); +} + START_TEST(ntoskrnl) { char filename[MAX_PATH], filename2[MAX_PATH]; @@ -523,7 +561,7 @@ START_TEST(ntoskrnl) subtest("driver"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; - if (!start_driver(service)) + if (!start_driver(service, FALSE)) { DeleteFileA(filename); return; @@ -535,7 +573,10 @@ START_TEST(ntoskrnl) test_basic_ioctl(); test_mismatched_status_ioctl(); + main_test(); + todo_wine ok(modified_value == 0xdeadbeeffeedcafe, "Got unexpected value %#I64x.\n", modified_value); + test_overlapped(); test_load_driver(service2); test_file_handles(); @@ -556,4 +597,6 @@ START_TEST(ntoskrnl) ok(ret, "DeleteFile failed: %u\n", GetLastError()); test_driver3(); + subtest("driver4"); + test_driver4(); } -- 2.26.2

1 0

[PATCH] ntoskrnl.exe/tests: Avoid race condition in test driver.
by Paul Gofman 03 Jun '20

03 Jun '20

Might fix random driver crash on testbot Win8 machine. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index b3865fea0d9..fa8d7b20e3e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2058,7 +2058,9 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st main_test_work_item = IoAllocateWorkItem(lower_device); ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); + IoMarkIrpPending(irp); IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); + return STATUS_PENDING; } @@ -2244,7 +2246,6 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); } - else IoMarkIrpPending(irp); return status; } -- 2.26.2

1 0

[PATCH 10/10] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo().
by Henri Verbeet 03 Jun '20

03 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb43f9975ec..cd3d4b4912d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -450,7 +450,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - DWORD src_mask, dst_mask; + GLbitfield src_mask, dst_mask; GLbitfield gl_mask; TRACE("device %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -458,8 +458,17 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = 0; + if (src_texture->resource.format->depth_size) + src_mask |= GL_DEPTH_BUFFER_BIT; + if (src_texture->resource.format->stencil_size) + src_mask |= GL_STENCIL_BUFFER_BIT; + + dst_mask = 0; + if (dst_texture->resource.format->depth_size) + dst_mask |= GL_DEPTH_BUFFER_BIT; + if (dst_texture->resource.format->stencil_size) + dst_mask |= GL_STENCIL_BUFFER_BIT; if (src_mask != dst_mask) { @@ -475,12 +484,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct debug_d3dformat(src_texture->resource.format->id)); return; } - - gl_mask = 0; - if (src_mask & WINED3DFMT_FLAG_DEPTH) - gl_mask |= GL_DEPTH_BUFFER_BIT; - if (src_mask & WINED3DFMT_FLAG_STENCIL) - gl_mask |= GL_STENCIL_BUFFER_BIT; + gl_mask = src_mask; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ -- 2.20.1

1 0

[PATCH 09/10] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt().
by Henri Verbeet 03 Jun '20

03 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c95f7a43a5..652f6070b93 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1483,11 +1483,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; DWORD src_location, dst_location, valid_locations; - DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; BOOL scale, convert, resolve; RECT src_rect, dst_rect; + bool src_ds, dst_ds; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -1561,12 +1561,10 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ convert = src_texture->resource.format->id != dst_texture->resource.format->id; resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; - dst_ds_flags = dst_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - src_ds_flags = src_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - if (src_ds_flags || dst_ds_flags) + if (src_ds || dst_ds) { TRACE("Depth/stencil blit.\n"); -- 2.20.1

1 0

[PATCH 08/10] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt().
by Henri Verbeet 03 Jun '20

03 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fcb9ff8a1cf..eb43f9975ec 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3829,7 +3829,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned { struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; - unsigned int dst_format_flags, src_format_flags = 0; HRESULT hr; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " @@ -3849,12 +3848,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned && filter != WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - dst_format_flags = dst_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) return hr; - src_format_flags = src_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, src_sub_resource_idx % src_texture->level_count, &src_box))) return hr; @@ -3866,8 +3863,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return WINEDDERR_SURFACEBUSY; } - if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - != (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!src_texture->resource.format->depth_size != !dst_texture->resource.format->depth_size + || !src_texture->resource.format->stencil_size != !dst_texture->resource.format->stencil_size) { WARN("Rejecting depth/stencil blit between incompatible formats.\n"); return WINED3DERR_INVALIDCALL; -- 2.20.1

1 0