wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Michael Stefaniuc : dmstyle: Get rid of a no longer used function.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 44400613cb14883b0c347cfae656ac031ada2ff6 URL: https://gitlab.winehq.org/wine/wine/-/commit/44400613cb14883b0c347cfae656ac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 29 00:49:53 2022 +0100 dmstyle: Get rid of a no longer used function. --- dlls/dmstyle/dmutils.c | 72 -------------------------------------------------- dlls/dmstyle/dmutils.h | 1 - 2 files changed, 73 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 58a1c40622a..4b9101e675a 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -143,75 +143,3 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p return S_OK; } - -HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) { - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - DMUS_IO_REFERENCE ref; - DMUS_OBJECTDESC ref_desc; - - memset(&ref, 0, sizeof(ref)); - memset(&ref_desc, 0, sizeof(ref_desc)); - - if (pChunk->fccID != DMUS_FOURCC_REF_LIST) { - ERR(": %s chunk should be a REF list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { - case DMUS_FOURCC_REF_CHUNK: { - TRACE(": Reference chunk\n"); - if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; - IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); - TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE(" - dwValidData: %lu\n", ref.dwValidData); - break; - } - default: { - TRACE(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - } - TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - - ref_desc.dwValidData |= DMUS_OBJ_CLASS; - ref_desc.guidClass = ref.guidClassID; - - TRACE("** DM Reference Begin of Load ***\n"); - TRACE("With Desc:\n"); - dump_DMUS_OBJECTDESC(&ref_desc); - - { - LPDIRECTMUSICGETLOADER pGetLoader = NULL; - LPDIRECTMUSICLOADER pLoader = NULL; - - IStream_QueryInterface (pStm, &IID_IDirectMusicGetLoader, (LPVOID*)&pGetLoader); - IDirectMusicGetLoader_GetLoader (pGetLoader, &pLoader); - IDirectMusicGetLoader_Release (pGetLoader); - - hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject); - IDirectMusicLoader_Release (pLoader); /* release loader */ - } - TRACE("** DM Reference End of Load ***\n"); - - return hr; -} diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index 2f13c4b1f44..dbeb7a2a978 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -32,6 +32,5 @@ typedef struct _DMUS_PRIVATE_CHUNK { */ extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */

1 0

