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

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 3c5cae06bf6e642c32ba1089506af7a0ccaed466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c5cae06bf6e642c32ba1089… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 20:44:31 2022 +0200 d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 9573195cdab..8fc232681c5 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -854,9 +854,15 @@ static HRESULT WINAPI thread_pump_PurgeAllItems(ID3DX10ThreadPump *iface) static HRESULT WINAPI thread_pump_GetQueueStatus(ID3DX10ThreadPump *iface, UINT *io_queue, UINT *process_queue, UINT *device_queue) { - FIXME("iface %p, io_queue %p, process_queue %p, device_queue %p stub!\n", + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + + TRACE("iface %p, io_queue %p, process_queue %p, device_queue %p.\n", iface, io_queue, process_queue, device_queue); - return E_NOTIMPL; + + *io_queue = thread_pump->io_count; + *process_queue = thread_pump->proc_count; + *device_queue = thread_pump->device_count; + return S_OK; } static const ID3DX10ThreadPumpVtbl thread_pump_vtbl =

1 0

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 731bffa013e1db452e7839d274c767e5d64e52b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731bffa013e1db452e7839d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 19:48:10 2022 +0200 d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index b22967e13fd..2eb27d0f535 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -636,6 +636,8 @@ struct thread_pump ID3DX10ThreadPump ID3DX10ThreadPump_iface; LONG refcount; + LONG processing_count; + SRWLOCK io_lock; CONDITION_VARIABLE io_cv; unsigned int io_count; @@ -758,6 +760,7 @@ static HRESULT WINAPI thread_pump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10D if (object) *object = NULL; + InterlockedIncrement(&thread_pump->processing_count); AcquireSRWLockExclusive(&thread_pump->io_lock); ++thread_pump->io_count; list_add_tail(&thread_pump->io_queue, &work_item->entry); @@ -768,8 +771,15 @@ static HRESULT WINAPI thread_pump_AddWorkItem(ID3DX10ThreadPump *iface, ID3DX10D static UINT WINAPI thread_pump_GetWorkItemCount(ID3DX10ThreadPump *iface) { - FIXME("iface %p stub!\n", iface); - return 0; + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + UINT ret; + + TRACE("iface %p.\n", iface); + + AcquireSRWLockExclusive(&thread_pump->device_lock); + ret = thread_pump->processing_count + thread_pump->device_count; + ReleaseSRWLockExclusive(&thread_pump->device_lock); + return ret; } static HRESULT WINAPI thread_pump_WaitForAllItems(ID3DX10ThreadPump *iface) @@ -842,6 +852,7 @@ static DWORD WINAPI io_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); + InterlockedDecrement(&thread_pump->processing_count); continue; } @@ -894,6 +905,7 @@ static DWORD WINAPI proc_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); + InterlockedDecrement(&thread_pump->processing_count); continue; } @@ -908,6 +920,7 @@ static DWORD WINAPI proc_thread(void *arg) if (work_item->result) *work_item->result = hr; work_item_free(work_item, FALSE); + InterlockedDecrement(&thread_pump->processing_count); continue; } @@ -921,6 +934,7 @@ static DWORD WINAPI proc_thread(void *arg) list_add_tail(&thread_pump->device_queue, &work_item->entry); ++thread_pump->device_count; + InterlockedDecrement(&thread_pump->processing_count); ReleaseSRWLockExclusive(&thread_pump->device_lock); } return 0;

1 0

Piotr Caban : d3dx10/tests: Add D3DX10CreateThreadPump tests.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: a304924c61eac2dd2311160d30e24e61a3131de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a304924c61eac2dd2311160d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 15:14:34 2022 +0200 d3dx10/tests: Add D3DX10CreateThreadPump tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 373 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a304924c61eac2dd2311…

1 0

