Sebastian Lackner : ddraw: Remove unused code for ChangeUniquenessValue.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 3 09:42:11 CST 2015
Module: wine
Branch: master
Commit: 68528519fc203879132a74205b11cc9a0cfdd784
URL: http://source.winehq.org/git/wine.git/?a=commit;h=68528519fc203879132a74205b11cc9a0cfdd784
Author: Sebastian Lackner <sebastian at fds-team.de>
Date: Tue Mar 3 05:09:56 2015 +0100
ddraw: Remove unused code for ChangeUniquenessValue.
---
dlls/ddraw/ddraw_private.h | 1 -
dlls/ddraw/surface.c | 31 +------------------------------
2 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index a2eee1a..4a883b9 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -183,7 +183,6 @@ struct ddraw_surface
DDSURFACEDESC2 surface_desc;
/* Misc things */
- DWORD uniqueness_value;
UINT mipmap_level;
/* Clipper objects */
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 331d2bb..cbf11da 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -3886,35 +3886,10 @@ static HRESULT WINAPI ddraw_surface2_GetDDInterface(IDirectDrawSurface2 *iface,
return ddraw_surface7_GetDDInterface(&surface->IDirectDrawSurface7_iface, ddraw);
}
-/* This seems also windows implementation specific - I don't think WineD3D needs this */
static HRESULT WINAPI ddraw_surface7_ChangeUniquenessValue(IDirectDrawSurface7 *iface)
{
- struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface);
- volatile struct ddraw_surface* vThis = This;
-
TRACE("iface %p.\n", iface);
- wined3d_mutex_lock();
- /* A uniqueness value of 0 is apparently special.
- * This needs to be checked.
- * TODO: Write tests for this code and check if the volatile, interlocked stuff is really needed
- */
- while (1) {
- DWORD old_uniqueness_value = vThis->uniqueness_value;
- DWORD new_uniqueness_value = old_uniqueness_value+1;
-
- if (old_uniqueness_value == 0) break;
- if (new_uniqueness_value == 0) new_uniqueness_value = 1;
-
- if (InterlockedCompareExchange((LONG*)&vThis->uniqueness_value,
- old_uniqueness_value,
- new_uniqueness_value)
- == old_uniqueness_value)
- break;
- }
-
- wined3d_mutex_unlock();
-
return DD_OK;
}
@@ -3929,13 +3904,9 @@ static HRESULT WINAPI ddraw_surface4_ChangeUniquenessValue(IDirectDrawSurface4 *
static HRESULT WINAPI ddraw_surface7_GetUniquenessValue(IDirectDrawSurface7 *iface, DWORD *pValue)
{
- struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
-
TRACE("iface %p, value %p.\n", iface, pValue);
- wined3d_mutex_lock();
- *pValue = surface->uniqueness_value;
- wined3d_mutex_unlock();
+ *pValue = 0;
return DD_OK;
}
More information about the wine-cvs
mailing list