October 2021 - Wine-commits

Zhiyi Zhang : user32: Change the position and size of layered windows before flushing their surfaces.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 8892b79118fde5f2307ecbbdb03a8d0c489c8b3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8892b79118fde5f2307ecbbd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:07:59 2021 +0800 user32: Change the position and size of layered windows before flushing their surfaces. When UpdateLayeredWindow() is called to paint a window and update its size, USER_Driver->pUpdateLayeredWindow() needs to be called after the window position and size are updated. Otherwise, UpdateLayeredWindow() may flush the painted content to a smaller window and then enlarge it, losing the painted result. Fix Word 2016 window frame corruption after restoring from maximized state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e07b7d39e4b..4d0240f21a8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4134,10 +4134,8 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - return TRUE; + return USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect ); }

1 0

Michael Stefaniuc : dinput: Avoid negating FAILED().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 1431608e6121cc437f265d8d606f2cd94e848a7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1431608e6121cc437f265d8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 19 22:54:33 2021 +0200 dinput: Avoid negating FAILED(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc43c450e4..24d00bf2c11 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2619,7 +2619,7 @@ static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWOR hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((flags & DIES_NODOWNLOAD) && !impl->index) hr = DIERR_NOTDOWNLOADED; - else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + else if ((flags & DIES_NODOWNLOAD) || SUCCEEDED(hr = IDirectInputEffect_Download( iface ))) { count = 1; status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, @@ -2764,7 +2764,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && !FAILED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) { if (!impl->type_specific_buf[0][0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -2929,7 +2929,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) EnterCriticalSection( &joystick->base.crit ); if (!impl->index) hr = DI_NOEFFECT; - else if (!FAILED(hr = IDirectInputEffect_Stop( iface ))) + else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { impl->joystick->effect_inuse[impl->index - 1] = FALSE; impl->index = 0;

1 0

Simon McVittie : winebus.sys: Treat udev actions other than "remove" as "add".
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 22dae167d326036ef3b91eb1d5c45acdaa89eb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dae167d326036ef3b91eb1… Author: Simon McVittie <smcv(a)collabora.com> Date: Wed Oct 20 11:07:26 2021 +0200 winebus.sys: Treat udev actions other than "remove" as "add". As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1dfce05e4bc..57e5a169a69 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1404,16 +1404,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); }

1 0

Jan Sikorski : dxgi: Don't grab wined3d lock for wined3d_decref().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 6d8cc776f568d31ef37731971385ca459eaf5fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d8cc776f568d31ef3773197… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:22 2021 +0200 dxgi: Don't grab wined3d lock for wined3d_decref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index af18bdd2c32..4c3e3cf0f34 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -80,9 +80,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) if (factory->device_window) DestroyWindow(factory->device_window); - wined3d_mutex_lock(); wined3d_decref(factory->wined3d); - wined3d_mutex_unlock(); wined3d_private_store_cleanup(&factory->private_store); heap_free(factory); }

1 0

Jan Sikorski : d3d8: Don't grab wined3d lock for wined3d_resource_map/unmap().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 154f612cd9b503d2de61c708a15a41be4a65385f URL: https://source.winehq.org/git/wine.git/?a=commit;h=154f612cd9b503d2de61c708… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:23 2021 +0200 d3d8: Don't grab wined3d lock for wined3d_resource_map/unmap(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 8 -------- dlls/d3d8/surface.c | 2 -- dlls/d3d8/volume.c | 4 ---- 3 files changed, 14 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 9eb98bfc2f2..6ab21512472 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -198,11 +198,9 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT wined3d_box.left = offset; wined3d_box.right = offset + size; - wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); - wined3d_mutex_unlock(); *data = wined3d_map_desc.data; return hr; @@ -214,9 +212,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); return D3D_OK; } @@ -529,11 +525,9 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o wined3d_box.left = offset; wined3d_box.right = offset + size; - wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); - wined3d_mutex_unlock(); *data = wined3d_map_desc.data; return hr; @@ -545,9 +539,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); return D3D_OK; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index c3d28efba20..5fd8cf4d44b 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -269,9 +269,7 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); - wined3d_mutex_unlock(); if (hr == WINEDDERR_NOTLOCKED) { diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 9dc68e850d4..6d0d6f7cb22 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -144,12 +144,10 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", iface, locked_box, box, flags); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, wined3dmapflags_from_d3dmapflags(flags, 0)))) map_desc.data = NULL; - wined3d_mutex_unlock(); locked_box->RowPitch = map_desc.row_pitch; locked_box->SlicePitch = map_desc.slice_pitch; @@ -167,9 +165,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx); - wined3d_mutex_unlock(); if (hr == WINEDDERR_NOTLOCKED) return D3DERR_INVALIDCALL;

1 0

Jan Sikorski : d3d8: Don't grab wined3d lock in vertex/indexbuffer AddRef/Release().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 0ceabaae80afb9b9d4bc21897604acf5c3839ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ceabaae80afb9b9d4bc2189… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:24 2021 +0200 d3d8: Don't grab wined3d lock in vertex/indexbuffer AddRef/Release(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 6ab21512472..0692dbde6e7 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -54,12 +54,10 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) if (refcount == 1) { IDirect3DDevice8_AddRef(buffer->parent_device); - wined3d_mutex_lock(); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); else wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; @@ -77,12 +75,10 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; - wined3d_mutex_lock(); if (draw_buffer) wined3d_buffer_decref(draw_buffer); else wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice8_Release(device); @@ -381,12 +377,10 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface) if (refcount == 1) { IDirect3DDevice8_AddRef(buffer->parent_device); - wined3d_mutex_lock(); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); else wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; @@ -404,12 +398,10 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; - wined3d_mutex_lock(); if (draw_buffer) wined3d_buffer_decref(draw_buffer); else wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice8_Release(device);

