November 2018 - Wine-Commits

Alexandre Julliard : rpcrt4: Support delegated proxies on ARM.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: e24f2f3b90937f00bb011c05af98f63d9934b920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24f2f3b90937f00bb011c05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 16:08:06 2018 +0100 rpcrt4: Support delegated proxies on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cstub.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 77b0faf..b85d411 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -167,6 +167,25 @@ typedef struct static const BYTE opcodes[16] = { 0x48, 0x8b, 0x49, 0x20, 0x48, 0x8b, 0x01, 0xff, 0xa0, 0, 0, 0, 0, 0x48, 0x8d, 0x36 }; +#elif defined(__arm__) + +static const DWORD opcodes[] = +{ + 0xe52d4004, /* push {r4} */ + 0xe5900010, /* ldr r0, [r0, #16] */ + 0xe5904000, /* ldr r4, [r0] */ + 0xe59fc008, /* ldr ip, [pc, #8] */ + 0xe08cc004, /* add ip, ip, r4 */ + 0xe49d4004, /* pop {r4} */ + 0xe59cf000 /* ldr pc, [ip] */ +}; + +typedef struct +{ + DWORD opcodes[ARRAY_SIZE(opcodes)]; + DWORD offset; +} vtbl_method_t; + #else #warning You must implement delegated proxies/stubs for your CPU

1 0

Alexandre Julliard : rpcrt4: Support stubless proxies on ARM.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: da383cb8e4fe62da4e638b6295e6041170344656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da383cb8e4fe62da4e638b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 16:07:49 2018 +0100 rpcrt4: Support stubless proxies on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/ndr_typelib.c | 6 +++--- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index ab24b81..56ef84d 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -17,8 +17,6 @@ * 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 - * - * TODO: Handle non-i386 architectures */ #include "config.h" @@ -155,6 +153,49 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) thunk->call_stubless = call_stubless_func; } +#elif defined(__arm__) + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC(call_stubless_func, + "push {r0-r3}\n\t" + "mov r2, sp\n\t" /* stack_top */ + "push {fp,lr}\n\t" + "mov fp, sp\n\t" + "ldr r0, [r0]\n\t" /* This->lpVtbl */ + "ldr r0, [r0,#-8]\n\t" /* MIDL_STUBLESS_PROXY_INFO */ + "ldr r1, [r0,#8]\n\t" /* info->FormatStringOffset */ + "ldrh r1, [r1,ip]\n\t" /* info->FormatStringOffset[index] */ + "ldr ip, [r0,#4]\n\t" /* info->ProcFormatString */ + "add r1, ip\n\t" /* info->ProcFormatString + offset */ + "ldr r0, [r0]\n\t" /* info->pStubDesc */ +#ifdef __SOFTFP__ + "mov r3, #0\n\t" +#else + "vpush {s0-s15}\n\t" /* store the s0-s15/d0-d7 arguments */ + "mov r3, sp\n\t" /* fpu_stack */ +#endif + "bl " __ASM_NAME("ndr_client_call") "\n\t" + "mov sp, fp\n\t" + "pop {fp,lr}\n\t" + "add sp, #16\n\t" + "bx lr" ); + +struct thunk +{ + DWORD ldr_ip; /* ldr ip,[pc] */ + DWORD ldr_pc; /* ldr pc,[pc] */ + DWORD index; + void *func; +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + thunk->ldr_ip = 0xe59fc000; /* ldr ip,[pc] */ + thunk->ldr_pc = 0xe59ff000; /* ldr pc,[pc] */ + thunk->index = index * sizeof(unsigned short); + thunk->func = call_stubless_func; +} + #else /* __i386__ */ #warning You must implement stubless proxies for your CPU diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index f68e61e..215ea7d 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -579,7 +579,7 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, switch (tdesc->vt) { case VT_VARIANT: -#ifndef __i386__ +#if !defined(__i386__) && !defined(__arm__) *flags |= IsSimpleRef | MustFree; break; #endif @@ -608,9 +608,9 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, *basetype = FC_ENUM32; break; case TKIND_RECORD: -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) *flags |= IsByValue | MustFree; -#elif defined(__x86_64__) +#else if (attr->cbSizeInstance <= 8) *flags |= IsByValue | MustFree; else

1 0

