October 2021 - Wine-Commits

Nikolay Sivov : combase: Clarify stream data format used by FT marshaler.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: ecd8fdfb389907f05f4735f70af9172093b12eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecd8fdfb389907f05f4735f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 14:22:56 2021 +0300 combase: Clarify stream data format used by FT marshaler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/marshal.c | 56 ++++++++++++++++------------------------------ dlls/ole32/tests/marshal.c | 8 +++++++ 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 51b4ce24115..f3ea3fcad50 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -271,6 +271,12 @@ static HRESULT WINAPI ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid return S_OK; } +union ftmarshaler_data +{ + UINT64 value; + IUnknown *object; +}; + static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags, DWORD *size) { @@ -283,7 +289,7 @@ static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid copied between the apartments */ if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX) { - *size = sizeof(mshlflags) + sizeof(pv) + sizeof(DWORD) + sizeof(GUID); + *size = sizeof(mshlflags) + sizeof(union ftmarshaler_data) + sizeof(GUID); return S_OK; } @@ -307,30 +313,24 @@ static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *str copied between the apartments */ if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX) { - void *object; - DWORD constant = 0; + union ftmarshaler_data data; GUID unknown_guid = { 0 }; - hr = IUnknown_QueryInterface((IUnknown *)pv, riid, &object); + data.value = 0; + hr = IUnknown_QueryInterface((IUnknown *)pv, riid, (void **)&data.object); if (FAILED(hr)) return hr; /* don't hold a reference to table-weak marshaled interfaces */ if (mshlflags & MSHLFLAGS_TABLEWEAK) - IUnknown_Release((IUnknown *)object); + IUnknown_Release(data.object); hr = IStream_Write(stream, &mshlflags, sizeof(mshlflags), NULL); if (hr != S_OK) return STG_E_MEDIUMFULL; - hr = IStream_Write(stream, &object, sizeof(object), NULL); + hr = IStream_Write(stream, &data, sizeof(data), NULL); if (hr != S_OK) return STG_E_MEDIUMFULL; - if (sizeof(object) == sizeof(DWORD)) - { - hr = IStream_Write(stream, &constant, sizeof(constant), NULL); - if (hr != S_OK) return STG_E_MEDIUMFULL; - } - hr = IStream_Write(stream, &unknown_guid, sizeof(unknown_guid), NULL); if (hr != S_OK) return STG_E_MEDIUMFULL; @@ -346,9 +346,8 @@ static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *str static HRESULT WINAPI ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv) { + union ftmarshaler_data data; DWORD mshlflags; - IUnknown *object; - DWORD constant; GUID unknown_guid; HRESULT hr; @@ -357,32 +356,23 @@ static HRESULT WINAPI ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *s hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL); if (hr != S_OK) return STG_E_READFAULT; - hr = IStream_Read(stream, &object, sizeof(object), NULL); + hr = IStream_Read(stream, &data, sizeof(data), NULL); if (hr != S_OK) return STG_E_READFAULT; - if (sizeof(object) == sizeof(DWORD)) - { - hr = IStream_Read(stream, &constant, sizeof(constant), NULL); - if (hr != S_OK) return STG_E_READFAULT; - if (constant != 0) - FIXME("constant is 0x%x instead of 0\n", constant); - } - hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL); if (hr != S_OK) return STG_E_READFAULT; - hr = IUnknown_QueryInterface(object, riid, ppv); + hr = IUnknown_QueryInterface(data.object, riid, ppv); if (!(mshlflags & (MSHLFLAGS_TABLEWEAK | MSHLFLAGS_TABLESTRONG))) - IUnknown_Release(object); + IUnknown_Release(data.object); return hr; } static HRESULT WINAPI ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *stream) { + union ftmarshaler_data data; DWORD mshlflags; - IUnknown *object; - DWORD constant; GUID unknown_guid; HRESULT hr; @@ -391,21 +381,13 @@ static HRESULT WINAPI ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *s hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL); if (hr != S_OK) return STG_E_READFAULT; - hr = IStream_Read(stream, &object, sizeof(object), NULL); + hr = IStream_Read(stream, &data, sizeof(data), NULL); if (hr != S_OK) return STG_E_READFAULT; - if (sizeof(object) == sizeof(DWORD)) - { - hr = IStream_Read(stream, &constant, sizeof(constant), NULL); - if (hr != S_OK) return STG_E_READFAULT; - if (constant != 0) - FIXME("constant is 0x%x instead of 0\n", constant); - } - hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL); if (hr != S_OK) return STG_E_READFAULT; - IUnknown_Release(object); + IUnknown_Release(data.object); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 891df59c54b..e05ed937df2 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3181,6 +3181,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * static void test_freethreadedmarshaler(void) { + DWORD size, expected_size; HRESULT hr; IUnknown *pFTUnknown; IMarshal *pFTMarshal; @@ -3201,6 +3202,13 @@ static void test_freethreadedmarshaler(void) /* inproc normal marshaling */ + size = 0; + expected_size = sizeof(DWORD) /* flags */ + sizeof(UINT64) + sizeof(GUID); + hr = IMarshal_GetMarshalSizeMax(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_INPROC, + NULL, MSHLFLAGS_NORMAL, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == expected_size, "Unexpected marshal size %u, expected %u.\n", size, expected_size); + hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass);

