September 2016 - Wine-Commits

Austin English : api-ms-win-core-threadpool-l1-1-0: Add dll.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 631fd7ffcc6a575d2fcc75afb158a3cdf9740cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631fd7ffcc6a575d2fcc75afb… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 13 23:59:14 2016 -0500 api-ms-win-core-threadpool-l1-1-0: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-threadpool-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-threadpool-l1-1-0.spec | 42 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 47 insertions(+) diff --git a/configure b/configure index 8f58dd1..6727ea5 100755 --- a/configure +++ b/configure @@ -949,6 +949,7 @@ enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 +enable_api_ms_win_core_threadpool_l1_1_0 enable_api_ms_win_core_threadpool_l1_2_0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 @@ -17610,6 +17611,7 @@ wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_ wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 +wine_fn_config_dll api-ms-win-core-threadpool-l1-1-0 enable_api_ms_win_core_threadpool_l1_1_0 wine_fn_config_dll api-ms-win-core-threadpool-l1-2-0 enable_api_ms_win_core_threadpool_l1_2_0 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 diff --git a/configure.ac b/configure.ac index 59e7b7c..35c931a 100644 --- a/configure.ac +++ b/configure.ac @@ -2725,6 +2725,7 @@ WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) +WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/Makefile.in b/dlls/api-ms-win-core-threadpool-l1-1-0/Makefile.in new file mode 100644 index 0000000..2d41aed --- /dev/null +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-threadpool-l1-1-0.dll diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec new file mode 100644 index 0000000..dcf954a --- /dev/null +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec @@ -0,0 +1,42 @@ +@ stdcall CallbackMayRunLong(ptr) kernel32.CallbackMayRunLong +@ stub CancelThreadpoolIo +@ stdcall ChangeTimerQueueTimer(ptr ptr long long) kernel32.ChangeTimerQueueTimer +@ stdcall CloseThreadpool(ptr) kernel32.CloseThreadpool +@ stdcall CloseThreadpoolCleanupGroup(ptr) kernel32.CloseThreadpoolCleanupGroup +@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) kernel32.CloseThreadpoolCleanupGroupMembers +@ stub CloseThreadpoolIo +@ stdcall CloseThreadpoolTimer(ptr) kernel32.CloseThreadpoolTimer +@ stdcall CloseThreadpoolWait(ptr) kernel32.CloseThreadpoolWait +@ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork +@ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool +@ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup +@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer +@ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait +@ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork +@ stdcall CreateTimerQueue() kernel32.CreateTimerQueue +@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) kernel32.CreateTimerQueueTimer +@ stdcall DeleteTimerQueueEx(long long) kernel32.DeleteTimerQueueEx +@ stdcall DeleteTimerQueueTimer(long long long) kernel32.DeleteTimerQueueTimer +@ stdcall DisassociateCurrentThreadFromCallback(ptr) kernel32.DisassociateCurrentThreadFromCallback +@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) kernel32.FreeLibraryWhenCallbackReturns +@ stdcall IsThreadpoolTimerSet(ptr) kernel32.IsThreadpoolTimerSet +@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) kernel32.LeaveCriticalSectionWhenCallbackReturns +@ stub QueryThreadpoolStackInformation +@ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) kernel32.RegisterWaitForSingleObjectEx +@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns +@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns +@ stdcall SetEventWhenCallbackReturns(ptr long) kernel32.SetEventWhenCallbackReturns +@ stub SetThreadpoolStackInformation +@ stdcall SetThreadpoolThreadMaximum(ptr long) kernel32.SetThreadpoolThreadMaximum +@ stdcall SetThreadpoolThreadMinimum(ptr long) kernel32.SetThreadpoolThreadMinimum +@ stdcall SetThreadpoolTimer(ptr ptr long long) kernel32.SetThreadpoolTimer +@ stdcall SetThreadpoolWait(ptr long ptr) kernel32.SetThreadpoolWait +@ stub StartThreadpoolIo +@ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork +@ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback +@ stdcall UnregisterWaitEx(long long) kernel32.UnregisterWaitEx +@ stub WaitForThreadpoolIoCallbacks +@ stdcall WaitForThreadpoolTimerCallbacks(ptr long) kernel32.WaitForThreadpoolTimerCallbacks +@ stdcall WaitForThreadpoolWaitCallbacks(ptr long) kernel32.WaitForThreadpoolWaitCallbacks +@ stdcall WaitForThreadpoolWorkCallbacks(ptr long) kernel32.WaitForThreadpoolWorkCallbacks diff --git a/tools/make_specfiles b/tools/make_specfiles index 554956c..eff126c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -175,6 +175,7 @@ my @dll_groups = "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0", + "api-ms-win-core-threadpool-l1-1-0", "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0",

