September 2016 - Wine-Devel

Re: [PATCH v4] ntoskrnl.exe: Send PnP and Power IRPs to plug and play devices

by Sebastian Lackner

On 14.09.2016 20:58, Aric Stewart wrote: > v2: use same helper function as get_device_id > Suggestions from Sebastian Lackner > v3: shift code to ntoskrnl.c > v4: Suggestions from Sebastian Lackner > > The drivers AddDevice function will be well behaved and call > IoAttachDeviceToDeviceStack. The Plug and Play manager will then > proceed to call IRP_MN_START_DEVICE on the top device of the device > stack. Then a IRP_MJ_POWER/IRP_MN_SET_POWER to PowerDeviceD0. > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > > > v4-0001-ntoskrnl.exe-Send-PnP-and-Power-IRPs-to-plug-and-pl.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index aebb3de..6c4c984 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -2927,6 +2927,42 @@ static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) > } > > > +static NTSTATUS send_pnp_irp( DEVICE_OBJECT *device, UCHAR minor ) > +{ > + IO_STACK_LOCATION *irpsp; > + IO_STATUS_BLOCK irp_status; Did you forget to declare irp here and in the function below? > + > + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) > + return STATUS_NO_MEMORY; > + > + irpsp = IoGetNextIrpStackLocation( irp ); > + irpsp->MinorFunction = minor; > + > + irpsp->Parameters.StartDevice.AllocatedResources = NULL; > + irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; > + > + return send_device_irp( device, irp, NULL ); > +} > + > + > +static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) > +{ > + IO_STATUS_BLOCK irp_status; > + IO_STACK_LOCATION *irpsp; > + > + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status ))) > + return STATUS_NO_MEMORY; > + > + irpsp = IoGetNextIrpStackLocation( irp ); > + irpsp->MinorFunction = IRP_MN_SET_POWER; > + > + irpsp->Parameters.Power.Type = DevicePowerState; > + irpsp->Parameters.Power.State.DeviceState = power; > + > + return send_device_irp( device, irp, NULL ); > +} > + > + > static void handle_bus_relations( DEVICE_OBJECT *device ) > { > static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > @@ -2990,7 +3026,13 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) > ObDereferenceObject( driver_obj ); > > if (status != STATUS_SUCCESS) > + { > ERR_(plugplay)( "AddDevice failed for driver %s\n", debugstr_w(driver) ); > + return; > + } > + > + send_pnp_irp( device, IRP_MN_START_DEVICE ); > + send_power_irp( device, PowerDeviceD0 ); > } > > > > >

Sept. 15, 2016

Re: [PATCH v2] ntoskrnl.exe: Implement DevicePropertyEnumeratorName for IoGetDeviceProperty

by Sebastian Lackner