Nikolay Sivov : d2d1/effect: Support parsing vector3 property values.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 3c2ce1039c1e9e9f25ebf7f4cb56b8a508322ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2ce1039c1e9e9f25ebf7f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 15:40:52 2022 +0300 d2d1/effect: Support parsing vector3 property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7cfed6577c4..a2cb08ac873 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -360,6 +360,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * src = &_clsid; break; case D2D1_PROPERTY_TYPE_VECTOR2: + case D2D1_PROPERTY_TYPE_VECTOR3: if (FAILED(hr = d2d_effect_parse_vector_value(p->type, value, _vec))) { WARN("Failed to parse vector value %s.\n", wine_dbgstr_w(value)); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b7eab5003d7..f76ad185f3e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -58,6 +58,10 @@ L"<?xml version='1.0'?> \ <Property name='DisplayName' type='string' value='Vec2 prop'/> \ <Property name='Default' type='vector2' value='(1.0, 2.0)'/> \ </Property> \ + <Property name='Vec3Prop' type='vector3' value='(5.0, 6.0, 7.0)'> \ + <Property name='DisplayName' type='string' value='Vec3 prop'/> \ + <Property name='Default' type='vector3' value='(0.1, 0.2, 0.3)'/> \ + </Property> \ </Effect> \ "; @@ -11030,10 +11034,10 @@ static void test_effect_properties(BOOL d3d11) D2D1_PROPERTY_TYPE prop_type; struct d2d1_test_context ctx; ID2D1Factory1 *factory; + float vec2[2], vec3[3]; ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; - float vec2[2]; CLSID clsid; BOOL cached; HRESULT hr; @@ -11125,7 +11129,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Properties_Release(subproperties); - /* Vector2 property */ + /* Vector2 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Vec2Prop"); hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -11136,6 +11140,18 @@ static void test_effect_properties(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(vec2[0] == 3.0f && vec2[1] == 4.0f, "Unexpected vector (%.8e,%.8e).\n", vec2[0], vec2[1]); + /* Vector3 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Vec3Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Vec3Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_VECTOR3, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_VECTOR3, (BYTE *)vec3, sizeof(vec3)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(vec3[0] == 5.0f && vec3[1] == 6.0f && vec3[2] == 7.0f, "Unexpected vector (%.8e,%.8e,%.8e).\n", + vec3[0], vec3[1], vec3[2]); + ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect);

1 0

Piotr Caban : d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: a63f7b1c815123770b7e3c9a3faa0d7ddc61c66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63f7b1c815123770b7e3c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 21:02:53 2022 +0200 d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 8fc232681c5..667219b3500 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -845,10 +845,52 @@ static HRESULT WINAPI thread_pump_ProcessDeviceWorkItems(ID3DX10ThreadPump *ifac return S_OK; } +static void purge_list(struct list *list, LONG *count) +{ + struct work_item *work_item; + + while (!list_empty(list)) + { + work_item = LIST_ENTRY(list_head(list), struct work_item, entry); + list_remove(&work_item->entry); + work_item_free(work_item, TRUE); + + if (count && !InterlockedDecrement(count)) + RtlWakeAddressAll(count); + } +} + static HRESULT WINAPI thread_pump_PurgeAllItems(ID3DX10ThreadPump *iface) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + struct thread_pump *thread_pump = impl_from_ID3DX10ThreadPump(iface); + LONG v; + + TRACE("iface %p.\n", iface); + + for (;;) + { + AcquireSRWLockExclusive(&thread_pump->io_lock); + purge_list(&thread_pump->io_queue, &thread_pump->processing_count); + thread_pump->io_count = 0; + ReleaseSRWLockExclusive(&thread_pump->io_lock); + + AcquireSRWLockExclusive(&thread_pump->proc_lock); + purge_list(&thread_pump->proc_queue, &thread_pump->processing_count); + thread_pump->proc_count = 0; + ReleaseSRWLockExclusive(&thread_pump->proc_lock); + + AcquireSRWLockExclusive(&thread_pump->device_lock); + purge_list(&thread_pump->device_queue, NULL); + thread_pump->device_count = 0; + v = thread_pump->processing_count; + ReleaseSRWLockExclusive(&thread_pump->device_lock); + if (!v) + break; + + RtlWaitOnAddress(&thread_pump->processing_count, &v, sizeof(v), NULL); + } + + return S_OK; } static HRESULT WINAPI thread_pump_GetQueueStatus(ID3DX10ThreadPump *iface,

1 0

Nikolay Sivov : xmllite/reader: Use correct byte length when updating utf16 buffer contents marker.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: a49a2abff103193fae9cc26ebca2d69a6f8e41c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49a2abff103193fae9cc26e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 17:44:22 2022 +0300 xmllite/reader: Use correct byte length when updating utf16 buffer contents marker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d99f121e0cb..118b7bd5ea2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1030,7 +1030,7 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding { readerinput_grow(readerinput, len); memcpy(dest->data, src->data + src->cur, len); - dest->written += len*sizeof(WCHAR); + dest->written += len; } else { @@ -1084,7 +1084,7 @@ static HRESULT reader_more(xmlreader *reader) { readerinput_grow(readerinput, len); memcpy(dest->data + dest->written, src->data + src->cur, len); - dest->written += len*sizeof(WCHAR); + dest->written += len; } else {

1 0

Nikolay Sivov : d2d1/effect: Support parsing int32 property values.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 5f1f52cff265dd3154a01a58018094ec781b6cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f1f52cff265dd3154a01a58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 15:54:42 2022 +0300 d2d1/effect: Support parsing int32 property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 3 ++- dlls/d2d1/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 154b3c35a1b..2a980dd33a6 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -267,7 +267,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * 0, /* D2D1_PROPERTY_TYPE_STRING */ sizeof(BOOL), /* D2D1_PROPERTY_TYPE_BOOL */ sizeof(UINT32), /* D2D1_PROPERTY_TYPE_UINT32 */ - sizeof(INT32), /* D2D1_PROPERTY_TYPE_IN32 */ + sizeof(INT32), /* D2D1_PROPERTY_TYPE_INT32 */ sizeof(float), /* D2D1_PROPERTY_TYPE_FLOAT */ 2 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR2 */ 3 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR3 */ @@ -345,6 +345,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * switch (p->type) { case D2D1_PROPERTY_TYPE_UINT32: + case D2D1_PROPERTY_TYPE_INT32: case D2D1_PROPERTY_TYPE_ENUM: _uint32 = wcstoul(value, NULL, 10); src = &_uint32; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d796d738077..aa2e98aa22a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -50,6 +50,14 @@ L"<?xml version='1.0'?> \ <Property name='Max' type='uint32' value='100'/> \ <Property name='Default' type='uint32' value='10'/> \ </Property> \ + <Property name='Int32Prop' type='int32' value='-2'> \ + <Property name='DisplayName' type='string' value='Int32 prop'/> \ + <Property name='Default' type='int32' value='10'/> \ + </Property> \ + <Property name='UInt32Prop' type='uint32' value='-3'> \ + <Property name='DisplayName' type='string' value='UInt32 prop'/> \ + <Property name='Default' type='uint32' value='10'/> \ + </Property> \ <Property name='Bool' type='bool'> \ <Property name='DisplayName' type='string' value='Bool property'/> \ <Property name='Default' type='bool' value='false'/> \ @@ -11042,6 +11050,7 @@ static void test_effect_properties(BOOL d3d11) ID2D1Effect *effect; UINT32 count, data; WCHAR buffer[128]; + INT32 _int32; CLSID clsid; BOOL cached; HRESULT hr; @@ -11133,6 +11142,28 @@ static void test_effect_properties(BOOL d3d11) ID2D1Properties_Release(subproperties); + /* Int32 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"Int32Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Int32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_INT32, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&_int32, sizeof(_int32)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(_int32 == -2, "Unexpected value %d.\n", _int32); + + /* UInt32 property. */ + index = ID2D1Effect_GetPropertyIndex(effect, L"UInt32Prop"); + hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"UInt32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + prop_type = ID2D1Effect_GetType(effect, index); + ok(prop_type == D2D1_PROPERTY_TYPE_UINT32, "Unexpected type %u.\n", prop_type); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == -3, "Unexpected value %u.\n", integer); + /* Vector2 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"Vec2Prop"); hr = ID2D1Effect_GetPropertyName(effect, index, buffer, ARRAY_SIZE(buffer));

1 0

Piotr Caban : d3dx10/tests: Fix texture leak in check_resource_data.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 87e55084694762be4ccf551f0f8ca26840c753a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e55084694762be4ccf551f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 18 21:12:55 2022 +0200 d3dx10/tests: Fix texture leak in check_resource_data. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index c0c14ef592c..c9bdf90eaf4 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1237,7 +1237,7 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag ok_(__FILE__, line)(hr == S_OK, "Map failed, hr %#lx.\n", hr); if (hr != S_OK) { - ID3D10Texture2D_Unmap(readback, 0); + ID3D10Texture2D_Release(readback); return; } @@ -1253,6 +1253,7 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag } ID3D10Texture2D_Unmap(readback, 0); + ID3D10Texture2D_Release(readback); } static void test_D3DX10UnsetAllDeviceObjects(void) @@ -2078,7 +2079,7 @@ static void test_D3DX10CreateAsyncTextureProcessor(void) CoUninitialize(); - ID3D10Device_Release(device); + ok(!ID3D10Device_Release(device), "Unexpected refcount.\n"); } static void test_get_image_info(void) @@ -2433,7 +2434,7 @@ static void test_create_texture(void) CoUninitialize(); - ID3D10Device_Release(device); + ok(!ID3D10Device_Release(device), "Unexpected refcount.\n"); } #define check_rect(rect, left, top, right, bottom) _check_rect(__LINE__, rect, left, top, right, bottom)