1 0

Hans Leidekker : secur32/tests: Check supported DTLS protocols.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 5e8acd7a044d09539aa978ff9401575a13a3ebda URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8acd7a044d09539aa978ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:25 2021 +0200 secur32/tests: Check supported DTLS protocols. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index aeb38096f0c..b7f9d409d41 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -203,6 +203,8 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client"); + X(SP_PROT_DTLS1_0_CLIENT, "DTLS 1.0 client"); + X(SP_PROT_DTLS1_2_CLIENT, "DTLS 1.2 client"); #undef X if(protocols.grbitProtocol)

1 0

Alexandre Julliard : configure: Disable gphoto2.ds if the needed Unix libraries are missing.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 929e2a54e3435a13d72b733f0ef20b7dcedd91e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=929e2a54e3435a13d72b733f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:33:30 2021 +0200 configure: Disable gphoto2.ds if the needed Unix libraries are missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++----------- configure.ac | 12 +++++------- dlls/gphoto2.ds/ds_image.c | 18 ------------------ dlls/gphoto2.ds/gphoto2_i.h | 14 +------------- dlls/gphoto2.ds/gphoto2_main.c | 16 +++++----------- dlls/gphoto2.ds/ui.c | 4 ---- include/config.h.in | 3 --- 7 files changed, 16 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=929e2a54e3435a13d72b…

1 0

Alexandre Julliard : gphoto2.ds: Use the bundled libjpeg and build with msvcrt.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 8f70855f88064173bd30ff8be2505d79d6398db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f70855f88064173bd30ff8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:35:12 2021 +0200 gphoto2.ds: Use the bundled libjpeg and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 120 ----------------------------------------- configure.ac | 17 ------ dlls/gphoto2.ds/Makefile.in | 6 +-- dlls/gphoto2.ds/capability.c | 2 - dlls/gphoto2.ds/ds_image.c | 80 +++++---------------------- dlls/gphoto2.ds/gphoto2_i.h | 26 ++------- dlls/gphoto2.ds/gphoto2_main.c | 7 +-- dlls/gphoto2.ds/ui.c | 2 - include/config.h.in | 6 --- 9 files changed, 22 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f70855f88064173bd30…

1 0

Nikolay Sivov : dxva2: Remove AYUV from accepted input formats.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 2095a4132f88d1f6c17be14a43db78c45870b918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2095a4132f88d1f6c17be14a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 15:18:26 2021 +0300 dxva2: Remove AYUV from accepted input formats. It was added for completeness only, and it appears to be not universally support on Windows via regular d3d9 API. DXVA might be using different path to present video frames, but we don't make such distinction at the moment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 3 +-- dlls/dxva2/tests/dxva2.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index f91b033055c..2fab82ff476 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -381,8 +381,7 @@ static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) { return video_desc->Format == D3DFMT_A8R8G8B8 || video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2 || - video_desc->Format == MAKEFOURCC('A','Y','U','V'); + video_desc->Format == D3DFMT_YUY2; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 4b09e93e87a..ab0a2769bd2 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,9 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n"); CoTaskMemFree(guids);

1 0

