Moved dsurface object files to ddraw root dir.

configure

@@ -20053,8 +20053,6 @@ esac
 
           ac_config_commands="$ac_config_commands dlls/ddraw/direct3d"
 
-          ac_config_commands="$ac_config_commands dlls/ddraw/dsurface"
-
           ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv"
 
           ac_config_commands="$ac_config_commands dlls/gdi/mfdrv"
@@ -20882,7 +20880,6 @@ do
   "tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;;
   "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;;
   "dlls/ddraw/direct3d" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/direct3d" ;;
-  "dlls/ddraw/dsurface" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dsurface" ;;
   "dlls/gdi/enhmfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
   "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
   "dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;;
@@ -21677,8 +21674,6 @@ echo "$as_me: executing $ac_dest commands" >&6;}
 echo "$as_me: creating dlls/ddraw/d3ddevice" >&6;} && mkdir "dlls/ddraw/d3ddevice") ;;
     dlls/ddraw/direct3d ) test -d "dlls/ddraw/direct3d" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/direct3d" >&5
 echo "$as_me: creating dlls/ddraw/direct3d" >&6;} && mkdir "dlls/ddraw/direct3d") ;;
-    dlls/ddraw/dsurface ) test -d "dlls/ddraw/dsurface" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/dsurface" >&5
-echo "$as_me: creating dlls/ddraw/dsurface" >&6;} && mkdir "dlls/ddraw/dsurface") ;;
     dlls/gdi/enhmfdrv ) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5
 echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;;
     dlls/gdi/mfdrv ) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5

configure.ac

@@ -1509,7 +1509,6 @@ AH_TOP([#define __WINE_CONFIG_H])
 
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/d3ddevice)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/direct3d)
-WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dsurface)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)

dlls/ddraw/Makefile.in

@@ -30,18 +30,18 @@ C_SRCS = \
 	ddraw_thunks.c \
 	ddraw_user.c \
 	ddraw_utils.c \
-	dsurface/dib.c \
-	dsurface/fakezbuffer.c \
-	dsurface/gamma.c \
-	dsurface/hal.c \
-	dsurface/main.c \
-	dsurface/thunks.c \
-	dsurface/user.c \
-	dsurface/wndproc.c \
 	main.c \
 	palette_hal.c \
 	palette_main.c \
-	regsvr.c
+	regsvr.c \
+	surface_dib.c \
+	surface_fakezbuffer.c \
+	surface_gamma.c \
+	surface_hal.c \
+	surface_main.c \
+	surface_thunks.c \
+	surface_user.c \
+	surface_wndproc.c
 
 RC_SRCS = version.rc
 
@@ -49,8 +49,7 @@ SUBDIRS = tests
 
 EXTRASUBDIRS = \
 	d3ddevice \
-	direct3d \
-	dsurface
+	direct3d
 
 @MAKE_DLL_RULES@