June 2022 - Wine-Devel - list.winehq.org

[PATCH 1/7] winegstreamer: Split wg_sample wrapper helpers to a separate source.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/mfplat.c | 176 ---------------------------- dlls/winegstreamer/wg_sample.c | 203 +++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+), 176 deletions(-) create mode 100644 dlls/winegstreamer/wg_sample.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 50f4dc861d4..6e3517dcb36 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ wg_allocator.c \ wg_format.c \ wg_parser.c \ + wg_sample.c \ wg_transform.c \ wm_asyncreader.c \ wm_reader.c \ diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 157ed3ad2f2..c5ca4b15c0f 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -958,179 +958,3 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) else FIXME("Unrecognized major type %s.\n", debugstr_guid(&major_type)); } - -struct wg_sample_queue -{ - CRITICAL_SECTION cs; - struct list samples; -}; - -struct mf_sample -{ - IMFSample *sample; - IMFMediaBuffer *media_buffer; - struct wg_sample wg_sample; - struct list entry; -}; - -HRESULT wg_sample_create_mf(IMFSample *sample, struct wg_sample **out) -{ - DWORD current_length, max_length; - struct mf_sample *mf_sample; - BYTE *buffer; - HRESULT hr; - - if (!(mf_sample = calloc(1, sizeof(*mf_sample)))) - return E_OUTOFMEMORY; - if (FAILED(hr = IMFSample_ConvertToContiguousBuffer(sample, &mf_sample->media_buffer))) - goto out; - if (FAILED(hr = IMFMediaBuffer_Lock(mf_sample->media_buffer, &buffer, &max_length, &current_length))) - goto out; - - IMFSample_AddRef((mf_sample->sample = sample)); - mf_sample->wg_sample.data = buffer; - mf_sample->wg_sample.size = current_length; - mf_sample->wg_sample.max_size = max_length; - - TRACE("Created mf_sample %p for sample %p.\n", mf_sample, sample); - *out = &mf_sample->wg_sample; - return S_OK; - -out: - if (mf_sample->media_buffer) - IMFMediaBuffer_Release(mf_sample->media_buffer); - free(mf_sample); - return hr; -} - -void wg_sample_release(struct wg_sample *wg_sample) -{ - struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); - - if (InterlockedOr(&wg_sample->refcount, 0)) - { - ERR("Sample %p is still in use, trouble ahead!\n", wg_sample); - return; - } - - IMFMediaBuffer_Unlock(mf_sample->media_buffer); - IMFMediaBuffer_Release(mf_sample->media_buffer); - IMFSample_Release(mf_sample->sample); - - free(mf_sample); -} - -static void wg_sample_queue_begin_append(struct wg_sample_queue *queue, struct wg_sample *wg_sample) -{ - struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); - - /* make sure a concurrent wg_sample_queue_flush call won't release the sample until we're done */ - InterlockedIncrement(&wg_sample->refcount); - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_REFCOUNT; - - EnterCriticalSection(&queue->cs); - list_add_tail(&queue->samples, &mf_sample->entry); - LeaveCriticalSection(&queue->cs); -} - -static void wg_sample_queue_end_append(struct wg_sample_queue *queue, struct wg_sample *wg_sample) -{ - /* release temporary ref taken in wg_sample_queue_begin_append */ - InterlockedDecrement(&wg_sample->refcount); - - wg_sample_queue_flush(queue, false); -} - -void wg_sample_queue_flush(struct wg_sample_queue *queue, bool all) -{ - struct mf_sample *mf_sample, *next; - - EnterCriticalSection(&queue->cs); - - LIST_FOR_EACH_ENTRY_SAFE(mf_sample, next, &queue->samples, struct mf_sample, entry) - { - if (!InterlockedOr(&mf_sample->wg_sample.refcount, 0) || all) - { - list_remove(&mf_sample->entry); - wg_sample_release(&mf_sample->wg_sample); - } - } - - LeaveCriticalSection(&queue->cs); -} - -HRESULT wg_sample_queue_create(struct wg_sample_queue **out) -{ - struct wg_sample_queue *queue; - - if (!(queue = calloc(1, sizeof(*queue)))) - return E_OUTOFMEMORY; - - InitializeCriticalSection(&queue->cs); - queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); - list_init(&queue->samples); - - TRACE("Created sample queue %p\n", queue); - *out = queue; - - return S_OK; -} - -void wg_sample_queue_destroy(struct wg_sample_queue *queue) -{ - wg_sample_queue_flush(queue, true); - - queue->cs.DebugInfo->Spare[0] = 0; - InitializeCriticalSection(&queue->cs); - - free(queue); -} - -HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *wg_sample, - struct wg_sample_queue *queue) -{ - struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); - LONGLONG time, duration; - UINT32 value; - HRESULT hr; - - if (SUCCEEDED(IMFSample_GetSampleTime(mf_sample->sample, &time))) - { - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; - mf_sample->wg_sample.pts = time; - } - if (SUCCEEDED(IMFSample_GetSampleDuration(mf_sample->sample, &duration))) - { - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; - mf_sample->wg_sample.duration = duration; - } - if (SUCCEEDED(IMFSample_GetUINT32(mf_sample->sample, &MFSampleExtension_CleanPoint, &value)) && value) - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_SYNC_POINT; - - wg_sample_queue_begin_append(queue, wg_sample); - hr = wg_transform_push_data(transform, wg_sample); - wg_sample_queue_end_append(queue, wg_sample); - - return hr; -} - -HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *wg_sample, - struct wg_format *format) -{ - struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); - HRESULT hr; - - if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) - return hr; - - IMFMediaBuffer_SetCurrentLength(mf_sample->media_buffer, wg_sample->size); - - if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) - IMFSample_SetSampleTime(mf_sample->sample, wg_sample->pts); - if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) - IMFSample_SetSampleDuration(mf_sample->sample, wg_sample->duration); - if (wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT) - IMFSample_SetUINT32(mf_sample->sample, &MFSampleExtension_CleanPoint, 1); - - return S_OK; -} diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c new file mode 100644 index 00000000000..8879de6c232 --- /dev/null +++ b/dlls/winegstreamer/wg_sample.c @@ -0,0 +1,203 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "gst_private.h" + +#include "wmcodecdsp.h" +#include "mfapi.h" + +#include "wine/debug.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct wg_sample_queue +{ + CRITICAL_SECTION cs; + struct list samples; +}; + +struct mf_sample +{ + IMFSample *sample; + IMFMediaBuffer *media_buffer; + struct wg_sample wg_sample; + struct list entry; +}; + +HRESULT wg_sample_create_mf(IMFSample *sample, struct wg_sample **out) +{ + DWORD current_length, max_length; + struct mf_sample *mf_sample; + BYTE *buffer; + HRESULT hr; + + if (!(mf_sample = calloc(1, sizeof(*mf_sample)))) + return E_OUTOFMEMORY; + if (FAILED(hr = IMFSample_ConvertToContiguousBuffer(sample, &mf_sample->media_buffer))) + goto out; + if (FAILED(hr = IMFMediaBuffer_Lock(mf_sample->media_buffer, &buffer, &max_length, &current_length))) + goto out; + + IMFSample_AddRef((mf_sample->sample = sample)); + mf_sample->wg_sample.data = buffer; + mf_sample->wg_sample.size = current_length; + mf_sample->wg_sample.max_size = max_length; + + TRACE("Created mf_sample %p for sample %p.\n", mf_sample, sample); + *out = &mf_sample->wg_sample; + return S_OK; + +out: + if (mf_sample->media_buffer) + IMFMediaBuffer_Release(mf_sample->media_buffer); + free(mf_sample); + return hr; +} + +void wg_sample_release(struct wg_sample *wg_sample) +{ + struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); + + if (InterlockedOr(&wg_sample->refcount, 0)) + { + ERR("Sample %p is still in use, trouble ahead!\n", wg_sample); + return; + } + + IMFMediaBuffer_Unlock(mf_sample->media_buffer); + IMFMediaBuffer_Release(mf_sample->media_buffer); + IMFSample_Release(mf_sample->sample); + + free(mf_sample); +} + +static void wg_sample_queue_begin_append(struct wg_sample_queue *queue, struct wg_sample *wg_sample) +{ + struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); + + /* make sure a concurrent wg_sample_queue_flush call won't release the sample until we're done */ + InterlockedIncrement(&wg_sample->refcount); + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_REFCOUNT; + + EnterCriticalSection(&queue->cs); + list_add_tail(&queue->samples, &mf_sample->entry); + LeaveCriticalSection(&queue->cs); +} + +static void wg_sample_queue_end_append(struct wg_sample_queue *queue, struct wg_sample *wg_sample) +{ + /* release temporary ref taken in wg_sample_queue_begin_append */ + InterlockedDecrement(&wg_sample->refcount); + + wg_sample_queue_flush(queue, false); +} + +void wg_sample_queue_flush(struct wg_sample_queue *queue, bool all) +{ + struct mf_sample *mf_sample, *next; + + EnterCriticalSection(&queue->cs); + + LIST_FOR_EACH_ENTRY_SAFE(mf_sample, next, &queue->samples, struct mf_sample, entry) + { + if (!InterlockedOr(&mf_sample->wg_sample.refcount, 0) || all) + { + list_remove(&mf_sample->entry); + wg_sample_release(&mf_sample->wg_sample); + } + } + + LeaveCriticalSection(&queue->cs); +} + +HRESULT wg_sample_queue_create(struct wg_sample_queue **out) +{ + struct wg_sample_queue *queue; + + if (!(queue = calloc(1, sizeof(*queue)))) + return E_OUTOFMEMORY; + + InitializeCriticalSection(&queue->cs); + queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); + list_init(&queue->samples); + + TRACE("Created sample queue %p\n", queue); + *out = queue; + + return S_OK; +} + +void wg_sample_queue_destroy(struct wg_sample_queue *queue) +{ + wg_sample_queue_flush(queue, true); + + queue->cs.DebugInfo->Spare[0] = 0; + InitializeCriticalSection(&queue->cs); + + free(queue); +} + +HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *wg_sample, + struct wg_sample_queue *queue) +{ + struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); + LONGLONG time, duration; + UINT32 value; + HRESULT hr; + + if (SUCCEEDED(IMFSample_GetSampleTime(mf_sample->sample, &time))) + { + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; + mf_sample->wg_sample.pts = time; + } + if (SUCCEEDED(IMFSample_GetSampleDuration(mf_sample->sample, &duration))) + { + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; + mf_sample->wg_sample.duration = duration; + } + if (SUCCEEDED(IMFSample_GetUINT32(mf_sample->sample, &MFSampleExtension_CleanPoint, &value)) && value) + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_SYNC_POINT; + + wg_sample_queue_begin_append(queue, wg_sample); + hr = wg_transform_push_data(transform, wg_sample); + wg_sample_queue_end_append(queue, wg_sample); + + return hr; +} + +HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *wg_sample, + struct wg_format *format) +{ + struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); + HRESULT hr; + + if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) + return hr; + + IMFMediaBuffer_SetCurrentLength(mf_sample->media_buffer, wg_sample->size); + + if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) + IMFSample_SetSampleTime(mf_sample->sample, wg_sample->pts); + if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) + IMFSample_SetSampleDuration(mf_sample->sample, wg_sample->duration); + if (wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT) + IMFSample_SetUINT32(mf_sample->sample, &MFSampleExtension_CleanPoint, 1); + + return S_OK; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/220