Nikolay Sivov : evr/mixer: Implement stream rectangle scaling.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 8c0c3d296fc321e7423d801bc14f5a88fbcacee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0c3d296fc321e7423d801b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 15:30:25 2021 +0300 evr/mixer: Implement stream rectangle scaling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 631ee1ba645..30b4ed31b3f 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1245,17 +1245,29 @@ static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int } } +static void video_mixer_normalize_rect(const RECT *full, const RECT *part, MFVideoNormalizedRect *ret) +{ + float width = full->right - full->left; + float height = full->bottom - full->top; + + ret->left = (part->left - full->left) / width; + ret->right = (part->right - full->left) / width; + ret->bottom = (part->bottom - full->top) / height; + ret->top = (part->top - full->top) / height; +} + static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { DXVA2_VideoSample samples[MAX_MIXER_INPUT_STREAMS] = {{ 0 }}; DXVA2_VideoProcessBltParams params = { 0 }; - MFVideoNormalizedRect zoom_rect; + MFVideoNormalizedRect zoom_rect, norm; + unsigned int i, sample_count = 0; + D3DSURFACE_DESC desc, rt_desc; struct input_stream *stream; - D3DSURFACE_DESC desc; HRESULT hr = S_OK; - unsigned int i; + RECT dst; - IDirect3DSurface9_GetDesc(rt, &desc); + IDirect3DSurface9_GetDesc(rt, &rt_desc); if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, sizeof(zoom_rect), NULL))) @@ -1264,10 +1276,13 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) { + RECT stream_dst, stream_vis; + IDirect3DSurface9 *surface; stream = mixer->zorder[i]; @@ -1280,22 +1295,47 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) IDirect3DSurface9_GetDesc(surface, &desc); - samples[i].SampleFormat.SampleFormat = stream->id == 0 ? DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; - samples[i].SrcSurface = surface; - SetRect(&samples[i].SrcRect, 0, 0, desc.Width, desc.Height); - video_mixer_scale_rect(&samples[i].DstRect, desc.Width, desc.Height, &stream->rect); + /* In order to compute source/destination rectangles for each stream: + + * per-stream rectangle is used to get destination rectangle in target coordinates; + * destination per-stream rectangle is clipped with zoom rectangle, applied to target coordinates; + * visible rectangle is scaled back to get source area of the stream that would be visible; + * visible rectangle is scaled back to get destination area in target coordinates for given steam. + + */ + + video_mixer_scale_rect(&stream_dst, rt_desc.Width, rt_desc.Height, &stream->rect); + + /* Part of the stream that's visible after zooming. */ + if (!IntersectRect(&stream_vis, &stream_dst, &dst)) + { + IDirect3DSurface9_Release(surface); + continue; + } + + samples[sample_count].SampleFormat.SampleFormat = stream->id == 0 ? + DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; + samples[sample_count].SrcSurface = surface; + + video_mixer_normalize_rect(&stream_dst, &stream_vis, &norm); + video_mixer_scale_rect(&samples[sample_count].SrcRect, desc.Width, desc.Height, &norm); + + video_mixer_normalize_rect(&dst, &stream_vis, &norm); + video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); + + sample_count++; } if (SUCCEEDED(hr)) { if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, - mixer->input_count, NULL))) + sample_count, NULL))) { WARN("Failed to process samples, hr %#x.\n", hr); } } - for (i = 0; i < mixer->input_count; ++i) + for (i = 0; i < sample_count; ++i) { if (samples[i].SrcSurface) IDirect3DSurface9_Release(samples[i].SrcSurface);

1 0

Rémi Bernon : dinput: Move device data format to struct dinput_device.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: f0cd5c5c3cd29255de10ca41bfdfe81e7cd5da8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0cd5c5c3cd29255de10ca41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 09:40:41 2021 +0200 dinput: Move device data format to struct dinput_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 26 +++++++++++++------------- dlls/dinput/device_private.h | 7 +------ dlls/dinput/joystick_hid.c | 4 ++-- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1eed223f51c..d375229e2c0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -268,7 +268,7 @@ static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *format ) { - DIDATAFORMAT *user_format, *device_format = impl->data_format.wine_df; + DIDATAFORMAT *user_format, *device_format = impl->device_format; DIOBJECTDATAFORMAT *user_obj, *match_obj; DWORD i; @@ -314,7 +314,7 @@ failed: static int id_to_offset( struct dinput_device *impl, int id ) { - DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format = impl->user_format; + DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; DIOBJECTDATAFORMAT *user_obj; if (!user_format) return -1; @@ -338,9 +338,9 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) DWORD instance; int i; - for (i = 0; i < This->data_format.wine_df->dwNumObjs && !found; i++) + for (i = 0; i < This->device_format->dwNumObjs && !found; i++) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( This->device_format, i ); if (byofs && value != odf->dwOfs) continue; if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; @@ -747,8 +747,8 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->data_queue ); /* Free data format */ - free( This->data_format.wine_df->rgodf ); - free( This->data_format.wine_df ); + free( This->device_format->rgodf ); + free( This->device_format ); dinput_device_release_user_format( This ); /* Free action mapping */ @@ -884,7 +884,7 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format = impl->user_format; + DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; @@ -1224,7 +1224,7 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format; + DIDATAFORMAT *device_format = impl->device_format, *user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; BYTE *user_state = data; DIPROPHEADER filter = @@ -1595,7 +1595,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, break; default: devMask = DIGENRE_ANY; - df = impl->data_format.wine_df; + df = impl->device_format; break; } @@ -1684,7 +1684,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D df = &c_dfDIMouse2; break; default: - df = impl->data_format.wine_df; + df = impl->device_format; break; } @@ -1843,7 +1843,7 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; - This->data_format.wine_df = format; + This->device_format = format; InitializeCriticalSection( &This->crit ); This->dinput = dinput; IDirectInput_AddRef( &dinput->IDirectInput7A_iface ); @@ -1871,7 +1871,7 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); - DIDATAFORMAT *format = impl->data_format.wine_df; + DIDATAFORMAT *format = impl->device_format; DIOBJECTDATAFORMAT *obj_format; if (!format->rgodf) @@ -1904,7 +1904,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->data_format.wine_df; + DIDATAFORMAT *format = impl->device_format; ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 190e2c16ffe..e77d0190a48 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -28,11 +28,6 @@ #include "wine/list.h" #include "dinput_private.h" -typedef struct -{ - LPDIDATAFORMAT wine_df; /* wine internal data format */ -} DataFormat; - typedef struct { unsigned int offset; @@ -88,7 +83,7 @@ struct dinput_device BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ DWORD buffersize; /* size of the queue - set in 'SetProperty' */ - DataFormat data_format; /* user data format and wine to user format converter */ + DIDATAFORMAT *device_format; DIDATAFORMAT *user_format; /* Action mapping */ diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 13d71a270b6..d7e64af9928 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1115,7 +1115,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, count, report_len = impl->caps.InputReportByteLength; - DIDATAFORMAT *format = impl->base.data_format.wine_df; + DIDATAFORMAT *format = impl->base.device_format; struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; USAGE_AND_PAGE *usages; @@ -2009,7 +2009,7 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *device_format = impl->base.data_format.wine_df, *user_format = impl->base.user_format; + DIDATAFORMAT *device_format = impl->base.device_format, *user_format = impl->base.user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (!user_format) return DIENUM_CONTINUE;

