[Wine-patches] [eterhack] user32: Fix merge with wine-1.7.47.

[Dmitry Timoshkov]

---
 dlls/user32/driver.c | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 5560964..0e0124c 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -745,32 +745,6 @@ static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT
     load_driver()->pGetDC( hdc, hwnd, top_win, win_rect, top_rect, flags );
 }
 
-static DWORD CDECL loaderdrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
-                                                          DWORD mask, DWORD flags )
-{
-    return load_driver()->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags );
-}
-
-static void CDECL loaderdrv_ReleaseDC( HWND hwnd, HDC hdc )
-{
-    load_driver()->pReleaseDC( hwnd, hdc );
-}
-
-static BOOL CDECL loaderdrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
-{
-    return load_driver()->pScrollDC( hdc, dx, dy, update );
-}
-
-static void CDECL loaderdrv_SetCapture( HWND hwnd, UINT flags )
-{
-    load_driver()->pSetCapture( hwnd, flags );
-}
-
-static void CDECL loaderdrv_SetFocus( HWND hwnd )
-{
-    load_driver()->pSetFocus( hwnd );
-}
-
 static void CDECL loaderdrv_DropWindow( HWND hwnd )
 {
     load_driver()->pDropWindow( hwnd );
@@ -833,11 +807,11 @@ static USER_DRIVER lazy_load_driver =
     loaderdrv_CreateWindow,
     nulldrv_DestroyWindow,
     loaderdrv_GetDC,
-    loaderdrv_MsgWaitForMultipleObjectsEx,
-    loaderdrv_ReleaseDC,
-    loaderdrv_ScrollDC,
-    loaderdrv_SetCapture,
-    loaderdrv_SetFocus,
+    nulldrv_MsgWaitForMultipleObjectsEx,
+    nulldrv_ReleaseDC,
+    nulldrv_ScrollDC,
+    nulldrv_SetCapture,
+    nulldrv_SetFocus,
     loaderdrv_DropWindow,
     loaderdrv_SetLayeredWindowAttributes,
     nulldrv_SetParent,
-- 
2.6.3