1 0

Matteo Bruni : d3dx10/tests: Add a couple D3DX10CreateAsyncTextureInfoProcessor() parameter tests.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 89110d1e4c99e3d50378d4137c04f60a8a312029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89110d1e4c99e3d50378d413… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 6 13:54:42 2022 +0200 d3dx10/tests: Add a couple D3DX10CreateAsyncTextureInfoProcessor() parameter tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 1c28a62b700..b70dbb5b44f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1972,6 +1972,22 @@ static void test_D3DX10CreateAsyncTextureInfoProcessor(void) hr = D3DX10CreateAsyncTextureInfoProcessor(NULL, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateAsyncTextureInfoProcessor(&info, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureInfoProcessor(NULL, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (0) + { + /* Crashes on native. */ + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[0].data, test_image[0].size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateAsyncTextureInfoProcessor(&info, &dp); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Eric Pouech : d3dx10/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 07be1c30e57bbdb5b3d17bd84d69806ec938b960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07be1c30e57bbdb5b3d17bd8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 09:37:59 2022 +0100 d3dx10/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_34/tests/Makefile.in | 2 +- dlls/d3dx10_35/tests/Makefile.in | 2 +- dlls/d3dx10_36/tests/Makefile.in | 2 +- dlls/d3dx10_37/tests/Makefile.in | 2 +- dlls/d3dx10_38/tests/Makefile.in | 2 +- dlls/d3dx10_39/tests/Makefile.in | 2 +- dlls/d3dx10_40/tests/Makefile.in | 2 +- dlls/d3dx10_41/tests/Makefile.in | 2 +- dlls/d3dx10_42/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 538 +++++++++++++++++++-------------------- 11 files changed, 279 insertions(+), 279 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07be1c30e57bbdb5b3d1…

1 0