Aric Stewart : hidclass.sys: Use IoRegisterDeviceInterface.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: ec2234102acba5d027a2aa4dcba068957bbff815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2234102acba5d027a2aa4d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 2 08:45:42 2018 -0500 hidclass.sys: Use IoRegisterDeviceInterface. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 3364eb3..1591390 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -42,12 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', '\\','H','I','D','#','%','p','&','%','p',0}; -static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','%','s','#','%','s',0}; -/* GUID_DEVINTERFACE_HID */ -static const WCHAR class_guid[] = {'{','4','D','1','E','5','5','B','2', - '-','F','1','6','F','-','1','1','C','F','-','8','8','C','B','-','0','0', - '1','1','1','1','0','0','0','0','3','0','}',0}; - NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) { @@ -75,7 +69,7 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT ext->deviceExtension.NextDeviceObject = native_device; ext->device_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(dev_name) + 1) * sizeof(WCHAR)); lstrcpyW(ext->device_name, dev_name); - ext->link_name = NULL; + ext->link_name.Buffer = NULL; IoAttachDeviceToDeviceStack(*device, native_device); @@ -84,10 +78,8 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { - WCHAR dev_link[255]; - WCHAR *ptr; SP_DEVINFO_DATA Data; - UNICODE_STRING nameW, linkW; + UNICODE_STRING nameW; NTSTATUS status; HDEVINFO devinfo; GUID hidGuid; @@ -96,25 +88,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) HidD_GetHidGuid(&hidGuid); ext = device->DeviceExtension; - sprintfW(dev_link, device_link_fmtW, ext->instance_id, class_guid); - ptr = dev_link + 4; - do { if (*ptr == '\\') *ptr = '#'; } while (*ptr++); - struprW(dev_link); - RtlInitUnicodeString( &nameW, ext->device_name); - RtlInitUnicodeString( &linkW, dev_link ); - - TRACE("Create link %s\n", debugstr_w(dev_link)); - - ext->link_name = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(dev_link) + 1)); - lstrcpyW(ext->link_name, dev_link); - - status = IoCreateSymbolicLink( &linkW, &nameW ); - if (status) - { - FIXME( "failed to create link error %x\n", status ); - return status; - } devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo) @@ -138,13 +112,22 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) FIXME( "failed to Register Device Info %x\n", GetLastError()); goto error; } - if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL)) + SetupDiDestroyDeviceInfoList(devinfo); + + status = IoRegisterDeviceInterface(device, &hidGuid, NULL, &ext->link_name); + if (status != STATUS_SUCCESS) { - FIXME( "failed to Create Device Interface %x\n", GetLastError()); - goto error; + FIXME( "failed to register device interface %x\n", status ); + return status; + } + + status = IoCreateSymbolicLink( &ext->link_name, &nameW ); + if (status != STATUS_SUCCESS) + { + FIXME( "failed to create link error %x\n", status ); + return status; } - SetupDiDestroyDeviceInfoList(devinfo); return STATUS_SUCCESS; error: @@ -156,20 +139,17 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device { NTSTATUS status; BASE_DEVICE_EXTENSION *ext; - UNICODE_STRING linkW; LIST_ENTRY *entry; IRP *irp; ext = device->DeviceExtension; - if (ext->link_name) + if (ext->link_name.Buffer) { - TRACE("Delete link %s\n", debugstr_w(ext->link_name)); - RtlInitUnicodeString(&linkW, ext->link_name); - - IoSetDeviceInterfaceState(&linkW, FALSE); + TRACE("Delete link %s\n", debugstr_w(ext->link_name.Buffer)); - status = IoDeleteSymbolicLink(&linkW); + IoSetDeviceInterfaceState(&ext->link_name, FALSE); + status = IoDeleteSymbolicLink(&ext->link_name); if (status != STATUS_SUCCESS) ERR("Delete Symbolic Link failed (%x)\n",status); } @@ -196,7 +176,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device TRACE("Delete device(%p) %s\n", device, debugstr_w(ext->device_name)); HeapFree(GetProcessHeap(), 0, ext->device_name); - HeapFree(GetProcessHeap(), 0, ext->link_name); + RtlFreeUnicodeString(&ext->link_name); IoDeleteDevice(device); } diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 4e8ba3c..769b715 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -47,7 +47,7 @@ typedef struct _BASE_DEVICE_EXTENSION { ULONG poll_interval; WCHAR *device_name; - WCHAR *link_name; + UNICODE_STRING link_name; WCHAR device_id[MAX_DEVICE_ID_LEN]; WCHAR instance_id[MAX_DEVICE_ID_LEN]; struct ReportRingBuffer *ring_buffer; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 34bd944..47bd443 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -286,12 +286,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_START_DEVICE: { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - UNICODE_STRING linkU; rc = minidriver->PNPDispatch(device, irp); - RtlInitUnicodeString(&linkU, ext->link_name); - IoSetDeviceInterfaceState(&linkU, TRUE); + IoSetDeviceInterfaceState(&ext->link_name, TRUE); return rc; } case IRP_MN_REMOVE_DEVICE:

1 0

Aric Stewart : ntoskrnl.exe: Implement IoRegisterDeviceInterface.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 9faf36789dd752344e08b0c95aef9cf0324752c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9faf36789dd752344e08b0c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 2 08:45:27 2018 -0500 ntoskrnl.exe: Implement IoRegisterDeviceInterface. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 110 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 5b03c59..afb22fe 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 -DELAYIMPORTS = user32 +DELAYIMPORTS = setupapi user32 C_SRCS = \ instr.c \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e9e3afa..e52cb16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -40,6 +40,7 @@ #include "winuser.h" #include "dbt.h" #include "winreg.h" +#include "setupapi.h" #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" @@ -1665,6 +1666,115 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE itype, PULONG bus, PCON } +static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) +{ + WCHAR *id, *ptr; + NTSTATUS status; + + status = get_device_id( device, BusQueryInstanceID, &id ); + if (status != STATUS_SUCCESS) return status; + + struprW( id ); + for (ptr = id; *ptr; ptr++)if (*ptr == '\\') *ptr = '#'; + + *instance_id = id; + return STATUS_SUCCESS; +} + + +/***************************************************** + * IoRegisterDeviceInterface(NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) +{ + WCHAR *instance_id; + NTSTATUS status = STATUS_SUCCESS; + HDEVINFO infoset; + WCHAR *referenceW = NULL; + SP_DEVINFO_DATA devInfo; + SP_DEVICE_INTERFACE_DATA infoData; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + DWORD required; + BOOL rc; + + TRACE( "(%p, %s, %s, %p)\n", device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link ); + + if (reference_string != NULL) + referenceW = reference_string->Buffer; + + infoset = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + if (infoset == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; + + status = get_instance_id( device, &instance_id ); + if (status != STATUS_SUCCESS) return status; + + devInfo.cbSize = sizeof( devInfo ); + rc = SetupDiCreateDeviceInfoW( infoset, instance_id, class_guid, NULL, NULL, 0, &devInfo ); + if (rc == 0) + { + if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) + { + DWORD index = 0; + DWORD size = strlenW(instance_id) + 2; + WCHAR *id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + do + { + rc = SetupDiEnumDeviceInfo( infoset, index, &devInfo ); + if (rc && IsEqualGUID( &devInfo.ClassGuid, class_guid )) + { + BOOL check; + check = SetupDiGetDeviceInstanceIdW( infoset, &devInfo, id, size, &required ); + if (check && strcmpW( id, instance_id ) == 0) + break; + } + index++; + } while (rc); + + HeapFree( GetProcessHeap(), 0, id ); + if (!rc) + { + HeapFree( GetProcessHeap(), 0, instance_id ); + return STATUS_UNSUCCESSFUL; + } + } + else + { + HeapFree( GetProcessHeap(), 0, instance_id ); + return STATUS_UNSUCCESSFUL; + } + } + HeapFree( GetProcessHeap(), 0, instance_id ); + + infoData.cbSize = sizeof( infoData ); + rc = SetupDiCreateDeviceInterfaceW( infoset, &devInfo, class_guid, NULL, 0, &infoData ); + if (!rc) return STATUS_UNSUCCESSFUL; + + required = 0; + SetupDiGetDeviceInterfaceDetailW( infoset, &infoData, NULL, 0, &required, NULL ); + if (required == 0) return STATUS_UNSUCCESSFUL; + + data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY , required ); + data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + + rc = SetupDiGetDeviceInterfaceDetailW( infoset, &infoData, data, required, NULL, NULL ); + if (!rc) + { + HeapFree( GetProcessHeap(), 0, data ); + return STATUS_UNSUCCESSFUL; + } + + data->DevicePath[1] = '?'; + TRACE( "Device path %s\n",debugstr_w(data->DevicePath) ); + + if (symbolic_link) + RtlCreateUnicodeString( symbolic_link, data->DevicePath); + + HeapFree( GetProcessHeap(), 0, data ); + + return status; +} + + /*********************************************************************** * IoRegisterDriverReinitialization (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5987c52..d127a25 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -428,7 +428,7 @@ @ stub IoReadPartitionTableEx @ stub IoReadTransferCount @ stub IoRegisterBootDriverReinitialization -@ stub IoRegisterDeviceInterface +@ stdcall IoRegisterDeviceInterface(ptr ptr ptr ptr) @ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) @ stdcall IoRegisterFileSystem(ptr) @ stub IoRegisterFsRegistrationChange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0cd1673..cd057d5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Alex Henrie : kernel32: Implement GetMaximumProcessorCount.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 8fae94c57a7c5182fdd1795a1724096bb3232015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fae94c57a7c5182fdd1795a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 23:37:49 2018 -0700 kernel32: Implement GetMaximumProcessorCount. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45961 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1e99951..89482a6 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -329,6 +329,21 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) } /*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + SYSTEM_INFO si; + DWORD cpus; + + GetSystemInfo( &si ); + cpus = si.dwNumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + +/*********************************************************************** * GetEnabledXStateFeatures (KERNEL32.@) */ DWORD64 WINAPI GetEnabledXStateFeatures(void) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f600c7e..5490b07 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -715,7 +715,7 @@ # @ stub GetLongPathNameTransactedW @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -# @ stub GetMaximumProcessorCount +@ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long)

