wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Zhiyi Zhang : winex11.drv: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 2adf4376d86119b8a6f7cde51c9a972564575bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adf4376d86119b8a6f7cde5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:47 2021 +0800 winex11.drv: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 57091522078..7f03f94db90 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -434,7 +434,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) {

1 0

Zhiyi Zhang : winemac.drv: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: bb5b1d75546ed16ce548f60facd0d09c81b5a20d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5b1d75546ed16ce548f60f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:37 2021 +0800 winemac.drv: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4a3b1ff39cb..99c852d7ffe 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1475,7 +1475,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) {

1 0

Zhiyi Zhang : uxtheme: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 9314b59a7d591382b694bc651e563cfff37af664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9314b59a7d591382b694bc65… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:25 2021 +0800 uxtheme: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 18b93435e4c..628bd9bfdc4 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -85,7 +85,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, LPVOID pvData) { - DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; + DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen; TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), pvData); @@ -147,7 +147,7 @@ static void UXTHEME_LoadTheme(void) /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = ARRAY_SIZE(tmp); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, L"ThemeActive", NULL, NULL, (BYTE*)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -155,10 +155,10 @@ static void UXTHEME_LoadTheme(void) bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = ARRAY_SIZE(szCurrentColor); + buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = ARRAY_SIZE(szCurrentSize); + buffsize = sizeof(szCurrentSize); if (RegQueryValueExW(hKey, L"SizeName", NULL, NULL, (BYTE*)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, L"DllName", szCurrentTheme))

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

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 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 : 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 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 : 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 : dxgi: Don't grab wined3d lock for wined3d_resource_map/unmap().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 98e2668949f8a75be56891593103942f23a2cc56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98e2668949f8a75be5689159… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:21 2021 +0200 dxgi: 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/dxgi/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4b1b83b84a9..ad2c0d7ff1e 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -196,14 +196,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAP if (flags & DXGI_MAP_DISCARD) wined3d_map_flags |= WINED3D_MAP_DISCARD; - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, &wined3d_map_desc, NULL, wined3d_map_flags))) { mapped_rect->Pitch = wined3d_map_desc.row_pitch; mapped_rect->pBits = wined3d_map_desc.data; } - wined3d_mutex_unlock(); return hr; } @@ -213,11 +211,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); - wined3d_mutex_unlock(); - return S_OK; }

1 0

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 October 2021