- Wine-devel - list.winehq.org

[PATCH 0/3] MR332: d3dx10: Support creating effect from pre-built shader
by Andrew Eikum (＠aeikum) 01 Jul '22

01 Jul '22

Note this will probably fail on the testbot due to #53201 without Piotr's series !272 . -- https://gitlab.winehq.org/wine/wine/-/merge_requests/332

5 18

Re: [PATCH v2 0/1] MR346: winex11.drv: Use a global Vulkan instance in X11DRV_D3DKMTOpenAdapterFromLuid(). - approved
by Alexandre Julliard (＠julliard) 01 Jul '22

01 Jul '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/346

1 0

Re: [PATCH v2 0/4] MR356: wineusb: PE conversion - approved
by Alexandre Julliard (＠julliard) 01 Jul '22

01 Jul '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/356

1 0

Re: [PATCH v2 0/1] MR357: d2d1/tests: Add some tests for enum property structure. - approved
by Alexandre Julliard (＠julliard) 01 Jul '22

01 Jul '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/357

1 0

Re: [PATCH v6 0/11] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.
by Matteo Bruni (＠Mystral) 01 Jul '22

01 Jul '22

Pushed again to fix the sign-off for patch 2... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/272#note_3129

1 0

[PATCH v5 0/11] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.
by Piotr Caban (＠piotr) 01 Jul '22

01 Jul '22

The GetWorkItemCount implementation may look strange. It's done this way because of how WaitForAllItems is implemented. Alternative solution is to introduce separate counter for GetWorkItemCount. -- v5: d3dx10/tests: Add D3DX10CreateThreadPump tests. d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation. d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation. d3dx10: Add ID3DX10ThreadPump:WaitForAllItems implementation. d3dx10: Add ID3DX10ThreadPump:ProcessDeviceWorkItems implementation. d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation. d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation. d3dx10: Add D3DX10CreateThreadPump stub. d3dx10/tests: Fix texture leak in check_resource_data. d3dx10/tests: Build without -DWINE_NO_LONG_TYPES. d3dx10/tests: Add a couple D3DX10CreateAsyncTextureInfoProcessor() parameter tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/272

5 12

[PATCH 1/7] msvcr120/tests: Add test for canceling running chores.
by Torge Matthies 01 Jul '22

01 Jul '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 53 ++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 26b363de6c59..88a32b382ef7 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -250,6 +250,8 @@ static _StructuredTaskCollection* (__thiscall *p__StructuredTaskCollection_ctor) static void (__thiscall *p__StructuredTaskCollection_dtor)(_StructuredTaskCollection*); static void (__thiscall *p__StructuredTaskCollection__Schedule)(_StructuredTaskCollection*, _UnrealizedChore*); static int (__stdcall *p__StructuredTaskCollection__RunAndWait)(_StructuredTaskCollection*, _UnrealizedChore*); +static void (__thiscall *p__StructuredTaskCollection__Cancel)(_StructuredTaskCollection*); +static MSVCRT_bool (__thiscall *p__StructuredTaskCollection__IsCanceling)(_StructuredTaskCollection*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -313,6 +315,10 @@ static BOOL init(void) "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z"); SET(p__StructuredTaskCollection__RunAndWait, "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); SET(p_critical_section_dtor, @@ -355,6 +361,10 @@ static BOOL init(void) "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z"); SET(p__StructuredTaskCollection__RunAndWait, "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAA(a)XZ"); SET(p_critical_section_dtor, @@ -394,6 +404,10 @@ static BOOL init(void) "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z"); SET(p__StructuredTaskCollection__RunAndWait, "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAE(a)XZ"); SET(p_critical_section_dtor, @@ -1334,6 +1348,7 @@ struct chore HANDLE set_event; HANDLE wait_event; DWORD main_tid; + BOOL check_canceling; }; static void __cdecl chore_proc(_UnrealizedChore *_this) @@ -1355,6 +1370,14 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) GetCurrentThreadId(), chore->main_tid); } + if (chore->check_canceling) + { + MSVCRT_bool canceling = call_func1( + p__StructuredTaskCollection__IsCanceling, + chore->chore.task_collection); + ok(!canceling, "Task is already canceling"); + } + if (!chore->wait_event) chore->executed = TRUE; @@ -1370,6 +1393,14 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); chore->executed = TRUE; } + + if (chore->check_canceling) + { + MSVCRT_bool canceling = call_func1( + p__StructuredTaskCollection__IsCanceling, + chore->chore.task_collection); + ok(canceling, "Task is not canceling"); + } } static void chore_ctor(struct chore *chore) @@ -1533,6 +1564,28 @@ static void test_StructuredTaskCollection(void) ok(chore1.executed, "Chore was not executed\n"); call_func1(p__StructuredTaskCollection_dtor, &task_coll); + /* test that running chores can be canceled */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.check_canceling = TRUE; + chore1.wait_event = chore_evt2; + chore1.set_event = chore_evt1; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + + ret = WaitForSingleObject(chore_evt1, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + + call_func1(p__StructuredTaskCollection__Cancel, &task_coll); + + b = SetEvent(chore_evt2); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + CloseHandle(chore_start_evt); CloseHandle(chore_evt1); CloseHandle(chore_evt2); -- 2.37.0