1 0

Nikolay Sivov : gdi32/tests: Fix some test failures on newer Win10 releases.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: ce3e220c26844ff2e7fca5fa5789eacd53ac803b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3e220c26844ff2e7fca5fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 13 12:03:35 2018 +0300 gdi32/tests: Fix some test failures on newer Win10 releases. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d07709..4f10e2f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,10 @@ static void test_bitmap_font_metrics(void) memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - todo_wine { + todo_wine ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); - ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); - } + ret = GetLastError(); + ok(ret == ERROR_CAN_NOT_COMPLETE || ret == 0xdeadbeef /* Win10 */, "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError());

1 0

Józef Kucia : vkd3d: Initialize all members of d3d12_resource for external vkd3d resources.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: 11a1a9289e391a48f0f0e1524390c8ba944fac66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11a1a9289e391a48f0f0e15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:31 2018 +0100 vkd3d: Initialize all members of d3d12_resource for external vkd3d resources. 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/resource.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 80265ca..bfbbad5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1321,16 +1321,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; + memset(object, 0, sizeof(*object)); + object->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; object->u.vk_image = create_info->vk_image; - object->vk_memory = VK_NULL_HANDLE; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; - object->map_count = 0; - object->map_ptr = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON;

1 0

Józef Kucia : vkd3d-shader: Avoid SIZE_T.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: 8ac9b120feaa07cbcb5f0ba22d08adff1b8b17d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ac9b120feaa07cbcb5f0ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:33 2018 +0100 vkd3d-shader: Avoid SIZE_T. 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/dxbc.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7b03448..22cf57c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1651,7 +1651,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha DWORD opcode_token, opcode, previous_token; struct vkd3d_sm4_data *priv = data; unsigned int i, len; - SIZE_T remaining; + size_t remaining; const DWORD *p; DWORD precise; @@ -1679,7 +1679,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha } if (!len || remaining < len) { - WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + WARN("Read invalid length %u (remaining %zu).\n", len, remaining); goto fail; } --len; @@ -1980,7 +1980,7 @@ static int isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) return shader_parse_signature(tag, data, data_size, is); } -int shader_parse_input_signature(const void *dxbc, SIZE_T dxbc_length, +int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_signature *signature) { int ret; @@ -2056,7 +2056,7 @@ void free_shader_desc(struct vkd3d_shader_desc *desc) vkd3d_shader_free_shader_signature(&desc->patch_constant_signature); } -int shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, +int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) { int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 651a595..da17e36 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -795,11 +795,11 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; BOOL shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; -int shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, +int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -int shader_parse_input_signature(const void *dxbc, SIZE_T dxbc_length, +int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; struct vkd3d_dxbc_compiler;

1 0

Józef Kucia : tests: Add more tests for mapping resources.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: bebda782c8ee47de6956e06aa89faef4d0da58c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bebda782c8ee47de6956e06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:29 2018 +0100 tests: Add more tests for mapping resources. 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 | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1ddf7c2..e98dbfa 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5364,11 +5364,13 @@ static void test_map_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); /* Resources on a DEFAULT heap cannot be mapped. */ + data = (void *)0xdeadbeef; hr = ID3D12Resource_Map(resource, 0, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); ID3D12Resource_Release(resource); @@ -5385,8 +5387,10 @@ static void test_map_resource(void) else { /* The data pointer must be NULL for the UNKNOWN layout. */ + data = (void *)0xdeadbeef; hr = ID3D12Resource_Map(resource, 0, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); ID3D12Resource_Release(resource); } @@ -5401,11 +5405,39 @@ static void test_map_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); /* Resources on a DEFAULT heap cannot be mapped. */ + data = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + + ID3D12Resource_Release(resource); + + heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + + data = NULL; hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data, "Got NULL pointer.\n"); + ID3D12Resource_Unmap(resource, 0, NULL); + + data = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(resource, 1, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + + data = NULL; + hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data, "Got NULL pointer.\n"); + ID3D12Resource_Unmap(resource, 1, NULL); + ID3D12Resource_Unmap(resource, 0, NULL); ID3D12Resource_Release(resource);