On 14.09.2016 18:06, Aric Stewart wrote: > v2: Cleanup and resend > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > > > v2-0001-ntoskrnl.exe-Implement-DevicePropertyEnumeratorName.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index aebb3de..d1b0ee9 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -94,6 +94,8 @@ struct wine_driver > DRIVER_EXTENSION driver_extension; > }; > > +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); > + > static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) > { > const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); > @@ -1132,6 +1134,34 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP > property_buffer, result_length ); > switch (device_property) > { > + case DevicePropertyEnumeratorName: > + { > + DWORD len; > + WCHAR *id, *ptr; > + status = get_device_id( device, BusQueryInstanceID, &id ); > + if (status != STATUS_SUCCESS) > + { > + ERR( "Failed to get device id\n" ); > + break; > + } > + struprW( id ); > + TRACE( "Device ID %s\n",debugstr_w( id ) ); I am not sure if the TRACE is very useful here. Its not the value returned by get_device_id() and not the result returned by this function. Does it really make sense to dump this intermediate value here? > + ptr = strchrW( id, '\\' ); > + if (ptr) > + len = (ptr - id); It would be easier to replace the '\\' with a null character, and then always use strlenW() to get the length. This also allows to simplify the code below. > + else > + len = strlenW( id ); > + *result_length = sizeof( WCHAR ) * (len + 1); > + if (buffer_length < *result_length) > + { > + status = STATUS_BUFFER_TOO_SMALL; You are leaking the id buffer here and in the return path below. > + break; > + } > + > + lstrcpynW( property_buffer, id, len + 1 ); > + ((WCHAR*)property_buffer)[len] = 0; When the string is properly null terminated you could just use memcpy() here and copy *result_length bytes. > + break; > + } > case DevicePropertyPhysicalDeviceObjectName: > { > ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION); > > >

Sept. 15, 2016

Re: [1/4] gdiplus: Add FIXME for EMF records we need to implement.

by Vincent Povirk

Please don't commit this for now. I did some testing today that suggests GdipPlayMetafileRecord is the wrong place to handle this.

Sept. 14, 2016

Re: ucrtbase: Add __std_type_info_hash implementation

by Huw Davies

Hi Piotr, On Wed, Sep 14, 2016 at 03:23:04PM +0200, Piotr Caban wrote: > +/****************************************************************** > + * __std_type_info_hash (UCRTBASE.@) > + * > + * TODO: 64-bit version of the function uses different constatns typo: 'constatns'. Huw.

Sept. 14, 2016

Re: winmm/tests: Remove a test that can crash on Win 8 and 10.

by Huw Davies

On 13 Sep 2016, at 19:06, Marvin <testbot(a)winehq.org> wrote: > > Hi, > > While running your changed tests on Windows, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > Full results can be found at > https://testbot.winehq.org/JobDetails.pl?Key=25794 > > Your paranoid android. > > > === w8 (32 bit mci) === > mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) > > === w864 (32 bit mci) === > mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) > > === w1064 (32 bit mci) === > mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) > > === w864 (64 bit mci) === > mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) > > === w1064 (64 bit mci) === > mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) These are fixed by my other patch. Huw.

Sept. 14, 2016

Re: [PATCH 1/5] d3dx11: Copied functions and defines from d3dx_36 related to texture loading

by Fabian Maurer

> I don't think this is acceptable. It should be done in a way that > doesn't introduce mess like this. I split the patches but I didn't know how to do it . For not breaking compilation, I added these temporary defines. The later patch removes those again.

Sept. 13, 2016

Re: [PATCH 4/5] d3dx11: Implemented D3DX11CreateShaderResourceViewFromFileW

by Nikolay Sivov

On 13.09.2016 23:11, Fabian Maurer wrote: > +HRESULT WINAPI D3DX11CreateShaderResourceViewFromFileW(ID3D11Device *iface, > + WCHAR *filename, D3DX11_IMAGE_LOAD_INFO *load_info_original, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult) > +{ > + D3DX11_IMAGE_LOAD_INFO load_info; > + D3D11_SHADER_RESOURCE_VIEW_DESC desc_view; > + D3D11_TEXTURE2D_DESC desc_texture; > + D3D11_SUBRESOURCE_DATA data_texture; > + ID3D11Texture2D *texture; > + enum wined3d_format_id dst_format; > + UINT dst_pitch; > + D3DXIMAGE_INFO image_info; > + void *file_buffer = NULL; > + DWORD file_size; > + void *image_data = NULL; > + RECT rectSize; > + HRESULT hr; > + > + TRACE("iface %p, filename %s, load_info_original %p, pump %p, view %p, hresult %p.\n", > + iface, debugstr_w(filename), load_info_original, pump, view, hresult); > + > + if (pump) > + FIXME("Unimplemented ID3DX11ThreadPump handling.\n"); Personally I think this function should use D3DX11CreateAsyncFileLoaderW() and D3DX11CreateAsyncShaderResourceViewProcessor() internally, for both async and synchronous cases. This will make support for a thread pump trivial, and will consolidate things like map_view_of_file() in one place.

Sept. 13, 2016

Re: [PATCH 1/5] d3dx11: Copied functions and defines from d3dx_36 related to texture loading

by Nikolay Sivov

On 13.09.2016 23:11, Fabian Maurer wrote: > +/* temporary defines to not break compilation */ > + > +#define IDirect3DSurface9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) > +#define IDirect3DSurface9_LockRect(p,a,b,c) (p)->lpVtbl->LockRect(p,a,b,c) > +#define IDirect3DSurface9_UnlockRect(p) (p)->lpVtbl->UnlockRect(p) > + ... > +#define INTERFACE IDirect3DSurface9 > +DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) I don't think this is acceptable. It should be done in a way that doesn't introduce mess like this.

Sept. 13, 2016

Re: [PATCH] Moved wined3dformat <-> dxgi_format conversion functions into wined3d

by Fabian Maurer

> Fabian, if you want to send patches for > D3DX11CreateShaderResourceViewFromFileW "duplicating" the relevant > code for the time being, that is fine to me. It might even be easier > to decide how to share the code at that point. Thanks, I sent the patches to the patches mailing list, I hope that's fine. I split them a bit so it's more visible which part I changed, it's really a lot copy&paste. You probably need to apply all patches at once, since they don't make much sense each on their own, but it shouldn't break compilation even if you just apply one. Also, if you want something to test it with, I implemented it for the samples from http://www.rastertek.com/dx11tut05.html. Currently still needs native d3dcompiler to work though. I'd be happy to hear some feedback, especially since it's a fairly big set of patches.

Sept. 13, 2016

Re: winmm/tests: Remove a test that can crash on Win 8 and 10.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25794 Your paranoid android. === w8 (32 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w864 (32 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (32 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w864 (64 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (64 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close)

Sept. 13, 2016