1 0

Jan Sikorski : d3d8: Don't grab wined3d lock in surface AddRef/Release().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 98e2fd376aab32a9d1a8a926c3bcd9866aee29e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98e2fd376aab32a9d1a8a926… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:25 2021 +0200 d3d8: Don't grab wined3d lock in surface AddRef/Release(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 5fd8cf4d44b..62c3a429ba6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -66,11 +66,9 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface) { if (surface->parent_device) IDirect3DDevice8_AddRef(surface->parent_device); - wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); wined3d_texture_incref(surface->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -102,11 +100,9 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface) { IDirect3DDevice8 *parent_device = surface->parent_device; - wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); wined3d_texture_decref(surface->wined3d_texture); - wined3d_mutex_unlock(); if (parent_device) IDirect3DDevice8_Release(parent_device);

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for wined3d_resource_map/unmap().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: c9b5e2a7c1c0c5b1dda3b291d41caa98cf551df5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b5e2a7c1c0c5b1dda3b291… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:26 2021 +0200 d3d9: Don't grab wined3d lock for wined3d_resource_map/unmap(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 8 -------- dlls/d3d9/surface.c | 2 -- dlls/d3d9/volume.c | 4 ---- 3 files changed, 14 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 07bdfa9320e..901557c288f 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -199,11 +199,9 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); - wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); - wined3d_mutex_unlock(); *data = wined3d_map_desc.data; return hr; @@ -215,9 +213,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Unlock(IDirect3DVertexBuffer9 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); return D3D_OK; } @@ -535,11 +531,9 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); - wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); - wined3d_mutex_unlock(); *data = wined3d_map_desc.data; return hr; @@ -551,9 +545,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Unlock(IDirect3DIndexBuffer9 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); return D3D_OK; } diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index d4738d2ca9f..2ff5134781e 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -246,10 +246,8 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, if (rect) wined3d_box_set(&box, rect->left, rect->top, rect->right, rect->bottom, 0, 1); - wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags, 0)); - wined3d_mutex_unlock(); if (SUCCEEDED(hr)) { diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 39caa8fb08e..e8091aec7a5 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -144,12 +144,10 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", iface, locked_box, box, flags); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, wined3dmapflags_from_d3dmapflags(flags, 0)))) map_desc.data = NULL; - wined3d_mutex_unlock(); locked_box->RowPitch = map_desc.row_pitch; locked_box->SlicePitch = map_desc.slice_pitch; @@ -167,9 +165,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx); - wined3d_mutex_unlock(); if (hr == WINEDDERR_NOTLOCKED) return D3DERR_INVALIDCALL;

1 0

Jan Sikorski : d3d8: Don't grab wined3d lock for wined3d_vertex_declaration_decref().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 93992c760d8f4268e819ad32f944521fa4d4709c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93992c760d8f4268e819ad32… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:27 2021 +0200 d3d8: Don't grab wined3d lock for wined3d_vertex_declaration_decref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/vertexdeclaration.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index d0e733b9e37..e63e379444e 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -319,9 +319,7 @@ void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration { TRACE("declaration %p.\n", declaration); - wined3d_mutex_lock(); wined3d_vertex_declaration_decref(declaration->wined3d_vertex_declaration); - wined3d_mutex_unlock(); } static const struct wined3d_parent_ops d3d8_vertexdeclaration_wined3d_parent_ops =

1 0

Zebediah Figura : d3d10core/tests: Test deleting a stream output buffer immediately after drawing into it.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 2b30a5b47e4d8f21a15a67cf27ccb425149f63a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b30a5b47e4d8f21a15a67cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 18 11:02:00 2021 -0500 d3d10core/tests: Test deleting a stream output buffer immediately after drawing into it. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c1178749345..85e453c8474 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15504,8 +15504,8 @@ static void test_stream_output(void) static void test_stream_output_resume(void) { + ID3D10Buffer *cb, *so_buffer, *so_buffer2, *buffer; struct d3d10core_test_context test_context; - ID3D10Buffer *cb, *so_buffer, *buffer; unsigned int i, j, idx, offset; struct resource_readback rb; ID3D10GeometryShader *gs; @@ -15582,16 +15582,22 @@ static void test_stream_output_resume(void) cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constants[0]), &constants[0]); so_buffer = create_buffer(device, D3D10_BIND_STREAM_OUTPUT, 1024, NULL); + so_buffer2 = create_buffer(device, D3D10_BIND_STREAM_OUTPUT, 1024, NULL); ID3D10Device_GSSetShader(device, gs); ID3D10Device_GSSetConstantBuffers(device, 0, 1, &cb); - offset = 0; - ID3D10Device_SOSetTargets(device, 1, &so_buffer, &offset); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); check_texture_color(test_context.backbuffer, 0xffffffff, 0); + /* Draw into a SO buffer and then immediately destroy it, to make sure that + * wined3d doesn't try to rebind transform feedback buffers while transform + * feedback is active. */ + offset = 0; + ID3D10Device_SOSetTargets(device, 1, &so_buffer2, &offset); + draw_color_quad(&test_context, &red); + ID3D10Device_SOSetTargets(device, 1, &so_buffer, &offset); + ID3D10Buffer_Release(so_buffer2); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xff0000ff, 0);

1 0