Ivan Gyurdiev : wined3d: D3DLOCK: Use consistently in the WINED3D namespace .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 74cd90a18abbd049937b507574a753f18f9cd1c7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=74cd90a18abbd049937b507574...

Author: Ivan Gyurdiev 
Date:   Tue Oct 24 06:02:30 2006 -0400

wined3d: D3DLOCK: Use consistently in the WINED3D namespace.

---

dlls/wined3d/surface_gdi.c  |    4 ++--
 dlls/wined3d/vertexbuffer.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index 1e797d3..c316fd8 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -541,7 +541,7 @@ #endif
     {
         if (Src)
         {
-            IWineD3DSurface_LockRect(SrcSurface, &slock, NULL, D3DLOCK_READONLY);
+            IWineD3DSurface_LockRect(SrcSurface, &slock, NULL, WINED3DLOCK_READONLY);
             sfmt = Src->resource.format;
         }
         sEntry = getFormatDescEntry(sfmt);
@@ -1220,7 +1220,7 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurf
     }
     else
     {
-        ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, D3DLOCK_READONLY);
+        ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, WINED3DLOCK_READONLY);
         if(ret != D3D_OK) goto error;
         ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_dst, 0);
         if(ret != D3D_OK) goto error;
diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c
index 84d184c..aeccdab 100644
--- a/dlls/wined3d/vertexbuffer.c
+++ b/dlls/wined3d/vertexbuffer.c
@@ -451,9 +451,9 @@ static HRESULT  WINAPI IWineD3DVertexBuf

TRACE("Locking directly into the buffer\n");

-        if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & D3DLOCK_DISCARD) ) {
+        if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & WINED3DLOCK_DISCARD) ) {
             mode = GL_WRITE_ONLY_ARB;
-        } else if( Flags & (D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE) ) {
+        } else if( Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) ) {
             mode = GL_READ_ONLY_ARB;
         }