Michael Stefaniuc : dmstyle: Simplify parsing of a style reference list.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 25de40af075062faa1c974fb21c9c9aafbcebb88 URL: https://gitlab.winehq.org/wine/wine/-/commit/25de40af075062faa1c974fb21c9c9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 28 23:39:55 2022 +0100 dmstyle: Simplify parsing of a style reference list. Avoids adding an invalid style reference to the list with subsequent crash on release. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmstyle/dmstyle_private.h | 2 +- dlls/dmstyle/styletrack.c | 120 ++++++++++++++--------------------------- 2 files changed, 42 insertions(+), 80 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 4c8dd091536..fbe635e4388 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -57,7 +57,7 @@ extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDE */ typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct list entry; /* for listing elements */ - DWORD dwTimeStamp; + DWORD timestamp; IDirectMusicStyle8* pObject; } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index b6a5ce22e44..822072bdb27 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -23,7 +23,6 @@ #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleTrack implementation @@ -90,7 +89,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) list_remove(cursor); IDirectMusicStyle8_Release(item->pObject); - heap_free(item); + free(item); } heap_free(This); @@ -146,12 +145,10 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { LIST_FOR_EACH (item, &This->Items) { DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); - if (style->pObject) { - IDirectMusicStyle8_AddRef(style->pObject); - *((IDirectMusicStyle8**)param) = style->pObject; + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8 **)param) = style->pObject; - return S_OK; - } + return S_OK; } return DMUS_E_NOT_FOUND; @@ -303,82 +300,47 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { style_track_Join }; -static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DWORD size, IStream *pStm) +static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, const struct chunk_entry *strf) { - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - IDirectMusicObject* pObject = NULL; - LPDMUS_PRIVATE_STYLE_ITEM pNewItem = NULL; - - ListSize[0] = size - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_TIME_STAMP_CHUNK: { - TRACE_(dmfile)(": Time Stamp chunk\n"); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_ITEM)); - if (NULL == pNewItem) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } - IStream_Read (pStm, &pNewItem->dwTimeStamp, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - dwTimeStamp: %lu\n", pNewItem->dwTimeStamp); - list_add_tail (&This->Items, &pNewItem->entry); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - /** - * should be a DMRF (DirectMusic Reference) list @TODO - */ - case DMUS_FOURCC_REF_LIST: { - FIXME_(dmfile)(": DMRF (DM References) list, not yet handled\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference(&This->dmobj.IPersistStream_iface, - &Chunk, pStm, &pObject); - if (FAILED(hr)) { - ERR(": could not load Reference\n"); - return hr; - } - hr = IDirectMusicObject_QueryInterface(pObject, &IID_IDirectMusicStyle8, (LPVOID*)&pNewItem->pObject); - if (FAILED(hr)) { - ERR(": Reference not an IDirectMusicStyle, exiting\n"); - exit(-1); - return hr; - } - IDirectMusicObject_Release(pObject); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; + struct chunk_entry chunk = {.parent = strf}; + IDirectMusicObject *dmobj; + DMUS_PRIVATE_STYLE_ITEM *item; + HRESULT hr; + + /* First chunk is a timestamp */ + if (stream_get_chunk(stream, &chunk) != S_OK || chunk.id != DMUS_FOURCC_TIME_STAMP_CHUNK) + return DMUS_E_CHUNKNOTFOUND; + if (!(item = malloc(sizeof(*item)))) + return E_OUTOFMEMORY; + hr = stream_chunk_get_data(stream, &chunk, &item->timestamp, sizeof(item->timestamp)); + if (FAILED(hr)) + goto error; + + /* Second chunk is a reference list */ + if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || + chunk.type != DMUS_FOURCC_REF_LIST) { + hr = DMUS_E_INVALID_SEGMENTTRIGGERTRACK; + goto error; } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &dmobj))) { + WARN("Failed to load reference: %#lx\n", hr); + goto error; } + hr = IDirectMusicObject_QueryInterface(dmobj, &IID_IDirectMusicStyle8, (void **)&item->pObject); + if (FAILED(hr)) { + WARN("Reference not an IDirectMusicStyle8\n"); + IDirectMusicObject_Release(dmobj); + goto error; } - TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - return S_OK; + list_add_tail(&This->Items, &item->entry); + TRACE("Found reference to style %p with timestamp %lu\n", item->pObject, item->timestamp); + + return S_OK; + +error: + free(item); + return hr; } static inline IDirectMusicStyleTrack *impl_from_IPersistStream(IPersistStream *iface) @@ -404,7 +366,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *st while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_STYLE_REF_LIST) - if (FAILED(hr = parse_style_ref(This, chunk.size, stream))) + if (FAILED(hr = parse_style_ref(This, stream, &chunk))) break; return SUCCEEDED(hr) ? S_OK : hr;

1 0