1 0

Aric Stewart : ntoskrnl.exe: Implement loading plug and play devices.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: e4496a976bb5d7217bfabcd91e8f111d1a90ac1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4496a976bb5d7217bfabcd91… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 14 09:30:43 2016 +0200 ntoskrnl.exe: Implement loading plug and play devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 187 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d5236e6..aebb3de 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); +WINE_DECLARE_DEBUG_CHANNEL(plugplay); BOOLEAN KdDebuggerEnabled = FALSE; ULONG InitSafeBootMode = 0; @@ -76,6 +77,8 @@ static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','S','e','r','v','i','c','e','s', '\\',0}; +#define MAX_SERVICE_NAME 260 + /* tid of the thread running client request */ static DWORD request_thread; @@ -2819,10 +2822,192 @@ done: } +static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + SetEvent( irp->UserEvent ); + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +static NTSTATUS send_device_irp( DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info ) +{ + NTSTATUS status; + IO_STACK_LOCATION *irpsp; + HANDLE event = CreateEventA( NULL, FALSE, FALSE, NULL ); + DEVICE_OBJECT *toplevel_device; + + irp->UserEvent = event; + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->CompletionRoutine = internal_complete; + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_CANCEL; + + toplevel_device = IoGetAttachedDeviceReference( device ); + status = IoCallDriver( toplevel_device, irp ); + + if (status == STATUS_PENDING) + WaitForSingleObject( event, INFINITE ); + + status = irp->IoStatus.u.Status; + if (info) + *info = irp->IoStatus.Information; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + ObDereferenceObject( toplevel_device ); + CloseHandle( event ); + return status; +} + + +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK irp_status; + IRP *irp; + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = IRP_MN_QUERY_ID; + irpsp->Parameters.QueryId.IdType = type; + + return send_device_irp( device, irp, (ULONG_PTR *)id ); +} + + +static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) +{ + static const WCHAR serviceW[] = {'S','e','r','v','i','c','e',0}; + static const UNICODE_STRING service_str = { sizeof(serviceW) - sizeof(WCHAR), sizeof(serviceW), (WCHAR *)serviceW }; + static const WCHAR critical_fmtW[] = + {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','C','r','i','t','i','c','a','l','D','e','v','i','c','e','D','a','t','a','b','a','s','e', + '\\','%','s',0}; + WCHAR buffer[FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_SERVICE_NAME * sizeof(WCHAR)] )]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING key; + NTSTATUS status; + HANDLE hkey; + WCHAR *keyW; + DWORD len; + + if (!(keyW = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(critical_fmtW) + strlenW(id) * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + sprintfW( keyW, critical_fmtW, id ); + RtlInitUnicodeString( &key, keyW ); + InitializeObjectAttributes( &attr, &key, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL ); + + status = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); + RtlFreeUnicodeString( &key ); + if (status != STATUS_SUCCESS) + { + TRACE_(plugplay)( "no driver found for %s\n", debugstr_w(id) ); + return FALSE; + } + + status = NtQueryValueKey( hkey, &service_str, KeyValuePartialInformation, + info, sizeof(buffer) - sizeof(WCHAR), &len ); + NtClose( hkey ); + if (status != STATUS_SUCCESS || info->Type != REG_SZ) + { + TRACE_(plugplay)( "no driver found for %s\n", debugstr_w(id) ); + return FALSE; + } + + memcpy( driver, info->Data, info->DataLength ); + driver[ info->DataLength / sizeof(WCHAR) ] = 0; + TRACE_(plugplay)( "found driver %s for %s\n", debugstr_w(driver), debugstr_w(id) ); + return TRUE; +} + + +static void handle_bus_relations( DEVICE_OBJECT *device ) +{ + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + WCHAR buffer[MAX_SERVICE_NAME + sizeof(servicesW)/sizeof(WCHAR)]; + WCHAR driver[MAX_SERVICE_NAME] = {0}; + DRIVER_OBJECT *driver_obj; + UNICODE_STRING string; + WCHAR *ids, *ptr; + NTSTATUS status; + + TRACE_(plugplay)( "(%p)\n", device ); + + /* We could (should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, + * but we don't have to, we have the DEVICE_OBJECT of the new device + * so we can simply handle the process here */ + + status = get_device_id( device, BusQueryCompatibleIDs, &ids ); + if (status != STATUS_SUCCESS || !ids) + { + ERR_(plugplay)( "Failed to get device IDs\n" ); + return; + } + + for (ptr = ids; *ptr; ptr += strlenW(ptr) + 1) + { + if (get_driver_for_id( ptr, driver )) + break; + } + RtlFreeHeap( GetProcessHeap(), 0, ids ); + + if (!driver[0]) + { + ERR_(plugplay)( "No matching driver found for device\n" ); + return; + } + + strcpyW( buffer, servicesW ); + strcatW( buffer, driver ); + RtlInitUnicodeString( &string, buffer ); + if (ZwLoadDriver( &string ) != STATUS_SUCCESS) + { + ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); + return; + } + + strcpyW( buffer, driverW ); + strcatW( buffer, driver ); + RtlInitUnicodeString( &string, buffer ); + if (ObReferenceObjectByName( &string, OBJ_CASE_INSENSITIVE, NULL, + 0, NULL, KernelMode, NULL, (void **)&driver_obj ) != STATUS_SUCCESS) + { + ERR_(plugplay)( "Failed to locate loaded driver %s\n", debugstr_w(driver) ); + return; + } + + if (driver_obj->DriverExtension->AddDevice) + status = driver_obj->DriverExtension->AddDevice( driver_obj, device ); + else + status = STATUS_NOT_IMPLEMENTED; + + ObDereferenceObject( driver_obj ); + + if (status != STATUS_SUCCESS) + ERR_(plugplay)( "AddDevice failed for driver %s\n", debugstr_w(driver) ); +} + + /*********************************************************************** * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) */ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type ) { - FIXME( "(%p, %i): stub\n", device_object, type ); + TRACE( "(%p, %i)\n", device_object, type ); + + switch (type) + { + case BusRelations: + handle_bus_relations( device_object ); + break; + default: + FIXME( "unhandled relation %i\n", type ); + break; + } }

