July 2021 - Wine-Commits - list.winehq.org

Huw Davies : mountmgr.sys: Move dhcp lookup to a worker thread.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 715edfb0b2c42ae79a60300b87eca000c6e59cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715edfb0b2c42ae79a60300b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 6 10:11:47 2021 +0100 mountmgr.sys: Move dhcp lookup to a worker thread. While this is a reasonable change per se, the motivation is to avoid a deadlock when mountmgr.sys calls into iphlpapi and further into nsiproxy.sys via the nsi device. nsiproxy.sys is hosted by the same process as mountmgr.sys so is unable to handle the request while it is also waiting for that same request to return. The correct long-term solution is for mountmgr.sys to call the netio.sys versions of the iphlpapi functions. These will call the kernel-side versions of the nsi functions without going through the nsi device. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 46 +++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 61d51d8e61d..b94944a350c 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -286,32 +286,48 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) } /* implementation of IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS */ -static NTSTATUS query_dhcp_request_params( void *buff, SIZE_T insize, - SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, void *context ) { - struct mountmgr_dhcp_request_params *query = buff; - ULONG i, offset; + IRP *irp = context; + struct mountmgr_dhcp_request_params *query = irp->AssociatedIrp.SystemBuffer; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + SIZE_T insize = irpsp->Parameters.DeviceIoControl.InputBufferLength; + SIZE_T outsize = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + ULONG i, offset = 0; /* sanity checks */ if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize || - !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) return STATUS_INVALID_PARAMETER; + !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + goto err; + } + for (i = 0; i < query->count; i++) - if (query->params[i].offset + query->params[i].size > insize) return STATUS_INVALID_PARAMETER; + if (query->params[i].offset + query->params[i].size > insize) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + goto err; + } + offset = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]); for (i = 0; i < query->count; i++) { - offset += get_dhcp_request_param( query->adapter, &query->params[i], buff, offset, outsize - offset ); + offset += get_dhcp_request_param( query->adapter, &query->params[i], (char *)query, offset, outsize - offset ); if (offset > outsize) { if (offset >= sizeof(query->size)) query->size = offset; - iosb->Information = sizeof(query->size); - return STATUS_MORE_ENTRIES; + offset = sizeof(query->size); + irp->IoStatus.u.Status = STATUS_MORE_ENTRIES; + goto err; } } + irp->IoStatus.u.Status = STATUS_SUCCESS; - iosb->Information = offset; - return STATUS_SUCCESS; +err: + irp->IoStatus.Information = offset; + IoCompleteRequest( irp, IO_NO_INCREMENT ); } /* implementation of Wine extension to use host APIs to find symbol file by GUID */ @@ -929,10 +945,10 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_INVALID_PARAMETER; break; } - status = query_dhcp_request_params( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + + if (TrySubmitThreadpoolCallback( query_dhcp_request_params, irp, NULL )) + return (irp->IoStatus.u.Status = STATUS_PENDING); + status = STATUS_NO_MEMORY; break; #ifdef __APPLE__ case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE:

1 0

Huw Davies : iphlpapi: Implement ConvertInterfaceIndexToLuid() on top of nsi.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: a124b765b1377fea8a2fe88dc1ae191c8bf83b3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a124b765b1377fea8a2fe88d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 6 10:11:48 2021 +0100 iphlpapi: Implement ConvertInterfaceIndexToLuid() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3a2227f5ebb..3db17289bf4 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi -IMPORTS = advapi32 +IMPORTS = advapi32 nsi uuid EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6b96165027..05f3c3b9b76 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -56,7 +56,9 @@ #include "netioapi.h" #include "tcpestats.h" #include "ip2string.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3183,20 +3185,16 @@ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) { - MIB_IFROW row; + DWORD err; - TRACE("(%u %p)\n", index, luid); + TRACE( "(%u %p)\n", index, luid ); if (!luid) return ERROR_INVALID_PARAMETER; - memset( luid, 0, sizeof(*luid) ); - - row.dwIndex = index; - if (GetIfEntry( &row )) return ERROR_FILE_NOT_FOUND; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, luid, sizeof(*luid), 0 ); + if (err) luid->Value = 0; + return err; } /******************************************************************

1 0

Huw Davies : iphlpapi/tests: Run the interface conversion tests on all interfaces.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: e4e70f6755915dffdc8d6c0a60072572d14c5fcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e70f6755915dffdc8d6c0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 6 10:11:52 2021 +0100 iphlpapi/tests: Run the interface conversion tests on all interfaces. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 341 ++++++++++++++++++----------------------- 1 file changed, 153 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e70f6755915dffdc8d…

1 0

Rémi Bernon : hidclass.sys: Return error on invalid read buffer size.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 5a62d0dbca08688e6b08c7209e79eb698846f22f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a62d0dbca08688e6b08c720… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 6 11:00:52 2021 +0200 hidclass.sys: Return error on invalid read buffer size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 5dd4aadb899..da1814587c7 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -597,6 +597,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); NTSTATUS rc = STATUS_SUCCESS; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); @@ -615,6 +616,13 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) return STATUS_DELETE_PENDING; } + if (irpsp->Parameters.Read.Length < data->caps.InputReportByteLength) + { + irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_INVALID_BUFFER_SIZE; + } + packet = malloc(buffer_size); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext );

