Support for device surface locking.

dlls/ddraw/d3d_private.h

@@ -244,6 +244,7 @@ struct IDirect3DDeviceImpl
     void (*matrices_updated)(IDirect3DDeviceImpl *This, DWORD matrices);
     void (*set_matrices)(IDirect3DDeviceImpl *This, DWORD matrices,
 			 D3DMATRIX *world_mat, D3DMATRIX *view_mat, D3DMATRIX *proj_mat);
+    void (*flush_to_framebuffer)(IDirect3DDeviceImpl *This, LPCRECT pRect);
 
     STATEBLOCK state_block;
 

dlls/ddraw/d3dexecutebuffer.c

@@ -207,6 +207,11 @@ static void execute(IDirect3DExecuteBufferImpl *This,
 
     ENTER_GL();
     
+    if (((IDirect3DDeviceGLImpl *) lpDevice)->state == SURFACE_MEMORY) {
+        lpDevice->flush_to_framebuffer(lpDevice, NULL);
+    }
+    ((IDirect3DDeviceGLImpl *) lpDevice)->state = SURFACE_GL;
+    
     while (1) {
         LPD3DINSTRUCTION current = (LPD3DINSTRUCTION) instr;
 	BYTE size;

dlls/ddraw/ddraw_private.h

@@ -303,6 +303,8 @@ struct IDirectDrawSurfaceImpl
     IDirectDrawSurfaceImpl *mip_main;
     int mipmap_level;
     LPVOID tex_private;
+    void (*lock_update_prev)(IDirectDrawSurfaceImpl* This, LPCRECT pRect, DWORD dwFlags);
+    void (*unlock_update_prev)(IDirectDrawSurfaceImpl* This, LPCRECT pRect);
 };
 
 /*****************************************************************************

dlls/ddraw/mesa_private.h

@@ -95,6 +95,11 @@ typedef enum {
     GL_TRANSFORM_VERTEXBUFFER
 } GL_TRANSFORM_STATE;
 
+typedef enum {
+    SURFACE_GL,
+    SURFACE_MEMORY
+} SURFACE_STATE;
+
 typedef struct IDirect3DDeviceGLImpl
 {
     struct IDirect3DDeviceImpl parent;
@@ -111,6 +116,9 @@ typedef struct IDirect3DDeviceGLImpl
     
     Display  *display;
     Drawable drawable;
+
+    GLuint unlock_tex;
+    SURFACE_STATE state, front_state;
 } IDirect3DDeviceGLImpl;
 
 /* This is for the OpenGL additions... */