1 0

Aric Stewart : winebus.sys: Implement IRP_MN_QUERY_ID.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 903e0032ff62aaa2c12386837614a83a0ed662f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903e0032ff62aaa2c12386837… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 14 09:29:50 2016 +0200 winebus.sys: Implement IRP_MN_QUERY_ID. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 9c0f5aa..1364eab 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -111,6 +111,52 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) return dst; } +static WCHAR *get_device_id(DEVICE_OBJECT *device) +{ + static const WCHAR formatW[] = {'%','s','\\','V','i','d','_','%','0','4','x','&','P','i','d','_','%','0','4','x',0}; + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + DWORD len = strlenW(ext->busid) + 19; + WCHAR *dst; + + if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); + + return dst; +} + +static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +{ + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + WCHAR *iid, *did, *dst, *ptr; + DWORD len; + + if (!(iid = get_instance_id(device))) + return NULL; + + if (!(did = get_device_id(device))) + { + HeapFree(GetProcessHeap(), 0, iid); + return NULL; + } + + len = strlenW(iid) + strlenW(did) + strlenW(ext->busid) + 4; + if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + ptr = dst; + strcpyW(ptr, iid); + ptr += strlenW(iid) + 1; + strcpyW(ptr, did); + ptr += strlenW(did) + 1; + strcpyW(ptr, ext->busid); + ptr += strlenW(ext->busid) + 1; + *ptr = 0; + } + + HeapFree(GetProcessHeap(), 0, iid); + HeapFree(GetProcessHeap(), 0, did); + return dst; +} + DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, const GUID *class) @@ -184,6 +230,41 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, return device; } +static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) +{ + NTSTATUS status = irp->IoStatus.u.Status; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + BUS_QUERY_ID_TYPE type = irpsp->Parameters.QueryId.IdType; + + TRACE("(%p, %p)\n", device, irp); + + switch (type) + { + case BusQueryHardwareIDs: + TRACE("BusQueryHardwareIDs\n"); + irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device); + break; + case BusQueryCompatibleIDs: + TRACE("BusQueryCompatibleIDs\n"); + irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device); + break; + case BusQueryDeviceID: + TRACE("BusQueryDeviceID\n"); + irp->IoStatus.Information = (ULONG_PTR)get_device_id(device); + break; + case BusQueryInstanceID: + TRACE("BusQueryInstanceID\n"); + irp->IoStatus.Information = (ULONG_PTR)get_instance_id(device); + break; + default: + FIXME("Unhandled type %08x\n", type); + return status; + } + + status = irp->IoStatus.Information ? STATUS_SUCCESS : STATUS_NO_MEMORY; + return status; +} + NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; @@ -196,6 +277,8 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) break; case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); + status = handle_IRP_MN_QUERY_ID(device, irp); + irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_CAPABILITIES: TRACE("IRP_MN_QUERY_CAPABILITIES\n");