Michael Stefaniuc : dmstyle: Simplify parsing of a style track list.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 8881ada9c9ebce8c6e4a92eb47a6e7243f9bea27 URL: https://gitlab.winehq.org/wine/wine/-/commit/8881ada9c9ebce8c6e4a92eb47a6e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Nov 26 22:40:24 2022 +0100 dmstyle: Simplify parsing of a style track list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmstyle/styletrack.c | 124 ++++++++-------------------------------------- 1 file changed, 22 insertions(+), 102 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index bdc665fe302..b6a5ce22e44 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -303,8 +303,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { style_track_Join }; -static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DWORD size, IStream *pStm) { DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -314,12 +313,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK IDirectMusicObject* pObject = NULL; LPDMUS_PRIVATE_STYLE_ITEM pNewItem = NULL; - if (pChunk->fccID != DMUS_FOURCC_STYLE_REF_LIST) { - ERR_(dmfile)(": %s chunk should be a STYLE list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); + ListSize[0] = size - sizeof(FOURCC); ListCount[0] = 0; do { @@ -387,107 +381,33 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK return S_OK; } -static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) -{ - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - if (pChunk->fccID != DMUS_FOURCC_STYLE_TRACK_LIST) { - ERR_(dmfile)(": %s chunk should be a STYLETRACK list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_STYLE_REF_LIST: { - TRACE_(dmfile)(": STYLE_REF list\n"); - hr = parse_style_ref(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - - return S_OK; -} - static inline IDirectMusicStyleTrack *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyleTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicStyleTrack *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - LARGE_INTEGER liMove; - HRESULT hr; - - FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_STYLE_TRACK_LIST: { - TRACE_(dmfile)(": Chord track list\n"); - hr = parse_styletrack_list(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - return E_FAIL; - } - } - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - } + IDirectMusicStyleTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry track = {0}; + struct chunk_entry chunk = {.parent = &track}; + HRESULT hr; - return S_OK; + TRACE("(%p, %p): Loading\n", This, stream); + + if (!stream) + return E_POINTER; + + if (stream_get_chunk(stream, &track) != S_OK || track.id != FOURCC_LIST || + track.type != DMUS_FOURCC_STYLE_TRACK_LIST) + return DMUS_E_TRACK_NOT_FOUND; + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_STYLE_REF_LIST) + if (FAILED(hr = parse_style_ref(This, chunk.size, stream))) + break; + + return SUCCEEDED(hr) ? S_OK : hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Matteo Bruni : wined3d: Don't use separate GL contexts for different swapchains.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 72597b170e814599ef2be4b19dc4b9de0932a30f URL: https://gitlab.winehq.org/wine/wine/-/commit/72597b170e814599ef2be4b19dc4b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 5 20:09:38 2020 +0200 wined3d: Don't use separate GL contexts for different swapchains. This avoids triggering a Mesa slowpath introduced by Mesa commit e7f3a8d6959c74f63c877dd8776fe519d54f946f. Additionally, it helps applications using multiple swapchains and queries (e.g. the one in bug 43773) by not requiring extra context switches when polling queries. For the records, the actual issue from bug 43773 was probably fixed a long time ago, maybe already by 7b62a970e9ad3b4179394cf54f0232475fe2388a or thereabouts. The downside of this change is that we'll now end up calling glFinish() when there are multiple threads using the same device when CSMT is disabled. That's a non-default setting and one that should only be used for troubleshooting purposes at this point, so it shouldn't be too bad of an issue. It might also make sense to just get rid of that glFinish() entirely, it's never going to be a complete fix. --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context_gl.c | 10 ++++++ dlls/wined3d/device.c | 14 +++----- dlls/wined3d/swapchain.c | 81 ++++++------------------------------------ dlls/wined3d/wined3d_private.h | 7 ---- 5 files changed, 26 insertions(+), 88 deletions(-)

1 0

