June 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : winegstreamer: Move stream length query to BeginCreateObject.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 6942d7a035bc3a94c2270a23462289a95bb014d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6942d7a035bc3a94c2270a23462289… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:42:43 2023 +0200 winegstreamer: Move stream length query to BeginCreateObject. --- dlls/winegstreamer/media_source.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index ca1c9c445f4..010f6d27b94 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -34,6 +34,7 @@ struct object_context IMFAsyncResult *result; IMFByteStream *stream; + UINT64 file_size; WCHAR *url; }; @@ -94,7 +95,7 @@ static const IUnknownVtbl object_context_vtbl = }; static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const WCHAR *url, - IMFAsyncResult *result, IUnknown **out) + QWORD file_size, IMFAsyncResult *result, IUnknown **out) { WCHAR *tmp_url = url ? wcsdup(url) : NULL; struct object_context *context; @@ -109,6 +110,7 @@ static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const W context->refcount = 1; context->stream = stream; IMFByteStream_AddRef(context->stream); + context->file_size = file_size; context->url = tmp_url; context->result = result; IMFAsyncResult_AddRef(context->result); @@ -181,6 +183,7 @@ struct media_source CRITICAL_SECTION cs; struct wg_parser *wg_parser; + UINT64 file_size; UINT64 duration; IMFStreamDescriptor **descriptors; @@ -1615,16 +1618,9 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc unsigned int stream_count = UINT_MAX; struct media_source *object; struct wg_parser *parser; - QWORD file_size; unsigned int i; HRESULT hr; - if (FAILED(hr = IMFByteStream_GetLength(context->stream, &file_size))) - { - FIXME("Failed to get byte stream length, hr %#lx.\n", hr); - return hr; - } - if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1636,6 +1632,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc object->ref = 1; object->byte_stream = context->stream; IMFByteStream_AddRef(context->stream); + object->file_size = context->file_size; object->rate = 1.0f; InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -1663,7 +1660,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc object->state = SOURCE_OPENING; - if (FAILED(hr = wg_parser_connect(parser, file_size))) + if (FAILED(hr = wg_parser_connect(parser, object->file_size))) goto fail; stream_count = wg_parser_get_stream_count(parser); @@ -1859,6 +1856,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); IMFAsyncResult *result; IUnknown *context; + QWORD file_size; HRESULT hr; DWORD caps; @@ -1879,11 +1877,15 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa FIXME("Non-seekable bytestreams not supported.\n"); return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (FAILED(hr = IMFByteStream_GetLength(stream, &file_size))) + { + FIXME("Failed to get byte stream length, hr %#lx.\n", hr); + return hr; + } if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; - - if (FAILED(hr = object_context_create(flags, stream, url, result, &context))) + if (FAILED(hr = object_context_create(flags, stream, url, file_size, result, &context))) { IMFAsyncResult_Release(result); return hr;

1 0

Rémi Bernon : winegstreamer: Move byte stream caps checks to BeginCreateObject.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 5b1a2014a1dc21734bbfe5c901fe2226b6974c01 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b1a2014a1dc21734bbfe5c901fe22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:40:15 2023 +0200 winegstreamer: Move byte stream caps checks to BeginCreateObject. --- dlls/winegstreamer/media_source.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3ba305b897a..ca1c9c445f4 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1615,20 +1615,10 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc unsigned int stream_count = UINT_MAX; struct media_source *object; struct wg_parser *parser; - DWORD bytestream_caps; QWORD file_size; unsigned int i; HRESULT hr; - if (FAILED(hr = IMFByteStream_GetCapabilities(context->stream, &bytestream_caps))) - return hr; - - if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) - { - FIXME("Non-seekable bytestreams not supported.\n"); - return MF_E_BYTESTREAM_NOT_SEEKABLE; - } - if (FAILED(hr = IMFByteStream_GetLength(context->stream, &file_size))) { FIXME("Failed to get byte stream length, hr %#lx.\n", hr); @@ -1870,6 +1860,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa IMFAsyncResult *result; IUnknown *context; HRESULT hr; + DWORD caps; TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); @@ -1881,6 +1872,14 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (flags != MF_RESOLUTION_MEDIASOURCE) FIXME("Unimplemented flags %#lx\n", flags); + if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) + return hr; + if (!(caps & MFBYTESTREAM_IS_SEEKABLE)) + { + FIXME("Non-seekable bytestreams not supported.\n"); + return MF_E_BYTESTREAM_NOT_SEEKABLE; + } + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr;