1 0

Aric Stewart : winebus.sys: Create bus devices.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 159c2eb16e5238d6ca4537c4d01d9d8798b46951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159c2eb16e5238d6ca4537c4d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 14 09:28:51 2016 +0200 winebus.sys: Create bus devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus.h | 3 + dlls/winebus.sys/bus_udev.c | 19 ++++++ dlls/winebus.sys/main.c | 150 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index b24416b..9d3a0c2 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winebus.sys -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl setupapi EXTRALIBS = $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) EXTRADLLFLAGS = -Wb,--subsystem,native diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 3d53a46..dcb50f2 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -21,3 +21,6 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry /* HID Plug and Play Bus */ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, + WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, + const GUID *class) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d47a556..1525861 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -50,6 +50,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static struct udev *udev_context = NULL; static DRIVER_OBJECT *udev_driver_obj = NULL; +static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; + +#include "initguid.h" +DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); + static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); @@ -81,6 +86,8 @@ static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0; struct udev_device *usbdev; + DEVICE_OBJECT *device = NULL; + const char *subsystem; const char *devnode; WCHAR *serial = NULL; int fd; @@ -107,6 +114,18 @@ static void try_add_device(struct udev_device *dev) TRACE("Found udev device %s (vid %04x, pid %04x, version %u, serial %s)\n", debugstr_a(devnode), vid, pid, version, debugstr_w(serial)); + subsystem = udev_device_get_subsystem(dev); + if (strcmp(subsystem, "hidraw") == 0) + { + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, + version, 0, serial, FALSE, &GUID_DEVCLASS_HIDRAW); + } + + if (device) + udev_device_ref(dev); + else + WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); + HeapFree(GetProcessHeap(), 0, serial); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 43de25a..9c0f5aa 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -26,14 +26,164 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "winternl.h" +#include "winreg.h" +#include "setupapi.h" #include "ddk/wdm.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" #include "bus.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +struct pnp_device +{ + struct list entry; + DEVICE_OBJECT *device; +}; + +struct device_extension +{ + void *native; /* Must be the first member of the structure */ + + WORD vid, pid; + DWORD uid, version, index; + BOOL is_gamepad; + WCHAR *serial; + const WCHAR *busid; /* Expected to be a static constant */ +}; + +static CRITICAL_SECTION device_list_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &device_list_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": device_list_cs") } +}; +static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static struct list pnp_devset = LIST_INIT(pnp_devset); + +static const WCHAR zero_serialW[]= {'0','0','0','0',0}; +static const WCHAR imW[] = {'I','M',0}; +static const WCHAR igW[] = {'I','G',0}; + +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dst; + if (!src) return NULL; + dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1)*sizeof(WCHAR)); + if (dst) strcpyW(dst, src); + return dst; +} + +static DWORD get_vidpid_index(WORD vid, WORD pid) +{ + struct pnp_device *ptr; + DWORD index = 1; + + LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) + { + struct device_extension *ext = (struct device_extension *)ptr->device->DeviceExtension; + if (ext->vid == vid && ext->pid == pid) + index = max(ext->index + 1, index); + } + + return index; +} + +static WCHAR *get_instance_id(DEVICE_OBJECT *device) +{ + static const WCHAR formatW[] = {'%','s','\\','V','i','d','_','%','0','4','x','&', 'P','i','d','_','%','0','4','x','&', + '%','s','_','%','i','\\','%','i','&','%','s','&','%','x',0}; + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + const WCHAR *serial = ext->serial ? ext->serial : zero_serialW; + DWORD len = strlenW(ext->busid) + strlenW(serial) + 64; + WCHAR *dst; + + if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid, ext->is_gamepad ? igW : imW, + ext->index, ext->version, serial, ext->uid); + + return dst; +} + +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, + WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, + const GUID *class) +{ + static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; + struct device_extension *ext; + struct pnp_device *pnp_dev; + DEVICE_OBJECT *device; + UNICODE_STRING nameW; + WCHAR dev_name[256]; + HDEVINFO devinfo; + NTSTATUS status; + + TRACE("(%p, %s, %p, %04x, %04x, %u, %u, %s, %u, %s)\n", driver, debugstr_w(busidW), native, + vid, pid, version, uid, debugstr_w(serialW), is_gamepad, debugstr_guid(class)); + + if (!(pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)))) + return NULL; + + sprintfW(dev_name, device_name_fmtW, busidW, native); + RtlInitUnicodeString(&nameW, dev_name); + status = IoCreateDevice(driver, sizeof(*ext), &nameW, 0, 0, FALSE, &device); + if (status) + { + FIXME("failed to create device error %x\n", status); + HeapFree(GetProcessHeap(), 0, pnp_dev); + return NULL; + } + + EnterCriticalSection(&device_list_cs); + + /* fill out device_extension struct */ + ext = (struct device_extension *)device->DeviceExtension; + ext->native = native; + ext->vid = vid; + ext->pid = pid; + ext->uid = uid; + ext->version = version; + ext->index = get_vidpid_index(vid, pid); + ext->is_gamepad = is_gamepad; + ext->serial = strdupW(serialW); + ext->busid = busidW; + + /* add to list of pnp devices */ + pnp_dev->device = device; + list_add_tail(&pnp_devset, &pnp_dev->entry); + + LeaveCriticalSection(&device_list_cs); + + devinfo = SetupDiGetClassDevsW(class, NULL, NULL, DIGCF_DEVICEINTERFACE); + if (devinfo) + { + SP_DEVINFO_DATA data; + WCHAR *instance; + + data.cbSize = sizeof(data); + if (!(instance = get_instance_id(device))) + ERR("failed to generate instance id\n"); + else if (!SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) + ERR("failed to create device info: %x\n", GetLastError()); + else if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) + ERR("failed to register device info: %x\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, instance); + SetupDiDestroyDeviceInfoList(devinfo); + } + else + ERR("failed to get ClassDevs: %x\n", GetLastError()); + + IoInvalidateDeviceRelations(device, BusRelations); + return device; +} + NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status;