Matteo Bruni : wined3d: Destroy primary GL context if initialization fails.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: ee349306e29309e629acd5e441374c369c489a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/ee349306e29309e629acd5e441374c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 25 20:00:33 2022 +0100 wined3d: Destroy primary GL context if initialization fails. --- dlls/wined3d/device.c | 7 +++++-- dlls/wined3d/swapchain.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d2d9a61552..5e64cf9487c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1256,10 +1256,13 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) return; } + context_gl = wined3d_context_gl(context); + if (!wined3d_allocator_init(&device_gl->allocator, ARRAY_SIZE(gl_memory_types), &wined3d_allocator_gl_ops)) { WARN("Failed to initialise allocator.\n"); context_release(context); + wined3d_swapchain_gl_context_destroy(wined3d_swapchain_gl(swapchain), context_gl); return; } @@ -1269,6 +1272,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) ERR("Failed to allocate shader private data, hr %#x.\n", hr); wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); + wined3d_swapchain_gl_context_destroy(wined3d_swapchain_gl(swapchain), context_gl); return; } @@ -1278,11 +1282,10 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) device->shader_backend->shader_free_private(device, NULL); wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); + wined3d_swapchain_gl_context_destroy(wined3d_swapchain_gl(swapchain), context_gl); return; } - context_gl = wined3d_context_gl(context); - wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info); if (!wined3d_glsl_blitter_create(&device->blitter, device)) wined3d_arbfp_blitter_create(&device->blitter, device); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 79ee427572f..0fd082fac7b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1804,6 +1804,25 @@ static struct wined3d_context_gl *wined3d_swapchain_gl_create_context(struct win return context_gl; } +void wined3d_swapchain_gl_context_destroy(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_context_gl *context_gl) +{ + unsigned int i, j; + + TRACE("swapchain_gl %p, context_gl %p.\n", swapchain_gl, context_gl); + + for (i = 0; i < swapchain_gl->context_count; ++i) + { + if (swapchain_gl->contexts[i] == context_gl) + { + wined3d_context_gl_destroy(swapchain_gl->contexts[i]); + for (j = i; j < --swapchain_gl->context_count; ++j) + swapchain_gl->contexts[j] = swapchain_gl->contexts[j + 1]; + return; + } + } + ERR("context_gl %p not found in the swapchain list.\n", context_gl); +} + void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) { unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47904390ed3..20194887b7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5720,6 +5720,8 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +void wined3d_swapchain_gl_context_destroy(struct wined3d_swapchain_gl *swapchain_gl, + struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl,

1 0

Matteo Bruni : wined3d: Move backup window / DC handling from the swapchain to the device.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 242cdaee822f0533f5c84932c7be460e332f14ca URL: https://gitlab.winehq.org/wine/wine/-/commit/242cdaee822f0533f5c84932c7be46… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 25 19:20:57 2022 +0100 wined3d: Move backup window / DC handling from the swapchain to the device. --- dlls/wined3d/context_gl.c | 16 +++++++--------- dlls/wined3d/device.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 36 ++---------------------------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c790157fd0a..66e4321dd12 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1258,7 +1258,7 @@ success: static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context_gl) { - struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(context_gl->c.swapchain); + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); BOOL backup = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) @@ -1275,23 +1275,20 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context context_gl->valid = 0; WARN("Trying fallback to the backup window.\n"); - /* FIXME: If the context is destroyed it's no longer associated with - * a swapchain, so we can't use the swapchain to get a backup dc. To - * make this work windowless contexts would need to be handled by the - * device. */ - if (context_gl->c.destroyed || !swapchain_gl) + if (context_gl->c.destroyed) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); wined3d_context_gl_set_current(NULL); return FALSE; } - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + if (!(context_gl->dc = wined3d_device_gl_get_backup_dc(device_gl))) { wined3d_context_gl_set_current(NULL); return FALSE; } + TRACE("Using backup DC %p.\n", context_gl->dc); context_gl->dc_is_private = TRUE; context_gl->dc_has_format = FALSE; @@ -2032,7 +2029,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context context_gl->pixel_format, context_gl->dc); wined3d_release_dc(context_gl->window, context_gl->dc); - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + if (!(context_gl->dc = wined3d_device_gl_get_backup_dc(wined3d_device_gl(device)))) { ERR("Failed to retrieve the backup device context.\n"); return FALSE; @@ -2109,7 +2106,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!context_gl->dc) { - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + if (!(context_gl->dc = wined3d_device_gl_get_backup_dc(wined3d_device_gl(device)))) { ERR("Failed to retrieve a device context.\n"); return E_FAIL; @@ -2354,6 +2351,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) context_gl->c.destroy_delayed = 1; /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ context_gl->c.swapchain = NULL; + context_gl->c.device = NULL; return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7d0b1adebc..7d2d9a61552 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1225,6 +1225,14 @@ void wined3d_device_gl_delete_opengl_contexts_cs(void *object) else wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); } + + if (device_gl->backup_dc) + { + TRACE("Destroying backup wined3d window %p, dc %p.\n", device_gl->backup_wnd, device_gl->backup_dc); + + wined3d_release_dc(device_gl->backup_wnd, device_gl->backup_dc); + DestroyWindow(device_gl->backup_wnd); + } } void wined3d_device_gl_create_primary_opengl_context_cs(void *object) @@ -5913,6 +5921,33 @@ void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, wined3d_swapchain_get_gamma_ramp(swapchain, ramp); } +HDC wined3d_device_gl_get_backup_dc(struct wined3d_device_gl *device_gl) +{ + TRACE("device_gl %p.\n", device_gl); + + if (!device_gl->backup_dc) + { + TRACE("Creating the backup window for device %p.\n", device_gl); + + if (!(device_gl->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + + if (!(device_gl->backup_dc = GetDC(device_gl->backup_wnd))) + { + ERR("Failed to get a DC.\n"); + DestroyWindow(device_gl->backup_wnd); + device_gl->backup_wnd = NULL; + return NULL; + } + } + + return device_gl->backup_dc; +} + void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) { TRACE("device %p, resource %p.\n", device, resource); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1712cda2373..79ee427572f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -98,14 +98,6 @@ void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) wined3d_cs_destroy_object(cs, wined3d_swapchain_gl_destroy_object, swapchain_gl); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); - - if (swapchain_gl->backup_dc) - { - TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain_gl->backup_wnd, swapchain_gl->backup_dc); - - wined3d_release_dc(swapchain_gl->backup_wnd, swapchain_gl->backup_dc); - DestroyWindow(swapchain_gl->backup_wnd); - } } static void wined3d_swapchain_vk_destroy_vulkan_swapchain(struct wined3d_swapchain_vk *swapchain_vk) @@ -610,7 +602,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); pixel_format = &wined3d_adapter_gl(swapchain->device->adapter)->pixel_formats[context_gl->pixel_format]; - if (context_gl->dc == swapchain_gl->backup_dc || (pixel_format->swap_method != WGL_SWAP_COPY_ARB + if (context_gl->dc == wined3d_device_gl(swapchain->device)->backup_dc + || (pixel_format->swap_method != WGL_SWAP_COPY_ARB && swapchain_present_is_partial_copy(swapchain, dst_rect))) { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); @@ -1842,31 +1835,6 @@ struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapc return wined3d_swapchain_gl_create_context(swapchain_gl); } -HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) -{ - if (!swapchain_gl->backup_dc) - { - TRACE("Creating the backup window for swapchain %p.\n", swapchain_gl); - - if (!(swapchain_gl->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", - WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) - { - ERR("Failed to create a window.\n"); - return NULL; - } - - if (!(swapchain_gl->backup_dc = GetDC(swapchain_gl->backup_wnd))) - { - ERR("Failed to get a DC.\n"); - DestroyWindow(swapchain_gl->backup_wnd); - swapchain_gl->backup_wnd = NULL; - return NULL; - } - } - - return swapchain_gl->backup_dc; -} - void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) { UINT i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbee46740b1..47904390ed3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4294,6 +4294,9 @@ struct wined3d_device_gl } *retired_blocks; SIZE_T retired_blocks_size; SIZE_T retired_block_count; + + HWND backup_wnd; + HDC backup_dc; }; static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) @@ -4331,6 +4334,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; +HDC wined3d_device_gl_get_backup_dc(struct wined3d_device_gl *device_gl) DECLSPEC_HIDDEN; GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) DECLSPEC_HIDDEN; static inline float wined3d_alpha_ref(const struct wined3d_state *state) @@ -5708,9 +5712,6 @@ struct wined3d_swapchain_gl struct wined3d_context_gl **contexts; SIZE_T contexts_size; SIZE_T context_count; - - HDC backup_dc; - HWND backup_wnd; }; static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) @@ -5720,7 +5721,6 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; -HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc,

1 0

Matteo Bruni : wined3d: Get rid of a redundant branch.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: b12cae8c99e8d7d606a4569d86ba63579d0087bd URL: https://gitlab.winehq.org/wine/wine/-/commit/b12cae8c99e8d7d606a4569d86ba63… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 21 10:25:00 2022 +0200 wined3d: Get rid of a redundant branch. --- dlls/wined3d/device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a37a27b0cd..b7d0b1adebc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5848,6 +5848,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); + + hr = device->adapter->adapter_ops->adapter_init_3d(device); } else { @@ -5857,12 +5859,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_context_set_depth_stencil_view(context, view); } - if (reset_state) - hr = device->adapter->adapter_ops->adapter_init_3d(device); - - /* All done. There is no need to reload resources or shaders, this will happen automatically on the - * first use - */ + /* All done. There is no need to reload resources or shaders, this will + * happen automatically on the first use. */ return hr; }

1 0

Matteo Bruni : wined3d: Remove unnecessary index increment in wined3d_context_gl_cleanup_resources().
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: c1857959b89bec51f096a1cc4cb69738435df711 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1857959b89bec51f096a1cc4cb697… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 14 23:16:37 2022 +0200 wined3d: Remove unnecessary index increment in wined3d_context_gl_cleanup_resources(). --- dlls/wined3d/context_gl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5df0865824c..c790157fd0a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2663,8 +2663,6 @@ static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *cont wined3d_device_gl_free_memory(device_gl, r->block); if (i != --count) *r = blocks[count]; - else - ++i; } device_gl->retired_block_count = count; }