1 0

Józef Kucia : vkd3d: Do not modify pointer on mapping failures.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: b4c36e389af4721298c2a79f239710242a6bc0e1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b4c36e389af4721298c2a79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:30 2018 +0100 vkd3d: Do not modify pointer on mapping failures. 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/resource.c | 40 ++++++++++++++++++++++------------------ libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f4619ef..80265ca 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -238,6 +238,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **data) { struct d3d12_device *device = heap->device; + HRESULT hr = S_OK; VkResult vr; int rc; @@ -259,18 +260,20 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **dat { WARN("Failed to map device memory, vr %d.\n", vr); heap->map_ptr = NULL; - *data = NULL; - pthread_mutex_unlock(&heap->mutex); - return hresult_from_vk_result(vr); } + + hr = hresult_from_vk_result(vr); } - *data = (BYTE *)heap->map_ptr + offset; - ++heap->map_count; + if (heap->map_ptr) + { + *data = (BYTE *)heap->map_ptr + offset; + ++heap->map_count; + } pthread_mutex_unlock(&heap->mutex); - return S_OK; + return hr; } static void d3d12_heap_unmap(struct d3d12_heap *heap) @@ -813,8 +816,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; struct d3d12_device *device; + HRESULT hr = S_OK; VkResult vr; - HRESULT hr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); @@ -853,14 +856,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT { if (resource->heap) { - hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_data); + hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr); } else { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, - 0, VK_WHOLE_SIZE, 0, &resource->map_data))) < 0) + 0, VK_WHOLE_SIZE, 0, &resource->map_ptr))) < 0) WARN("Failed to map device memory, vr %d.\n", vr); hr = hresult_from_vk_result(vr); @@ -869,16 +872,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (FAILED(hr)) { WARN("Failed to map resource, hr %#x.\n", hr); - resource->map_data = NULL; - *data = NULL; - return hr; + resource->map_ptr = NULL; } } - *data = resource->map_data; - ++resource->map_count; + if (resource->map_ptr) + { + *data = resource->map_ptr; + ++resource->map_count; + } - return S_OK; + return hr; } static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT sub_resource, @@ -913,7 +917,7 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - resource->map_data = NULL; + resource->map_ptr = NULL; if (resource->heap) d3d12_heap_unmap(resource->heap); @@ -1148,7 +1152,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 } resource->map_count = 0; - resource->map_data = NULL; + resource->map_ptr = NULL; resource->heap_properties = *heap_properties; resource->heap_flags = heap_flags; @@ -1326,7 +1330,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; object->map_count = 0; - object->map_data = NULL; + object->map_ptr = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index daa60cb..2fc31da 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -231,7 +231,7 @@ struct d3d12_resource unsigned int flags; unsigned int map_count; - void *map_data; + void *map_ptr; struct d3d12_heap *heap; UINT64 heap_offset;

1 0