1 0

Andrey Gusev : api-ms-win-core-apiquery-l1-1-0: Add dll.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: e316b40ca1a57244a09407af39cb48079c387cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e316b40ca1a57244a09407af3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 14 12:22:36 2016 +0300 api-ms-win-core-apiquery-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-apiquery-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index e815d8b..8f58dd1 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 @@ -17534,6 +17535,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 diff --git a/configure.ac b/configure.ac index 5ef439e..59e7b7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in new file mode 100644 index 0000000..492a265 --- /dev/null +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-apiquery-l1-1-0.dll diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec new file mode 100644 index 0000000..6d63b5b --- /dev/null +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec @@ -0,0 +1 @@ +@ stub ApiSetQueryApiSetPresence diff --git a/tools/make_specfiles b/tools/make_specfiles index b5a072c..554956c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -249,6 +249,7 @@ my @dll_groups = "msvcrt", "ntdll", "ntoskrnl.exe", + "api-ms-win-core-apiquery-l1-1-0", "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", ],

1 0

Jacek Caban : mshtml: Use IUnknownVtbl in wrapper_vtbl.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: ca2e0c5e70da6c933ddc7d7f0a4ab7f536191cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2e0c5e70da6c933ddc7d7f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:48:36 2016 +0200 mshtml: Use IUnknownVtbl in wrapper_vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/ifacewrap.c | 210 +++++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 102 deletions(-) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index f31bb4a..a8a8928 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -215,107 +215,113 @@ DEFINE_WRAPPER_FUNC(98, 392, 784) DEFINE_WRAPPER_FUNC(99, 396, 792) /* The size was found by testing when calls start crashing. It looks like MS wraps up to 100 functions. */ -static const void *wrapper_vtbl[] = { - wrapper_QueryInterface, - wrapper_AddRef, - wrapper_Release, - wrapper_func_3, - wrapper_func_4, - wrapper_func_5, - wrapper_func_6, - wrapper_func_7, - wrapper_func_8, - wrapper_func_9, - wrapper_func_10, - wrapper_func_11, - wrapper_func_12, - wrapper_func_13, - wrapper_func_14, - wrapper_func_15, - wrapper_func_16, - wrapper_func_17, - wrapper_func_18, - wrapper_func_19, - wrapper_func_20, - wrapper_func_21, - wrapper_func_22, - wrapper_func_23, - wrapper_func_24, - wrapper_func_25, - wrapper_func_26, - wrapper_func_27, - wrapper_func_28, - wrapper_func_29, - wrapper_func_30, - wrapper_func_31, - wrapper_func_32, - wrapper_func_33, - wrapper_func_34, - wrapper_func_35, - wrapper_func_36, - wrapper_func_37, - wrapper_func_38, - wrapper_func_39, - wrapper_func_40, - wrapper_func_41, - wrapper_func_42, - wrapper_func_43, - wrapper_func_44, - wrapper_func_45, - wrapper_func_46, - wrapper_func_47, - wrapper_func_48, - wrapper_func_49, - wrapper_func_50, - wrapper_func_51, - wrapper_func_52, - wrapper_func_53, - wrapper_func_54, - wrapper_func_55, - wrapper_func_56, - wrapper_func_57, - wrapper_func_58, - wrapper_func_59, - wrapper_func_60, - wrapper_func_61, - wrapper_func_62, - wrapper_func_63, - wrapper_func_64, - wrapper_func_65, - wrapper_func_66, - wrapper_func_67, - wrapper_func_68, - wrapper_func_69, - wrapper_func_70, - wrapper_func_71, - wrapper_func_72, - wrapper_func_73, - wrapper_func_74, - wrapper_func_75, - wrapper_func_76, - wrapper_func_77, - wrapper_func_78, - wrapper_func_79, - wrapper_func_80, - wrapper_func_81, - wrapper_func_82, - wrapper_func_83, - wrapper_func_84, - wrapper_func_85, - wrapper_func_86, - wrapper_func_87, - wrapper_func_88, - wrapper_func_89, - wrapper_func_90, - wrapper_func_91, - wrapper_func_92, - wrapper_func_93, - wrapper_func_94, - wrapper_func_95, - wrapper_func_96, - wrapper_func_97, - wrapper_func_98, - wrapper_func_99 +static const struct { + IUnknownVtbl unk_vtbl; + const void *wrappers[97]; +} wrapper_vtbl = { + { + wrapper_QueryInterface, + wrapper_AddRef, + wrapper_Release + }, { + wrapper_func_3, + wrapper_func_4, + wrapper_func_5, + wrapper_func_6, + wrapper_func_7, + wrapper_func_8, + wrapper_func_9, + wrapper_func_10, + wrapper_func_11, + wrapper_func_12, + wrapper_func_13, + wrapper_func_14, + wrapper_func_15, + wrapper_func_16, + wrapper_func_17, + wrapper_func_18, + wrapper_func_19, + wrapper_func_20, + wrapper_func_21, + wrapper_func_22, + wrapper_func_23, + wrapper_func_24, + wrapper_func_25, + wrapper_func_26, + wrapper_func_27, + wrapper_func_28, + wrapper_func_29, + wrapper_func_30, + wrapper_func_31, + wrapper_func_32, + wrapper_func_33, + wrapper_func_34, + wrapper_func_35, + wrapper_func_36, + wrapper_func_37, + wrapper_func_38, + wrapper_func_39, + wrapper_func_40, + wrapper_func_41, + wrapper_func_42, + wrapper_func_43, + wrapper_func_44, + wrapper_func_45, + wrapper_func_46, + wrapper_func_47, + wrapper_func_48, + wrapper_func_49, + wrapper_func_50, + wrapper_func_51, + wrapper_func_52, + wrapper_func_53, + wrapper_func_54, + wrapper_func_55, + wrapper_func_56, + wrapper_func_57, + wrapper_func_58, + wrapper_func_59, + wrapper_func_60, + wrapper_func_61, + wrapper_func_62, + wrapper_func_63, + wrapper_func_64, + wrapper_func_65, + wrapper_func_66, + wrapper_func_67, + wrapper_func_68, + wrapper_func_69, + wrapper_func_70, + wrapper_func_71, + wrapper_func_72, + wrapper_func_73, + wrapper_func_74, + wrapper_func_75, + wrapper_func_76, + wrapper_func_77, + wrapper_func_78, + wrapper_func_79, + wrapper_func_80, + wrapper_func_81, + wrapper_func_82, + wrapper_func_83, + wrapper_func_84, + wrapper_func_85, + wrapper_func_86, + wrapper_func_87, + wrapper_func_88, + wrapper_func_89, + wrapper_func_90, + wrapper_func_91, + wrapper_func_92, + wrapper_func_93, + wrapper_func_94, + wrapper_func_95, + wrapper_func_96, + wrapper_func_97, + wrapper_func_98, + wrapper_func_99 + } }; HRESULT wrap_iface(IUnknown *iface, IUnknown *ref_unk, IUnknown **ret) @@ -326,7 +332,7 @@ HRESULT wrap_iface(IUnknown *iface, IUnknown *ref_unk, IUnknown **ret) if(!wrapper) return E_OUTOFMEMORY; - wrapper->IUnknown_iface.lpVtbl = (const IUnknownVtbl*)wrapper_vtbl; + wrapper->IUnknown_iface.lpVtbl = &wrapper_vtbl.unk_vtbl; wrapper->ref = 1; IUnknown_AddRef(iface);

1 0

Hans Leidekker : msi: Use proper return types in MSI_RecordSetStreamFromFileW.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 13af267e75fae8be2da63c2f5a4a739c8e4ea252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13af267e75fae8be2da63c2f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:09 2016 +0200 msi: Use proper return types in MSI_RecordSetStreamFromFileW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/record.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 88d94a9..51e7a23 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -727,7 +727,8 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; - HRESULT r; + HRESULT hr; + UINT ret; if( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; @@ -746,16 +747,16 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilenam return ERROR_INVALID_FIELD; ofs.QuadPart = 0; - r = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); - if( FAILED( r ) ) + hr = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); + if (FAILED( hr )) return ERROR_FUNCTION_FAILED; } else { /* read the file into a stream and save the stream in the record */ - r = RECORD_StreamFromFile(szFilename, &stm); - if( r != ERROR_SUCCESS ) - return r; + ret = RECORD_StreamFromFile(szFilename, &stm); + if (ret != ERROR_SUCCESS) + return ret; /* if all's good, store it in the record */ MSI_RecordSetStream(rec, iField, stm);

1 0

Sebastian Lackner : msi: Do not return ERROR_* constant in HRESULT function.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: feb986ac5b9d8f59f4cc61e6bb8ab5192bf77e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb986ac5b9d8f59f4cc61e6b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 17:53:20 2016 +0200 msi: Do not return ERROR_* constant in HRESULT function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ecc3e94..e812ebb 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2543,7 +2543,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen); - if (path && !(pathW = strdupAtoW( path ))) return ERROR_OUTOFMEMORY; + if (path && !(pathW = strdupAtoW( path ))) return E_OUTOFMEMORY; r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen ); msi_free( pathW ); return r;

