June 2019 - Wine-commits - list.winehq.org

Józef Kucia : vkd3d: Prefer uint64_t to UINT64.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 826190fc0e434685e761f6f01ae250d828329eb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=826190fc0e434685e761f6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:35 2019 +0200 vkd3d: Prefer uint64_t to UINT64. 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/command.c | 4 ++-- libs/vkd3d/device.c | 10 +++++----- libs/vkd3d/resource.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f4ad829..97cc7de 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -944,7 +944,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, REFII static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - UINT64 completed_value; + uint64_t completed_value; int rc; TRACE("iface %p.\n", iface); @@ -1086,7 +1086,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * } HRESULT d3d12_fence_create(struct d3d12_device *device, - UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) { struct d3d12_fence *object; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 870b88a..4df2462 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2623,8 +2623,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; - UINT64 requested_alignment; - UINT64 estimated_size; + uint64_t requested_alignment; + uint64_t estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", iface, info, visible_mask, count, resource_descs); @@ -2694,7 +2694,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour return info; invalid: - info->SizeInBytes = ~(UINT64)0; + info->SizeInBytes = ~(uint64_t)0; /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ if (desc->SampleDesc.Count != 1) @@ -2890,7 +2890,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, array_size; const struct vkd3d_format *format; - UINT64 offset, size, total; + uint64_t offset, size, total; TRACE("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %#"PRIx64", " "layouts %p, row_counts %p, row_sizes %p, total_bytes %p.\n", @@ -2904,7 +2904,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i if (row_sizes) memset(row_sizes, 0xff, sizeof(*row_sizes) * sub_resource_count); if (total_bytes) - *total_bytes = ~(UINT64)0; + *total_bytes = ~(uint64_t)0; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6bbd5af..d005fa8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -265,7 +265,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) return impl_from_ID3D12Heap(iface); } -static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **data) +static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **data) { struct d3d12_device *device = heap->device; HRESULT hr = S_OK; @@ -1540,7 +1540,7 @@ allocate_memory: return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } -HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, +HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) { @@ -3036,7 +3036,7 @@ static D3D12_GPU_DESCRIPTOR_HANDLE * STDMETHODCALLTYPE d3d12_descriptor_heap_Get TRACE("iface %p, descriptor %p.\n", iface, descriptor); - descriptor->ptr = (UINT64)(intptr_t)heap->descriptors; + descriptor->ptr = (uint64_t)(intptr_t)heap->descriptors; return descriptor; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e01e005..9191ae2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -319,7 +319,7 @@ struct d3d12_fence }; HRESULT d3d12_fence_create(struct d3d12_device *device, - UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; /* ID3D12Heap */ struct d3d12_heap @@ -371,7 +371,7 @@ struct d3d12_resource void *map_ptr; struct d3d12_heap *heap; - UINT64 heap_offset; + uint64_t heap_offset; D3D12_HEAP_PROPERTIES heap_properties; D3D12_HEAP_FLAGS heap_flags; @@ -399,7 +399,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; -HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, +HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; HRESULT d3d12_reserved_resource_create(struct d3d12_device *device,

1 0

Alexandre Julliard : Wine release 4.10
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: website Branch: master Commit: f991d05514fa31644533165b8e3935cf182e3891 URL: https://source.winehq.org/git/website.git/?a=commit;h=f991d05514fa316445331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 20:44:13 2019 +0200 Wine release 4.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019061001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019061001.xml b/news/en/2019061001.xml new file mode 100644 index 0000000..0cbbbe7 --- /dev/null +++ b/news/en/2019061001.xml @@ -0,0 +1,16 @@ +<news> +<date>June 10, 2019</date> +<title>Wine 4.10 Released</title> +<body> + The Wine development release 4.10 is now available. + <a href="{$root}/announce/4.10">What's new</a> in this release: +<ul> + <li>Many DLLs are built as PE files by default.</li> + <li>More support for installing Plug and Play drivers.</li> + <li>Clock synchronization in Media Foundation.</li> + <li>Volume adjustment in audio drivers.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zebediah Figura : winehid.inf: Add new INF file and copy it to the INF directory.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: eafb4aff5a2c322f4f156fdfada5743834996be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eafb4aff5a2c322f4f156fdf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 7 11:48:35 2019 -0400 winehid.inf: Add new INF file and copy it to the INF directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + loader/Makefile.in | 3 ++- loader/wine.inf.in | 18 ++++++++++++++---- loader/winehid.inf.in | 25 +++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 2981306..b358285 100755 --- a/configure +++ b/configure @@ -21007,6 +21007,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \ programs/notepad/notepad \ diff --git a/configure.ac b/configure.ac index 52c933e..709b43b 100644 --- a/configure.ac +++ b/configure.ac @@ -4034,6 +4034,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \ programs/notepad/notepad \ diff --git a/loader/Makefile.in b/loader/Makefile.in index a776c85..3ada656 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,8 @@ SOURCES = \ wine.inf.in \ wine.man.in \ wine.pl.UTF-8.man.in \ - wine_info.plist.in + wine_info.plist.in \ + winehid.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d28a93..e80af7a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -55,7 +55,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -82,7 +82,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -108,7 +108,7 @@ AddReg=\ [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ @@ -3701,3 +3701,13 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x1 HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 + +[DestinationDirs] +l_intl_section = 11 +inf_section = 17 + +[l_intl_section] +l_intl.nls + +[inf_section] +winehid.inf diff --git a/loader/winehid.inf.in b/loader/winehid.inf.in new file mode 100644 index 0000000..bd42bce --- /dev/null +++ b/loader/winehid.inf.in @@ -0,0 +1,25 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da} +Class=HIDClass + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine hidraw device=device_section,HIDRAW +Wine IOHID device=device_section,IOHID +Wine libevent device=device_section,LNXEV +Wine SDL HID device=device_section,SDLJOY + +[device_section.Services] +AddService = winehid,0x2,svc_section + +[svc_section] +Description="Wine HID Minidriver" +DisplayName="Wine HID" +ServiceBinary="%12%\winehid.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1

1 0

Zebediah Figura : ntoskrnl.exe: Use INF files to locate function drivers.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 4ca91cfd5dc4fbabd6871100776543107c5af8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca91cfd5dc4fbabd6871100… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 7 11:48:36 2019 -0400 ntoskrnl.exe: Use INF files to locate function drivers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 204 ++++++++++++++++++++++++++++++------------------ 1 file changed, 126 insertions(+), 78 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index e7303b6..b8bdf93 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -44,6 +44,9 @@ #include "ntoskrnl_private.h" +#include "initguid.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #define MAX_SERVICE_NAME 260 @@ -238,57 +241,6 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer ) return STATUS_SUCCESS; } -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("No driver found for ID %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("No driver found for device ID %s.\n", debugstr_w(id)); - return FALSE; - } - - memcpy( driver, info->Data, info->DataLength ); - driver[ info->DataLength / sizeof(WCHAR) ] = 0; - TRACE("Found driver %s for ID %s.\n", debugstr_w(driver), debugstr_w(id)); - return TRUE; -} - static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) { IO_STATUS_BLOCK irp_status; @@ -309,39 +261,19 @@ static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power return send_device_irp( device, irp, NULL ); } -static void handle_bus_relations( DEVICE_OBJECT *device ) +static void load_function_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA *sp_device ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(servicesW)]; WCHAR driver[MAX_SERVICE_NAME] = {0}; DRIVER_OBJECT *driver_obj; UNICODE_STRING string; - WCHAR *ids, *ptr; NTSTATUS status; - TRACE( "(%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) + if (!SetupDiGetDeviceRegistryPropertyW( set, sp_device, SPDRP_SERVICE, + NULL, (BYTE *)driver, sizeof(driver), NULL )) { - ERR("Failed to get compatible IDs, status %#x.\n", status); - return; - } - - for (ptr = ids; *ptr; ptr += strlenW(ptr) + 1) - { - if (get_driver_for_id( ptr, driver )) - break; - } - ExFreePool( ids ); - - if (!driver[0]) - { - ERR("No matching driver found for device.\n"); + WARN("No driver registered for device %p.\n", device); return; } @@ -373,13 +305,129 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) ObDereferenceObject( driver_obj ); if (status != STATUS_SUCCESS) - { ERR("AddDevice failed for driver %s, status %#x.\n", debugstr_w(driver), status); +} + +/* Return the total number of characters in a REG_MULTI_SZ string, including + * the final terminating null. */ +static size_t sizeof_multiszW( const WCHAR *str ) +{ + const WCHAR *p; + for (p = str; *p; p += strlenW(p) + 1); + return p + 1 - str; +} + +/* This does almost the same thing as UpdateDriverForPlugAndPlayDevices(), + * except that we don't know the INF path beforehand. */ +static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA *sp_device ) +{ + static const DWORD dif_list[] = + { + DIF_REGISTERDEVICE, + DIF_SELECTBESTCOMPATDRV, + DIF_ALLOW_INSTALL, + DIF_INSTALLDEVICEFILES, + DIF_REGISTER_COINSTALLERS, + DIF_INSTALLINTERFACES, + DIF_INSTALLDEVICE, + DIF_NEWDEVICEWIZARD_FINISHINSTALL, + }; + + NTSTATUS status; + unsigned int i; + WCHAR *ids; + + if ((status = get_device_id( device, BusQueryHardwareIDs, &ids )) || !ids) + { + ERR("Failed to get hardware IDs, status %#x.\n", status); + return FALSE; + } + + SetupDiSetDeviceRegistryPropertyW( set, sp_device, SPDRP_HARDWAREID, (BYTE *)ids, + sizeof_multiszW( ids ) * sizeof(WCHAR) ); + ExFreePool( ids ); + + if ((status = get_device_id( device, BusQueryCompatibleIDs, &ids )) || !ids) + { + ERR("Failed to get compatible IDs, status %#x.\n", status); + return FALSE; + } + + SetupDiSetDeviceRegistryPropertyW( set, sp_device, SPDRP_COMPATIBLEIDS, (BYTE *)ids, + sizeof_multiszW( ids ) * sizeof(WCHAR) ); + ExFreePool( ids ); + + if (!SetupDiBuildDriverInfoList( set, sp_device, SPDIT_COMPATDRIVER )) + { + ERR("Failed to build compatible driver list, error %#x.\n", GetLastError()); + return FALSE; + } + + for (i = 0; i < ARRAY_SIZE(dif_list); ++i) + { + if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT) + { + ERR("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); + return FALSE; + } + } + + return TRUE; +} + +static void handle_bus_relations( DEVICE_OBJECT *device ) +{ + static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; + + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + BOOL need_driver = TRUE; + HDEVINFO set; + HKEY key; + + /* 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 */ + + if (get_device_instance_id( device, device_instance_id )) + return; + + set = SetupDiCreateDeviceInfoList( NULL, NULL ); + + if (!SetupDiCreateDeviceInfoW( set, device_instance_id, &GUID_NULL, NULL, NULL, 0, &sp_device ) + && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) + { + ERR("Failed to create or open device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError()); + SetupDiDestroyDeviceInfoList( set ); + return; + } + + TRACE("Creating new device %s.\n", debugstr_w(device_instance_id)); + + /* Check if the device already has a driver registered; if not, find one + * and install it. */ + key = SetupDiOpenDevRegKey( set, &sp_device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ ); + if (key != INVALID_HANDLE_VALUE) + { + if (!RegQueryValueExW( key, infpathW, NULL, NULL, NULL, NULL )) + need_driver = FALSE; + RegCloseKey( key ); + } + + if (need_driver && !install_device_driver( device, set, &sp_device )) + { + SetupDiDestroyDeviceInfoList( set ); return; } - send_pnp_irp( device, IRP_MN_START_DEVICE ); - send_power_irp( device, PowerDeviceD0 ); + load_function_driver( device, set, &sp_device ); + if (device->DriverObject) + { + send_pnp_irp( device, IRP_MN_START_DEVICE ); + send_power_irp( device, PowerDeviceD0 ); + } + + SetupDiDestroyDeviceInfoList( set ); } static void handle_removal_relations( DEVICE_OBJECT *device )

1 0

Zebediah Figura : wine.inf: Remove no longer used CriticalDeviceDatabase entries.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: ca392e65aa568e4b62eb330b4c6c8df4a77ab74a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca392e65aa568e4b62eb330b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 7 11:48:37 2019 -0400 wine.inf: Remove no longer used CriticalDeviceDatabase entries. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e80af7a..7862f42 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -35,7 +35,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - CriticalDevice,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -60,7 +59,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - CriticalDevice,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -87,7 +85,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - CriticalDevice,\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ @@ -472,12 +469,6 @@ HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092 HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" -[CriticalDevice] -HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" -HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\IOHID,"Service",,"WineHID" -HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\LNXEV,"Service",,"WineHID" -HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\SDLJOY,"Service",,"WineHID" - [CurrentVersion] HKCU,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%"

1 0

Zebediah Figura : wine.inf: Remove registration for the winehid service.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: a4cef7479c9667ca6c395b766f6676141ca12b8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4cef7479c9667ca6c395b76… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 7 11:48:38 2019 -0400 wine.inf: Remove registration for the winehid service. This is done through PNP now. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7862f42..844f7c6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -131,7 +131,6 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService -AddService=WineHID,0,WineHIDService AddService=Winmgmt,0,WinmgmtService [DefaultInstall.NT.Services] @@ -148,7 +147,6 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService -AddService=WineHID,0,WineHIDService AddService=Winmgmt,0,WinmgmtService [DefaultInstall.ntamd64.Services] @@ -165,7 +163,6 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService -AddService=WineHID,0,WineHIDService AddService=Winmgmt,0,WinmgmtService [Strings] @@ -3473,15 +3470,6 @@ ServiceType=1 StartType=2 ErrorControl=1 -[WineHIDService] -Description="Wine HID Minidriver" -DisplayName="Wine HID" -ServiceBinary="%12%\winehid.sys" -LoadOrderGroup="WinePlugPlay" -ServiceType=1 -StartType=3 -ErrorControl=1 - [SpoolerService] AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing"

1 0

Zhiyi Zhang : user32/tests: Test restore window messages.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 1caf992be3ccac44aba4bd186ca94b9b7f5b5124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1caf992be3ccac44aba4bd18… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 17:04:48 2019 +0800 user32/tests: Test restore window messages. Mostly to show that there is a WM_ACTIVATE message before WM_SYSCOMMAND SC_RESTORE and after WM_WINDOWPOSCHANGED The Alt+Tab test won't work on non-Windows because the emulated key inputs doesn't reach the host, unless we required user interaction. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f063..a5bc1c5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15345,6 +15345,46 @@ static const struct message NCXBUTTONUPSeq2[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to minimized visible window */ +static const struct message WmRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, TRUE }, + { WM_NCACTIVATE, sent|wparam, TRUE }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, TRUE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_ACTIVATE, sent|wparam, TRUE }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15399,6 +15439,15 @@ static void test_defwinproc(void) GetWindowTextA(hwnd, buffA, ARRAY_SIZE(buffA)); ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + flush_sequence(); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2; @@ -17522,6 +17571,96 @@ static void test_DoubleSetCapture(void) DestroyWindow(hwnd); } +static const struct message WmRestoreMinimizedSeq[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent|wparam, 0x200001 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0x200001 }, /* Note that activate messages are after WM_WINDOWPOSCHANGED and before WM_SYSCOMMAND */ + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { WM_SYSCOMMAND, sent|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|wparam|optional, SC_RESTORE }, + { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|optional }, + { WM_QUERYOPEN, sent|defwinproc }, + { WM_QUERYOPEN, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_ACTIVATE, sent|wparam|defwinproc, 1 }, + { WM_PAINT, sent| optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, + { WM_PAINT, sent| optional }, + { 0 } +}; + +static void test_restore_messages(void) +{ + INPUT ip = {0}; + HWND hwnd; + INT i; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + SetForegroundWindow(hwnd); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + for (i = 0; i < 5; i++) + { + /* Send Alt+Tab to restore test window from minimized state */ + ip.type = INPUT_KEYBOARD; + ip.ki.wVk = VK_MENU; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_MENU; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + flush_events(); + if (!IsIconic(hwnd)) + break; + } + + if (IsIconic(hwnd)) + { + skip("Alt+Tab failed to bring up test window.\n"); + goto done; + } + ok_sequence(WmRestoreMinimizedSeq, "Restore minimized window", TRUE); + +done: + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17646,6 +17785,7 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n");

1 0

Zhiyi Zhang : winex11.drv: Activate window when restoring from iconic state.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 82c6ec3a32f44e8b3e0cc88b7f10e0c0d7fa1b89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c6ec3a32f44e8b3e0cc88b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 17:04:58 2019 +0800 winex11.drv: Activate window when restoring from iconic state. Some games, e.g., Project CARS waits for WM_ACTIVATE when restoring from iconic state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f64..5c465aa 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1266,6 +1266,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; }

