diff --git a/dlls/user/edit.c b/dlls/user/edit.c
index 0d2ac38e7cb..80bafcaebff 100644
--- a/dlls/user/edit.c
+++ b/dlls/user/edit.c
@@ -1330,11 +1330,7 @@ static void EDIT_CalcLineWidth_SL(EDITSTATE *es)
  */
 static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count, INT action)
 {
-    INT ret, iWndsLocks;
-
-    /* To avoid any deadlocks, all the locks on the window structures
-       must be suspended before the control is passed to the application */
-    iWndsLocks = WIN_SuspendWndsLock();
+	INT ret;
 
 	if (es->word_break_proc16) {
 	    HGLOBAL16 hglob16;
@@ -1385,8 +1381,7 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count
 	else
             ret = EDIT_WordBreakProc(es->text + start, index, count, action);
 
-    WIN_RestoreWndsLock(iWndsLocks);
-    return ret;
+	return ret;
 }
 
 
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index fe3c8387721..4624a84745f 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -740,8 +740,6 @@
 @ cdecl WIN_ListChildren(long)
 @ cdecl WIN_ListParents(long)
 @ cdecl WIN_ReleaseWndPtr(ptr)
-@ cdecl WIN_RestoreWndsLock(long)
 @ cdecl WIN_SetExStyle(long long)
 @ cdecl WIN_SetStyle(long long)
-@ cdecl WIN_SuspendWndsLock()
 @ cdecl WIN_UnlinkWindow(long)
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index cd34d186f9e..a450136694c 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -1743,7 +1743,6 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
     DWORD     dwPoint = GetMessagePos ();
     BOOL DragFullWindows = FALSE;
     BOOL grab;
-    int iWndsLocks;
     Display *old_gdi_display = NULL;
     Display *display = thread_display();
 
@@ -1953,16 +1952,11 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
                 {
                     if(!DragFullWindows)
                         draw_moving_frame( hdc, &newRect, thickframe );
-                    else {
-                        /* To avoid any deadlocks, all the locks on the windows
-			   structures must be suspended before the SetWindowPos */
-                        iWndsLocks = WIN_SuspendWndsLock();
+                    else
                         SetWindowPos( hwnd, 0, newRect.left, newRect.top,
                                       newRect.right - newRect.left,
                                       newRect.bottom - newRect.top,
                                       ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
-                        WIN_RestoreWndsLock(iWndsLocks);
-                    }
                 }
                 sizingRect = newRect;
             }
@@ -2003,10 +1997,6 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
     /* window moved or resized */
     if (moved)
     {
-        /* To avoid any deadlocks, all the locks on the windows
-	   structures must be suspended before the SetWindowPos */
-        iWndsLocks = WIN_SuspendWndsLock();
-
         /* if the moving/resizing isn't canceled call SetWindowPos
          * with the new position or the new size of the window
          */
@@ -2027,8 +2017,6 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
                               origRect.bottom - origRect.top,
                               ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
         }
-
-        WIN_RestoreWndsLock(iWndsLocks);
     }
 
     if (IsIconic(hwnd))