1 0

Nikolay Sivov : mshtml: Use proper constants as HRESULT return values.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 7846f0947a1df69ee6417af0030bfcfa5620e0c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7846f0947a1df69ee6417af00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 21:54:20 2016 +0300 mshtml: Use proper constants as HRESULT return values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/ifacewrap.c | 4 ++-- dlls/mshtml/main.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 3f37840..76d5c2e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) if(NS_FAILED(nsres)) ERR("SetSrc failed: %08x\n", nsres); - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 80964c9..1ba477e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1167,10 +1167,10 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode2_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; - return NS_OK; + return S_OK; }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { *ppv = &This->IHTMLDOMNode_iface; - return NS_OK; + return S_OK; }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0ee848f..7a4ebe3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -494,7 +494,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString_Finish(&str_name); - return NS_OK; + return S_OK; } static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 14246a6..da1af2c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -458,7 +458,7 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return hres; *ret = window; - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index a22a008..f31bb4a 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -59,7 +59,7 @@ static HRESULT WINAPI wrapper_QueryInterface(IUnknown *iface, REFIID riid, void return IUnknown_QueryInterface(This->ref_unk, riid, ppv); } -static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) +static ULONG WINAPI wrapper_AddRef(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -69,7 +69,7 @@ static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) return ref; } -static HRESULT WINAPI wrapper_Release(IUnknown *iface) +static ULONG WINAPI wrapper_Release(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8a366bd..2a00aee 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -382,7 +382,7 @@ HRESULT WINAPI RunHTMLApplication( HINSTANCE hinst, HINSTANCE hPrevInst, LPSTR szCmdLine, INT nCmdShow ) { FIXME("%p %p %s %d\n", hinst, hPrevInst, debugstr_a(szCmdLine), nCmdShow ); - return 0; + return S_OK; } /***********************************************************************

1 0

Nikolay Sivov : d2d1: Initial implementation of DC render target.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 03d301cc74a31b6f99195d4706cb8e4088a49ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d301cc74a31b6f99195d470… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 12:53:19 2016 +0300 d2d1: Initial implementation of DC render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 16 + dlls/d2d1/dc_render_target.c | 875 +++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 50 ++- dlls/d2d1/render_target.c | 36 ++ dlls/d2d1/tests/d2d1.c | 19 +- 6 files changed, 984 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03d301cc74a31b6f99195…

1 0