June 10, 2022

[PATCH 0/7] MR220: winegstreamer: Add zero-copy support to quartz_transform.

by Rémi Bernon

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/220

June 10, 2022

Re: HLSL offsetting

by Matteo Bruni

On Fri, Jun 10, 2022 at 1:23 AM Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > On 6/9/22 17:38, Matteo Bruni wrote: > >> My current vision of SMxIR is that it should be a one-to-one > >> representation of actual instructions, writable without any lowering > >> passes (and hence any passes that are done on it should be optimization > >> only, with the *possible* exception of RA.) In a sense, it's what we > >> have already with sm4_instruction and such, except that we'd be storing > >> it and doing passes on it rather than just writing it directly. > > > > Right, I agree with the general idea. In practice it might turn out to > > be useful to relax the 1:1 requirements a bit and introduce some > > "extra" instructions (that would be quickly lowered to real ones) if > > that makes the HIR->SMxIR conversion easier. > > > > Something related we already discussed: SM1IR and SM4IR are going to > > be different, obviously, but we want to try and architect them so that > > the optimization passes machinery and most of the actual passes can be > > shared between the two. > > Hmm, I don't remember that discussion. My take is that if there's only > two backends it probably makes more sense not to (over-)engineer any > common framework, but rather just make them look similar enough that we > can copy-paste things from one to the other. (It's an unpopular opinion, > perhaps, but I think that code duplication is an important and often the > best method of code deduplication.) Actually I think we had this same conversation before and I totally misremembered your side. In general, sure, deduplicating stuff a posteriori is the safest route. Also I think I imagined struct sm1_instruction and struct sm4_instruction being more similar to each other than they actually are. So maybe keeping the current separation is a smart idea. That said, I don't think it's a terrible move to try and keep them close-ish where it doesn't get in the way. E.g. the sm1 dest register modifiers are effectively the same thing as the sm4 instruction modifiers (only 1 dest register in SM1 instruction encoding, arguably the fact that these modifiers are part of the dest register is more of an encoding artifact than anything else) so it should be no trouble to call those "instruction modifiers" in both cases.

June 10, 2022

Re: [PATCH v2 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.

by Huw Davies (＠huw)

On Fri Jun 10 06:58:14 2022 +0000, Huw Davies wrote: > This `if` condition is challenging to decipher. Perhaps it would be > simpler comparing `!!name[0]` with `!!name[1]`, or breaking this out > into a series of `if` statements. Err, obviously comparing `!name[0]` directly with `!name[1]` would also work. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/216#note_1802

June 10, 2022

Re: [PATCH v2 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/uiautomationcore/uia_provider.c: > + > + if (!msaa_acc_prop_match(acc, acc2, &matched)) > + goto exit; > + > + variant_init_i4(&cid, CHILDID_SELF); > + hr = IAccessible_get_accName(acc, cid, &name[0]); > + if (SUCCEEDED(hr)) > + { > + hr = IAccessible_get_accName(acc2, cid, &name[1]); > + if (SUCCEEDED(hr)) > + { > + if ((!(!name[0] && !name[1]) && (!name[0] || !name[1])) || > + ((name[0] && name[1]) && wcscmp(name[0], name[1]))) > + matched = FALSE; > + else > + matched = TRUE; This `if` condition is challenging to decipher. Perhaps it would be simpler comparing `!!name[0]` with `!!name[1]`, or breaking this out into a series of `if` statements. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/216#note_1801

June 10, 2022

Re: [PATCH v2 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/uiautomationcore/uia_provider.c: > + IServiceProvider_Release(sp); > + } > + > + if (SUCCEEDED(hr) && acc2) > + return acc2; > + > + IAccessible_AddRef(acc); > + return acc; > +} > + > +/* > + * Compare role, state, child count, and location properties of the two > + * IAccessibles. If all four are successfully retrieved and are equal, this is > + * considered a match. > + */ > +static BOOL msaa_acc_prop_match(IAccessible *acc, IAccessible *acc2, BOOL *matched) You're essentially returning a tri-state here, split over two `BOOL`s. It might be better to return an `HRESULT` using `S_OK`, `S_FALSE` and something else to signify a hard mismatch. At the very least expand the comment to explain what the two `BOOL`s mean. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/216#note_1800

June 10, 2022

[PATCH v3 7/7] d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 98 +++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index fe7a118cec9..1b4145d16bf 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -822,6 +822,96 @@ static unsigned int get_bpp_from_format(DXGI_FORMAT format) } } +static HRESULT WINAPI D3DX10ThreadPump_QueryInterface(ID3DX10ThreadPump *iface, REFIID riid, void **out) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI D3DX10ThreadPump_AddRef(ID3DX10ThreadPump *iface) +{ + return 2; +} + +static ULONG WINAPI D3DX10ThreadPump_Release(ID3DX10ThreadPump *iface) +{ + return 1; +} + +static int add_work_item_count = 1; + +static HRESULT WINAPI D3DX10ThreadPump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10DataLoader *loader, + ID3DX10DataProcessor *processor, HRESULT *result, void **object) +{ + SIZE_T size; + void *data; + HRESULT hr; + + ok(!add_work_item_count++, "unexpected call\n"); + ok(!object, "object = %p\n", object); + + hr = ID3DX10DataLoader_Load(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataLoader_Decompress(loader, &data, &size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(processor, data, size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_CreateDeviceObject(processor, object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Destroy(processor); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (result) *result = S_OK; + return S_OK; +} + +static UINT WINAPI D3DX10ThreadPump_GetWorkItemCount(ID3DX10ThreadPump *iface) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static HRESULT WINAPI D3DX10ThreadPump_WaitForAllItems(ID3DX10ThreadPump *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DX10ThreadPump_ProcessDeviceWorkItems(ID3DX10ThreadPump *iface, UINT count) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DX10ThreadPump_PurgeAllItems(ID3DX10ThreadPump *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DX10ThreadPump_GetQueueStatus(ID3DX10ThreadPump *iface, UINT *queue, + UINT *processqueue, UINT *devicequeue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ID3DX10ThreadPumpVtbl D3DX10ThreadPumpVtbl = +{ + D3DX10ThreadPump_QueryInterface, + D3DX10ThreadPump_AddRef, + D3DX10ThreadPump_Release, + D3DX10ThreadPump_AddWorkItem, + D3DX10ThreadPump_GetWorkItemCount, + D3DX10ThreadPump_WaitForAllItems, + D3DX10ThreadPump_ProcessDeviceWorkItems, + D3DX10ThreadPump_PurgeAllItems, + D3DX10ThreadPump_GetQueueStatus +}; +static ID3DX10ThreadPump thread_pump = { &D3DX10ThreadPumpVtbl }; + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -1954,6 +2044,14 @@ static void test_get_image_info(void) winetest_pop_context(); } + hr2 = 0xdeadbeef; + add_work_item_count = 0; + hr = D3DX10GetImageInfoFromMemory(test_image[0].data, test_image[0].size, &thread_pump, &image_info, &hr2); + ok(add_work_item_count, "D3DX10ThreadPump_AddWorkItem not called\n"); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); + check_image_info(&image_info, test_image, __LINE__); + hr2 = 0xdeadbeef; hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v3 6/7] d3dx10: Support ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromMemory.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 52d1331d30e..9c7762bc617 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -544,8 +544,26 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat if (!src_data) return E_FAIL; + if (pump) - FIXME("Thread pump is not supported yet.\n"); + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncMemoryLoader(src_data, src_data_size, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(img_info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } + return hr; + } hr = get_image_info(src_data, src_data_size, img_info); if (result) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v3 5/7] d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 090d480accd..52d1331d30e 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -411,10 +411,32 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *reso TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_w(resource), pump, info, result); - if (FAILED((hr = load_resourceW(module, resource, &buffer, &size)))) + if (pump) + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncResourceLoaderW(module, resource, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; + } - return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + if (FAILED((hr = load_resourceW(module, resource, &buffer, &size)))) + return hr; + hr = get_image_info(buffer, size, info); + if (result) + *result = hr; + return hr; } HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022

[PATCH v3 4/7] d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA.

by Piotr Caban

From: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 3ee1eaba624..090d480accd 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -373,10 +373,32 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_a(resource), pump, info, result); - if (FAILED((hr = load_resourceA(module, resource, &buffer, &size)))) + if (pump) + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncResourceLoaderA(module, resource, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; + } - return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + if (FAILED((hr = load_resourceA(module, resource, &buffer, &size)))) + return hr; + hr = get_image_info(buffer, size, info); + if (result) + *result = hr; + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/205

June 10, 2022