1 0

Matteo Bruni : wined3d: Don't try to access unused buffers in wined3d_context_gl_load_numbered_arrays().
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: d6e4e944af1c93dbb8ffeaab62d14af42fe8b738 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6e4e944af1c93dbb8ffeaab62d14a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 14 23:07:17 2022 +0200 wined3d: Don't try to access unused buffers in wined3d_context_gl_load_numbered_arrays(). wined3d_stream_info_from_declaration() doesn't update elements of the stream_info structure that are not used by the current vertex declaration. That means that there might be obsolete buffer references in stream_info, possibly to buffers that have since been destroyed. --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index af46cd9dfd7..5df0865824c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5675,7 +5675,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c for (i = 0; i < gl_info->limits.vertex_attribs; ++i) { const struct wined3d_stream_info_element *element = &stream_info->elements[i]; - const void *offset = get_vertex_attrib_pointer(element, state); const struct wined3d_stream_state *stream; const struct wined3d_format_gl *format_gl; @@ -5733,6 +5732,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (element->stride) { + const void *offset = get_vertex_attrib_pointer(element, state); unsigned int format_attrs = format_gl->f.attrs; bo = wined3d_bo_gl_id(element->data.buffer_object);

1 0

Michel Zou : msvcrt: Fix errno set on dup from read-only file.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 53bc6c7a4a416252559a2a174821001fdd576c6f URL: https://gitlab.winehq.org/wine/wine/-/commit/53bc6c7a4a416252559a2a17482100… Author: Michel Zou <xantares09(a)hotmail.com> Date: Sat Nov 26 18:27:52 2022 +0100 msvcrt: Fix errno set on dup from read-only file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53950 --- dlls/msvcrt/file.c | 1 + dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4a8c3510bd7..e72784eef41 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1244,6 +1244,7 @@ int CDECL _dup2(int od, int nd) if (info_nd == &MSVCRT___badioinfo) { + *_errno() = EBADF; ret = -1; } else if (info_od->wxflag & WX_OPEN) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index de21d11d0b9..3f57b3f871f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -267,6 +267,12 @@ static void test_readmode( BOOL ascii_mode ) close (fd); + fd = open ("fdopen.tst", O_RDONLY, _S_IREAD |_S_IWRITE); + errno = 0xdeadbeef; + ok(dup2(fd, -1) == -1, "dup2(fd, -1) succeeded\n"); + ok(errno == EBADF, "errno = %d\n", errno); + close (fd); + if (ascii_mode) { /* Open file in ascii mode */ fd = open ("fdopen.tst", O_RDONLY);

1 0

← Newer
1
2
3
4
5
6
7
...
118
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022