1 0

Rémi Bernon : winegstreamer: Pass the object context to media_source_create.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 9258d7abe8a47945cb9c45e9958e04f78721e2b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9258d7abe8a47945cb9c45e9958e04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:39:04 2023 +0200 winegstreamer: Pass the object context to media_source_create. --- dlls/winegstreamer/media_source.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a6c48b7e297..3ba305b897a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1610,7 +1610,7 @@ static void media_source_init_descriptors(struct media_source *source) } } -static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **out) +static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out) { unsigned int stream_count = UINT_MAX; struct media_source *object; @@ -1620,7 +1620,7 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o unsigned int i; HRESULT hr; - if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + if (FAILED(hr = IMFByteStream_GetCapabilities(context->stream, &bytestream_caps))) return hr; if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) @@ -1629,7 +1629,7 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o return MF_E_BYTESTREAM_NOT_SEEKABLE; } - if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size))) + if (FAILED(hr = IMFByteStream_GetLength(context->stream, &file_size))) { FIXME("Failed to get byte stream length, hr %#lx.\n", hr); return hr; @@ -1644,8 +1644,8 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o object->IMFRateControl_iface.lpVtbl = &media_source_rate_control_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; - object->byte_stream = bytestream; - IMFByteStream_AddRef(bytestream); + object->byte_stream = context->stream; + IMFByteStream_AddRef(context->stream); object->rate = 1.0f; InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -2003,7 +2003,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM if (!state || !(context = impl_from_IUnknown(state))) return E_INVALIDARG; - if (FAILED(hr = media_source_create(context->stream, (IMFMediaSource **)&object))) + if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object))) WARN("Failed to create media source, hr %#lx\n", hr); else {

1 0

Rémi Bernon : winegstreamer: Move struct object_context around.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 70daeb5280a5ea70b8a78842ab9a5ad6a20f6545 URL: https://gitlab.winehq.org/wine/wine/-/commit/70daeb5280a5ea70b8a78842ab9a5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:32:50 2023 +0200 winegstreamer: Move struct object_context around. --- dlls/winegstreamer/media_source.c | 138 +++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 55b1cd6e98d..ef359dff8c9 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -27,6 +27,72 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +struct object_context +{ + IUnknown IUnknown_iface; + LONG refcount; + + IMFAsyncResult *result; + IMFByteStream *stream; + WCHAR *url; +}; + +static struct object_context *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct object_context, IUnknown_iface); +} + +static HRESULT WINAPI object_context_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI object_context_AddRef(IUnknown *iface) +{ + struct object_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&context->refcount); + + TRACE("%p, refcount %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI object_context_Release(IUnknown *iface) +{ + struct object_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&context->refcount); + + TRACE("%p, refcount %lu.\n", iface, refcount); + + if (!refcount) + { + IMFAsyncResult_Release(context->result); + IMFByteStream_Release(context->stream); + free(context->url); + free(context); + } + + return refcount; +} + +static const IUnknownVtbl object_context_vtbl = +{ + object_context_QueryInterface, + object_context_AddRef, + object_context_Release, +}; + struct media_stream { IMFMediaStream IMFMediaStream_iface; @@ -1773,77 +1839,11 @@ static ULONG WINAPI stream_handler_Release(IMFByteStreamHandler *iface) return refcount; } -struct create_object_context -{ - IUnknown IUnknown_iface; - LONG refcount; - - IMFAsyncResult *result; - IMFByteStream *stream; - WCHAR *url; -}; - -static struct create_object_context *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, struct create_object_context, IUnknown_iface); -} - -static HRESULT WINAPI create_object_context_QueryInterface(IUnknown *iface, REFIID riid, void **obj) -{ - TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - - if (IsEqualIID(riid, &IID_IUnknown)) - { - *obj = iface; - IUnknown_AddRef(iface); - return S_OK; - } - - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI create_object_context_AddRef(IUnknown *iface) -{ - struct create_object_context *context = impl_from_IUnknown(iface); - ULONG refcount = InterlockedIncrement(&context->refcount); - - TRACE("%p, refcount %lu.\n", iface, refcount); - - return refcount; -} - -static ULONG WINAPI create_object_context_Release(IUnknown *iface) -{ - struct create_object_context *context = impl_from_IUnknown(iface); - ULONG refcount = InterlockedDecrement(&context->refcount); - - TRACE("%p, refcount %lu.\n", iface, refcount); - - if (!refcount) - { - IMFAsyncResult_Release(context->result); - IMFByteStream_Release(context->stream); - free(context->url); - free(context); - } - - return refcount; -} - -static const IUnknownVtbl create_object_context_vtbl = -{ - create_object_context_QueryInterface, - create_object_context_AddRef, - create_object_context_Release, -}; - static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *iface, IMFByteStream *stream, const WCHAR *url, DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) { struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); - struct create_object_context *context; + struct object_context *context; IMFAsyncResult *result; HRESULT hr; @@ -1866,7 +1866,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa return E_OUTOFMEMORY; } - context->IUnknown_iface.lpVtbl = &create_object_context_vtbl; + context->IUnknown_iface.lpVtbl = &object_context_vtbl; context->refcount = 1; context->stream = stream; IMFByteStream_AddRef(context->stream); @@ -1981,7 +1981,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); IUnknown *object, *state = IMFAsyncResult_GetStateNoAddRef(result); - struct create_object_context *context; + struct object_context *context; struct result_entry *entry; HRESULT hr;

1 0

Rémi Bernon : winegstreamer: Use a helper to create object_context.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: cea4c8469d2a68c93c53ce3f403c93f022abf204 URL: https://gitlab.winehq.org/wine/wine/-/commit/cea4c8469d2a68c93c53ce3f403c93… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:33:56 2023 +0200 winegstreamer: Use a helper to create object_context. --- dlls/winegstreamer/media_source.c | 43 ++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index ef359dff8c9..a6c48b7e297 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -93,6 +93,30 @@ static const IUnknownVtbl object_context_vtbl = object_context_Release, }; +static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const WCHAR *url, + IMFAsyncResult *result, IUnknown **out) +{ + WCHAR *tmp_url = url ? wcsdup(url) : NULL; + struct object_context *context; + + if (!(context = calloc(1, sizeof(*context)))) + { + free(tmp_url); + return E_OUTOFMEMORY; + } + + context->IUnknown_iface.lpVtbl = &object_context_vtbl; + context->refcount = 1; + context->stream = stream; + IMFByteStream_AddRef(context->stream); + context->url = tmp_url; + context->result = result; + IMFAsyncResult_AddRef(context->result); + + *out = &context->IUnknown_iface; + return S_OK; +} + struct media_stream { IMFMediaStream IMFMediaStream_iface; @@ -1843,8 +1867,8 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) { struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); - struct object_context *context; IMFAsyncResult *result; + IUnknown *context; HRESULT hr; TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); @@ -1860,23 +1884,14 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; - if (!(context = calloc(1, sizeof(*context)))) + if (FAILED(hr = object_context_create(flags, stream, url, result, &context))) { IMFAsyncResult_Release(result); - return E_OUTOFMEMORY; + return hr; } - context->IUnknown_iface.lpVtbl = &object_context_vtbl; - context->refcount = 1; - context->stream = stream; - IMFByteStream_AddRef(context->stream); - context->result = result; - IMFAsyncResult_AddRef(context->result); - if (url) - context->url = wcsdup(url); - - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, &handler->IMFAsyncCallback_iface, &context->IUnknown_iface); - IUnknown_Release(&context->IUnknown_iface); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, &handler->IMFAsyncCallback_iface, context); + IUnknown_Release(context); if (SUCCEEDED(hr) && cancel_cookie) {

1 0

Zebediah Figura : wined3d: Recreate swapchain textures in wined3d_swapchain_resize_buffers().
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: ebaa0a9426864cfa6e36955f26ff4c66c1d5af76 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebaa0a9426864cfa6e36955f26ff4c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 27 13:05:49 2022 -0600 wined3d: Recreate swapchain textures in wined3d_swapchain_resize_buffers(). Instead of using wined3d_texture_update_desc(). This is safe, because: * ddraw never exposes wined3d textures directly, and always retrieves them directly from wined3d when rendering. * d3d8 and d3d9 (non-extended) will only resize buffers during a reset, and resetting is forbidden if the application holds any references to the backbuffers. RTVs are also replaced during a reset, so there is no concern about retrieving the old RTVs from the device state. * d3d9ex allows resetting while holding references to the backbuffers, but tests (fixed by this patch) show that the backbuffers should in fact be recreated. * dxgi forbids holding references to back buffers during ResizeBuffers(), including indirect references via command lists or device contexts. --- dlls/d3d8/device.c | 23 ++++++++++++-- dlls/d3d9/device.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/tests/d3d9ex.c | 19 +++++------- dlls/dxgi/swapchain.c | 15 ++++++++-- dlls/wined3d/swapchain.c | 32 +++++++++++++------- 5 files changed, 137 insertions(+), 30 deletions(-)

1 0

Zebediah Figura : wined3d: Factor out a swapchain_create_texture() helper.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 037be380b260116305566f31ccf81b5e6e3764ea URL: https://gitlab.winehq.org/wine/wine/-/commit/037be380b260116305566f31ccf81b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 6 20:32:13 2023 -0500 wined3d: Factor out a swapchain_create_texture() helper. --- dlls/wined3d/swapchain.c | 97 ++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e6938ea14dc..4bbf464e58e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1429,15 +1429,63 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat return hr; } +static HRESULT swapchain_create_texture(struct wined3d_swapchain *swapchain, + bool front, bool depth, struct wined3d_texture **texture) +{ + const struct wined3d_swapchain_desc *swapchain_desc = &swapchain->state.desc; + struct wined3d_device *device = swapchain->device; + struct wined3d_resource_desc texture_desc; + uint32_t texture_flags = 0; + HRESULT hr; + + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; + texture_desc.format = depth ? swapchain_desc->auto_depth_stencil_format : swapchain_desc->backbuffer_format; + texture_desc.multisample_type = swapchain_desc->multisample_type; + texture_desc.multisample_quality = swapchain_desc->multisample_quality; + texture_desc.usage = 0; + if (!depth && (device->wined3d->flags & WINED3D_NO3D)) + texture_desc.usage |= WINED3DUSAGE_OWNDC; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; + else + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (!depth && (swapchain_desc->flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER)) + texture_desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + texture_desc.width = swapchain_desc->backbuffer_width; + texture_desc.height = swapchain_desc->backbuffer_height; + texture_desc.depth = 1; + texture_desc.size = 0; + + if (front) + texture_desc.bind_flags = 0; + else if (depth) + texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; + else + texture_desc.bind_flags = swapchain_desc->backbuffer_bind_flags; + + if (swapchain_desc->flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) + texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; + + if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, + texture_flags, NULL, NULL, &wined3d_null_parent_ops, texture))) + { + WARN("Failed to create texture, hr %#lx.\n", hr); + return hr; + } + + if (!depth) + wined3d_texture_set_swapchain(*texture, swapchain); + + return S_OK; +} + static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_swapchain_ops *swapchain_ops) { - struct wined3d_resource_desc texture_desc; struct wined3d_output_desc output_desc; BOOL displaymode_set = FALSE; - DWORD texture_flags = 0; HRESULT hr = E_FAIL; RECT client_rect; unsigned int i; @@ -1519,36 +1567,12 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc TRACE("Creating front buffer.\n"); - texture_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - texture_desc.format = swapchain->state.desc.backbuffer_format; - texture_desc.multisample_type = swapchain->state.desc.multisample_type; - texture_desc.multisample_quality = swapchain->state.desc.multisample_quality; - texture_desc.usage = 0; - if (device->wined3d->flags & WINED3D_NO3D) - texture_desc.usage |= WINED3DUSAGE_OWNDC; - texture_desc.bind_flags = 0; - if (device->wined3d->flags & WINED3D_NO3D) - texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; - else - texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; - if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) - texture_desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - texture_desc.width = swapchain->state.desc.backbuffer_width; - texture_desc.height = swapchain->state.desc.backbuffer_height; - texture_desc.depth = 1; - texture_desc.size = 0; - - if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) - texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; - - if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, texture_flags, - NULL, NULL, &wined3d_null_parent_ops, &swapchain->front_buffer))) + if (FAILED(hr = swapchain_create_texture(swapchain, true, false, &swapchain->front_buffer))) { WARN("Failed to create front buffer, hr %#lx.\n", hr); goto err; } - wined3d_texture_set_swapchain(swapchain->front_buffer, swapchain); if (!(device->wined3d->flags & WINED3D_NO3D)) { wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); @@ -1580,21 +1604,15 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc goto err; } - texture_desc.bind_flags = swapchain->state.desc.backbuffer_bind_flags; - texture_desc.usage = 0; - if (device->wined3d->flags & WINED3D_NO3D) - texture_desc.usage |= WINED3DUSAGE_OWNDC; for (i = 0; i < swapchain->state.desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); - if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, texture_flags, - NULL, NULL, &wined3d_null_parent_ops, &swapchain->back_buffers[i]))) + if (FAILED(hr = swapchain_create_texture(swapchain, false, false, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#lx.\n", i, hr); swapchain->state.desc.backbuffer_count = i; goto err; } - wined3d_texture_set_swapchain(swapchain->back_buffers[i], swapchain); } } @@ -1607,16 +1625,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc struct wined3d_view_desc desc; struct wined3d_texture *ds; - texture_desc.format = swapchain->state.desc.auto_depth_stencil_format; - texture_desc.usage = 0; - texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; - if (device->wined3d->flags & WINED3D_NO3D) - texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; - else - texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; - - if (FAILED(hr = wined3d_texture_create(device, &texture_desc, 1, 1, 0, - NULL, NULL, &wined3d_null_parent_ops, &ds))) + if (FAILED(hr = swapchain_create_texture(swapchain, false, true, &ds))) { WARN("Failed to create the auto depth/stencil surface, hr %#lx.\n", hr); goto err;

1 0

Zebediah Figura : dxgi: Do not create a d3d11 swapchain object for the implicit swapchain.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 0dc7de15e0ceb645d5e2024eee321a8e1557bb71 URL: https://gitlab.winehq.org/wine/wine/-/commit/0dc7de15e0ceb645d5e2024eee321a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 17 15:53:06 2023 -0500 dxgi: Do not create a d3d11 swapchain object for the implicit swapchain. This swapchain is never actually exposed, and effectively only exists due to implementation constraints. When it was introduced, it was necessary or simplest to create a dxgi swapchain object, but currently that's no longer necessary, and avoiding that allows some code to be simplified. --- dlls/dxgi/device.c | 20 +++--------------- dlls/dxgi/swapchain.c | 57 ++++++++++----------------------------------------- 2 files changed, 14 insertions(+), 63 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 8e99fb5edba..60febf4d8e1 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -490,7 +490,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct wined3d_device_parent *wined3d_device_parent; struct wined3d_swapchain_desc swapchain_desc; IWineDXGIDeviceParent *dxgi_device_parent; - struct d3d11_swapchain *swapchain; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; struct dxgi_output *dxgi_output; @@ -572,9 +571,10 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l swapchain_desc.output = dxgi_output->wined3d_output; IDXGIOutput_Release(output); - if (!(swapchain = heap_alloc_zero(sizeof(*swapchain)))) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, &swapchain_desc, + NULL, NULL, &dxgi_null_wined3d_parent_ops, &device->implicit_swapchain))) { - ERR("Failed to allocate swapchain memory.\n"); + ERR("Failed to create implicit swapchain, hr %#lx.\n", hr); wined3d_device_decref(device->wined3d_device); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); @@ -582,20 +582,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc))) - { - WARN("Failed to initialize swapchain, hr %#lx.\n", hr); - heap_free(swapchain); - wined3d_device_decref(device->wined3d_device); - IUnknown_Release(device->child_layer); - wined3d_private_store_cleanup(&device->private_store); - wined3d_mutex_unlock(); - return hr; - } - device->implicit_swapchain = swapchain->wined3d_swapchain; - - TRACE("Created swapchain %p.\n", swapchain); - wined3d_mutex_unlock(); device->adapter = &dxgi_adapter->IWineDXGIAdapter_iface; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f760e931bb1..6efe5f33dcb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -236,11 +236,9 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) WARN("Releasing fullscreen swapchain.\n"); IDXGIOutput_Release(swapchain->target); } - if (swapchain->factory) - IWineDXGIFactory_Release(swapchain->factory); + IWineDXGIFactory_Release(swapchain->factory); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - if (device) - IWineDXGIDevice_Release(device); + IWineDXGIDevice_Release(device); } return refcount; @@ -284,13 +282,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetParent(IDXGISwapChain1 *ifac TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - if (!swapchain->factory) - { - ERR("Implicit swapchain does not store reference to parent.\n"); - *parent = NULL; - return E_NOINTERFACE; - } - return IWineDXGIFactory_QueryInterface(swapchain->factory, riid, parent); } @@ -302,13 +293,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); - if (!swapchain->device) - { - ERR("Implicit swapchain does not store reference to device.\n"); - *device = NULL; - return E_NOINTERFACE; - } - return IWineDXGIDevice_QueryInterface(swapchain->device, riid, device); } @@ -587,12 +571,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (!swapchain->factory) - { - ERR("Implicit swapchain does not store a reference to factory.\n"); - return E_NOINTERFACE; - } - window = d3d11_swapchain_get_hwnd(swapchain); return dxgi_get_output_from_window(swapchain->factory, window, output); } @@ -889,27 +867,16 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi BOOL fullscreen; HRESULT hr; - /* A reference to the implicit swapchain is held by the wined3d device. In - * order to avoid circular references we do not keep a reference to the - * device in the implicit swapchain. */ - if (!(desc->flags & WINED3D_SWAPCHAIN_IMPLICIT)) - { - if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) - return E_INVALIDARG; + if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) + return E_INVALIDARG; - if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, - &IID_IWineDXGIFactory, (void **)&swapchain->factory))) - { - WARN("Failed to get adapter parent, hr %#lx.\n", hr); - return hr; - } - IWineDXGIDevice_AddRef(swapchain->device = &device->IWineDXGIDevice_iface); - } - else + if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, + &IID_IWineDXGIFactory, (void **)&swapchain->factory))) { - swapchain->device = NULL; - swapchain->factory = NULL; + WARN("Failed to get adapter parent, hr %#lx.\n", hr); + return hr; } + IWineDXGIDevice_AddRef(swapchain->device = &device->IWineDXGIDevice_iface); swapchain->IDXGISwapChain1_iface.lpVtbl = &d3d11_swapchain_vtbl; swapchain->state_parent.ops = &d3d11_swapchain_state_parent_ops; @@ -969,10 +936,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi cleanup: wined3d_private_store_cleanup(&swapchain->private_store); wined3d_mutex_unlock(); - if (swapchain->factory) - IWineDXGIFactory_Release(swapchain->factory); - if (swapchain->device) - IWineDXGIDevice_Release(swapchain->device); + IWineDXGIFactory_Release(swapchain->factory); + IWineDXGIDevice_Release(swapchain->device); return hr; }

1 0

Zebediah Figura : wined3d: Remove no longer used arguments from wined3d_texture_update_desc().
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 221f110bbd1c859b936bb3215577306c01396323 URL: https://gitlab.winehq.org/wine/wine/-/commit/221f110bbd1c859b936bb321557730… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 27 16:52:19 2022 -0600 wined3d: Remove no longer used arguments from wined3d_texture_update_desc(). Limit it to updating user memory and pitch. --- dlls/d3d9/device.c | 7 ++-- dlls/ddraw/surface.c | 14 +++----- dlls/wined3d/texture.c | 81 ++++++----------------------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 6 ++-- 5 files changed, 19 insertions(+), 91 deletions(-)

1 0

Rémi Bernon : explorer: Fix command-line parameter parsing.
by Alexandre Julliard June 29, 2023

June 29, 2023

Module: wine Branch: master Commit: 467201a85b8e423cce5ac12491df7d2e7ba086c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/467201a85b8e423cce5ac12491df7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 29 10:29:00 2023 +0200 explorer: Fix command-line parameter parsing. Fixes: 5b11157ecf787e545062000ab6afd1c55ee8dacc Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55141 --- programs/explorer/explorer.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 879fda42135..26f3c8d6d9c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -838,49 +838,56 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = L"/select,"; static const WCHAR arg_desktop[] = L"/desktop"; static const WCHAR arg_desktop_quotes[] = L"\"/desktop"; + const size_t len_n = wcslen(arg_n); + const size_t len_e = wcslen(arg_e); + const size_t len_cd = wcslen(arg_cd); + const size_t len_root = wcslen(arg_root); + const size_t len_select = wcslen(arg_select); + const size_t len_desktop = wcslen(arg_desktop); + const size_t len_desktop_quotes = wcslen(arg_desktop_quotes); LPWSTR p = commandline; while (*p) { while (iswspace(*p)) p++; - if (wcsncmp(p, arg_n, ARRAY_SIZE( arg_n ))==0) + if (wcsncmp(p, arg_n, len_n )==0) { parameters->explorer_mode = FALSE; - p += ARRAY_SIZE( arg_n ); + p += len_n; } - else if (wcsncmp(p, arg_e, ARRAY_SIZE( arg_e ))==0) + else if (wcsncmp(p, arg_e, len_e )==0) { parameters->explorer_mode = TRUE; - p += ARRAY_SIZE( arg_e ); + p += len_e; } - else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + else if (wcsncmp(p, arg_cd, len_cd )==0) { - p += ARRAY_SIZE( arg_cd ); + p += len_cd; p = copy_path_string(parameters->root,p); } - else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) + else if (wcsncmp(p, arg_root, len_root )==0) { - p += ARRAY_SIZE( arg_root ); + p += len_root; p = copy_path_string(parameters->root,p); } - else if (wcsncmp(p, arg_select, ARRAY_SIZE( arg_select ))==0) + else if (wcsncmp(p, arg_select, len_select )==0) { - p += ARRAY_SIZE( arg_select ); + p += len_select; p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection); } - else if (wcsncmp(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) + else if (wcsncmp(p, arg_desktop, len_desktop )==0) { - p += ARRAY_SIZE( arg_desktop ); + p += len_desktop; manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (wcsncmp(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) + else if (wcsncmp(p, arg_desktop_quotes, len_desktop_quotes )==0) { - p += ARRAY_SIZE( arg_desktop_quotes ); + p += len_desktop_quotes; manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } else

1 0