1 0

Giovanni Mascellani : winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for audio types.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: a9db6c050d6e98924b0cbc7fe08ff8d22ac0051e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9db6c050d6e98924b0cbc7f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 2 17:33:06 2021 +0200 winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for audio types. The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_ALL_SAMPLES_INDEPENDENT attribute to audio streams (similarly to what is already done for video streams), which is for example requested by The Medium. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index dfa448afcfe..dcbd03137ba 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -568,6 +568,7 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, format->u.audio.rate); IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); + IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); return type; }

1 0

Giovanni Mascellani : mf/sar: Allow requesting more than a sample per period.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: adffa11609093c3c21cf43970bbecda1b2c43eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adffa11609093c3c21cf4397… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 28 11:06:44 2021 +0200 mf/sar: Allow requesting more than a sample per period. The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, so it is critical that the SAR is able to process more than a sample per period. This is not currently the case: a new sample is requested only in audio_renderer_render, which is executed (at most) once per period. This results in the SAR not being able to keep up with the audio client, and eventually underrunning. With this patch the SAR keeps a count of how many frames are currently queued, and a new sample is immediately requested if the internal queue has less than a buffer worth of frames. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..e35531acb71 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -101,6 +101,8 @@ struct audio_renderer HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; + unsigned int queued_frames; + unsigned int max_frames; struct list queue; enum stream_state state; unsigned int flags; @@ -234,6 +236,7 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { release_pending_object(obj); } + renderer->queued_frames = 0; renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -1330,6 +1333,13 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *sample) { struct queued_object *object; + DWORD sample_len, sample_frames; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetTotalLength(sample, &sample_len))) + return hr; + + sample_frames = sample_len / renderer->frame_size; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1339,6 +1349,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s IMFSample_AddRef(object->u.sample.sample); list_add_tail(&renderer->queue, &object->entry); + renderer->queued_frames += sample_frames; return S_OK; } @@ -1357,9 +1368,17 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, return MF_E_STREAMSINK_REMOVED; EnterCriticalSection(&renderer->cs); + if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); renderer->flags &= ~SAR_SAMPLE_REQUESTED; + + if (renderer->queued_frames < renderer->max_frames && renderer->state == STREAM_STATE_RUNNING) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_SAMPLE_REQUESTED; + } + LeaveCriticalSection(&renderer->cs); return hr; @@ -1428,6 +1447,7 @@ static HRESULT WINAPI audio_renderer_stream_Flush(IMFStreamSink *iface) release_pending_object(obj); } } + renderer->queued_frames = 0; LeaveCriticalSection(&renderer->cs); return hr; @@ -1576,6 +1596,12 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetBufferSize(renderer->audio_client, &renderer->max_frames))) + { + WARN("Failed to get buffer size, hr %#x.\n", hr); + return hr; + } + if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, &renderer->render_callback, NULL, &result))) { if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) @@ -1789,6 +1815,7 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); obj->u.sample.frame_offset += dst_frames; + renderer->queued_frames -= dst_frames; } keep_sample = FAILED(hr) || src_frames > max_frames;

1 0

Rémi Bernon : hidclass.sys: Return error on invalid write buffer size.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 881b2d658352eec7cc9fcdd85ce8222ad1962d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881b2d658352eec7cc9fcdd8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 6 11:00:50 2021 +0200 hidclass.sys: Return error on invalid write buffer size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d3f5fa90fc7..5dd4aadb899 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -703,6 +703,20 @@ NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) return STATUS_DELETE_PENDING; } + if (!irpsp->Parameters.Write.Length) + { + irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return irp->IoStatus.Status; + } + + if (irpsp->Parameters.Write.Length < data->caps.OutputReportByteLength) + { + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return irp->IoStatus.Status; + } + irp->IoStatus.Information = 0; TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.Write.Length, irp->AssociatedIrp.SystemBuffer);

1 0