1 0

Zhiyi Zhang : winemac.drv: Activate window when restoring from iconic state.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 019f9222a6642327d97647921795bf39d1b7e97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=019f9222a6642327d9764792… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 17:05:05 2019 +0800 winemac.drv: Activate window when restoring from iconic state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b7a0963..605c0c8 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data); + SetActiveWindow(hwnd); SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); return; }

1 0

Józef Kucia : dxgi: Improve tracing in dxgi_adapter_QueryVideoMemoryInfo().
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 937891cc65efa6943f15f3758713439f25489da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=937891cc65efa6943f15f375… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 10 11:56:39 2019 +0200 dxgi: Improve tracing in dxgi_adapter_QueryVideoMemoryInfo(). 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> --- dlls/dxgi/adapter.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 859c24a..d2fc629 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -291,14 +291,18 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterHardwareContentProtectionTe } static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdapter *iface, - UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *memory_info) + UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *info) { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; + static unsigned int once; HRESULT hr; - FIXME("iface %p, node_index %u, segment_group %#x, memory_info %p partial stub!\n", - iface, node_index, segment_group, memory_info); + TRACE("iface %p, node_index %u, segment_group %#x, info %p.\n", + iface, node_index, segment_group, info); + + if (!once++) + FIXME("Returning fake video memory info.\n"); if (node_index) FIXME("Ignoring node index %u.\n", node_index); @@ -313,26 +317,30 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap switch (segment_group) { case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: - memory_info->Budget = adapter_id.video_memory; - memory_info->CurrentUsage = 0; - memory_info->AvailableForReservation = adapter_id.video_memory / 2; - memory_info->CurrentReservation = 0; + info->Budget = adapter_id.video_memory; + info->CurrentUsage = 0; + info->AvailableForReservation = adapter_id.video_memory / 2; + info->CurrentReservation = 0; break; case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: - memset(memory_info, 0, sizeof(*memory_info)); + memset(info, 0, sizeof(*info)); break; default: WARN("Invalid memory segment group %#x.\n", segment_group); return E_INVALIDARG; } + TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", + wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), + wine_dbgstr_longlong(info->AvailableForReservation), wine_dbgstr_longlong(info->CurrentReservation)); + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXGIAdapter *iface, UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, UINT64 reservation) { - FIXME("iface %p, node_index %u, segment_group %#x, reservation %s stub!\n", + FIXME("iface %p, node_index %u, segment_group %#x, reservation 0x%s stub!\n", iface, node_index, segment_group, wine_dbgstr_longlong(reservation)); return S_OK;

1 0