1 6

[PATCH v6 1/4] mfplat/buffer: Deduplicate common code between Lock2D() and Lock2DSize().
by Giovanni Mascellani 01 Jul '22

01 Jul '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the trace in memory_2d_buffer_Lock2D() v3: * Redirect all invocations to helper functions. v4: * Rework helper functions. v6: (sorry for these silly mistakes...) * Remove a LeaveCriticalSection() too much. * Consistently use _lock suffix --- dlls/mfplat/buffer.c | 101 +++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a7ba306223d..e3d38438b88 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -655,18 +655,11 @@ static const IMF2DBuffer2Vtbl memory_2d_buffer_vtbl = memory_2d_buffer_Copy2DTo, }; -static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +static HRESULT d3d9_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFlags flags, BYTE **scanline0, + LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; else if (!buffer->_2d.locks) @@ -679,8 +672,29 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->d3d9_surface.rect.Pitch * buffer->_2d.height; } + return hr; +} + +static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +{ + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr; + + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + if (!scanline0 || !pitch) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + hr = d3d9_surface_buffer_lock(buffer, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, NULL, NULL); + LeaveCriticalSection(&buffer->cs); return hr; @@ -744,7 +758,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; + HRESULT hr; TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); @@ -753,23 +767,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks) - { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); - } - - if (SUCCEEDED(hr)) - { - buffer->_2d.locks++; - *scanline0 = buffer->d3d9_surface.rect.pBits; - *pitch = buffer->d3d9_surface.rect.Pitch; - if (buffer_start) - *buffer_start = *scanline0; - if (buffer_length) - *buffer_length = buffer->d3d9_surface.rect.Pitch * buffer->_2d.height; - } + hr = d3d9_surface_buffer_lock(buffer, flags, scanline0, pitch, buffer_start, buffer_length); LeaveCriticalSection(&buffer->cs); @@ -1030,18 +1028,11 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface return S_OK; } -static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFlags flags, + BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; else if (!buffer->_2d.locks++) @@ -1051,8 +1042,29 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca { *scanline0 = buffer->dxgi_surface.map_desc.pData; *pitch = buffer->dxgi_surface.map_desc.RowPitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; } + return hr; +} + +static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +{ + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr; + + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + if (!scanline0 || !pitch) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + hr = dxgi_surface_buffer_lock(buffer, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, NULL, NULL); + LeaveCriticalSection(&buffer->cs); return hr; @@ -1113,7 +1125,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; + HRESULT hr; TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); @@ -1122,20 +1134,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) - hr = dxgi_surface_buffer_map(buffer); - - if (SUCCEEDED(hr)) - { - *scanline0 = buffer->dxgi_surface.map_desc.pData; - *pitch = buffer->dxgi_surface.map_desc.RowPitch; - if (buffer_start) - *buffer_start = *scanline0; - if (buffer_length) - *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; - } + hr = dxgi_surface_buffer_lock(buffer, flags, scanline0, pitch, buffer_start, buffer_length); LeaveCriticalSection(&buffer->cs); -- 2.36.1

3 9

[PATCH 0/5] MR355: win32u: Move more display mode logic out of graphics drivers.
by Rémi Bernon 01 Jul '22

01 Jul '22

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

2 14

[PATCH 0/1] MR357: d2d1/tests: Add some tests for enum property structure.
by Nikolay Sivov (＠nsivov) 01 Jul '22

01 Jul '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/357

2 1