Alex Henrie : api-ms-win-core-featurestaging-l1-1-0: Add DLL.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 78dd8404c4a8393331a0d16461d9bc252b96a266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78dd8404c4a8393331a0d164… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jul 2 00:53:27 2021 -0600 api-ms-win-core-featurestaging-l1-1-0: Add DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51329 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-featurestaging-l1-1-0.spec | 5 +++++ tools/make_specfiles | 4 ++++ 5 files changed, 13 insertions(+) diff --git a/configure b/configure index f9dce332f63..27a33234eb7 100755 --- a/configure +++ b/configure @@ -948,6 +948,7 @@ enable_api_ms_win_core_errorhandling_l1_1_0 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_2 enable_api_ms_win_core_errorhandling_l1_1_3 +enable_api_ms_win_core_featurestaging_l1_1_0 enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_ansi_l2_1_0 @@ -20096,6 +20097,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_win_core_errorhandling_l1_1_2 wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-3 enable_api_ms_win_core_errorhandling_l1_1_3 +wine_fn_config_makefile dlls/api-ms-win-core-featurestaging-l1-1-0 enable_api_ms_win_core_featurestaging_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-file-ansi-l2-1-0 enable_api_ms_win_core_file_ansi_l2_1_0 diff --git a/configure.ac b/configure.ac index 1d0f09ad7e1..b889947b65b 100644 --- a/configure.ac +++ b/configure.ac @@ -2768,6 +2768,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-featurestaging-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-ansi-l2-1-0) diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in b/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in new file mode 100644 index 00000000000..cb2eb1c8d56 --- /dev/null +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-featurestaging-l1-1-0.dll diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec new file mode 100644 index 00000000000..ab5127b7dfd --- /dev/null +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub GetFeatureEnabledState +@ stub RecordFeatureError +@ stub RecordFeatureUsage +@ stub SubscribeFeatureStateChangeNotification +@ stub UnsubscribeFeatureStateChangeNotification diff --git a/tools/make_specfiles b/tools/make_specfiles index e6a831025c6..d782beb27d7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -355,6 +355,10 @@ my @dll_groups = "secur32", "sspicli", ], + [ + "shcore", + "api-ms-win-core-featurestaging-l1-1-0", + ], [ "shcore", "shell32",

1 0

Eric Pouech : dbghelp/tests: Try to fix failure in current dbghelp tests.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: beb13143072eee47a2a718e1b275b0f0e20e4cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb13143072eee47a2a718e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 2 10:49:10 2021 +0200 dbghelp/tests: Try to fix failure in current dbghelp tests. Testbot failures in previous SymGetTypeFromName patch have nothing to do with that former patch. Trying to address errouneous test. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 214adb7b16b..a243d047d18 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -106,7 +106,7 @@ static void test_stack_walk(void) addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; - if (addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) + if (!found_our_frame && addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) { found_our_frame = TRUE;

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some IOCTL_HID_READ_REPORT tests.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: f24c8c75fe11fc4b928d3ec45e71ea7dde577136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f24c8c75fe11fc4b928d3ec4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 6 11:00:53 2021 +0200 ntoskrnl.exe/tests: Add some IOCTL_HID_READ_REPORT tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9990b18aa67..1eab88311ab 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1676,7 +1676,7 @@ static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void return ret; } -static void test_hidp(HANDLE file, int report_id) +static void test_hidp(HANDLE file, int report_id, BOOL polled) { const HIDP_CAPS expect_hidp_caps[] = { @@ -2674,6 +2674,27 @@ static void test_hidp(HANDLE file, int report_id) } + memset(report, 0xcd, sizeof(report)); + SetLastError(0xdeadbeef); + ret = ReadFile(file, report, 0, &value, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "ReadFile failed, last error %u\n", GetLastError()); + ok(value == 0, "ReadFile returned %x\n", value); + SetLastError(0xdeadbeef); + ret = ReadFile(file, report, caps.InputReportByteLength - 1, &value, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "ReadFile failed, last error %u\n", GetLastError()); + ok(value == 0, "ReadFile returned %x\n", value); + + if (polled) + { + memset(report, 0xcd, sizeof(report)); + SetLastError(0xdeadbeef); + ret = ReadFile(file, report, caps.InputReportByteLength, &value, NULL); + todo_wine ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + todo_wine ok(value == (report_id ? 3 : 4), "ReadFile returned %x\n", value); + todo_wine ok(report[0] == report_id, "unexpected report data\n"); + } + + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); } @@ -2725,7 +2746,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - test_hidp(file, report_id); + test_hidp(file, report_id, polled); CloseHandle(file);

1 0