1 0

Rémi Bernon : dinput: Use user object data format array to keep user offsets.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 621af39c11a6fb24a85a88ac35085d9f860c13cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=621af39c11a6fb24a85a88ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 09:40:39 2021 +0200 dinput: Use user object data format array to keep user offsets. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 231 ++++++++++++++++--------------------------- dlls/dinput/device_private.h | 4 - dlls/dinput/joystick_hid.c | 21 ++-- dlls/dinput8/tests/hid.c | 1 - 4 files changed, 100 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=621af39c11a6fb24a85a…

1 0

Hans Leidekker : secur32: Fix expected buffer size in trace message.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: a2d8fe55977d458782727b60accb5510264e3f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d8fe55977d458782727b60… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:24 2021 +0200 secur32: Fix expected buffer size in trace message. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index eb8106e88c7..885fabfac13 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1003,7 +1003,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(6, record_size), buffer->cbBuffer); + max(ctx->header_size + 1, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } }

1 0

Hans Leidekker : secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW().
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 60474096693b6f0ad0e31c09e57a393c3538f3e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60474096693b6f0ad0e31c09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:28 2021 +0200 secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b1a910a361..895364a3fc7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -880,6 +880,11 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } +static inline BOOL is_dtls_context(const struct schan_context *ctx) +{ + return ctx->header_size == HEADER_SIZE_DTLS; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -985,35 +990,28 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( unsigned char *ptr; if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; - if (pInput) - { - idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); - if (idx == -1) - return SEC_E_INCOMPLETE_MESSAGE; - - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; + if (!pInput) return is_dtls_context(ctx) ? SEC_E_INSUFFICIENT_MEMORY : SEC_E_INCOMPLETE_MESSAGE; + if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; - while (buffer->cbBuffer > expected_size + ctx->header_size) - { - record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; + expected_size = 0; - if (buffer->cbBuffer < expected_size + record_size) - break; + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - expected_size += record_size; - ptr += record_size; - } + if (buffer->cbBuffer < expected_size + record_size) break; + expected_size += record_size; + ptr += record_size; + } - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; - } + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(ctx->header_size + 1, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; } - else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); }

1 0