Moved dde files to the main directory and got rid of the dlls/user/dde

subdirectory.

configure

@@ -20055,8 +20055,6 @@ esac
 
           ac_config_commands="$ac_config_commands dlls/kernel/messages"
 
-          ac_config_commands="$ac_config_commands dlls/user/dde"
-
           ac_config_commands="$ac_config_commands dlls/user/resources"
 
           ac_config_commands="$ac_config_commands dlls/wineps/data"
@@ -20875,7 +20873,6 @@ do
   "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" ;;
-  "dlls/user/dde" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/dde" ;;
   "dlls/user/resources" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;;
   "dlls/wineps/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps/data" ;;
   "include/wine" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;;
@@ -21667,8 +21664,6 @@ echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;;
 echo "$as_me: creating dlls/gdi/mfdrv" >&6;} && mkdir "dlls/gdi/mfdrv") ;;
     dlls/kernel/messages ) test -d "dlls/kernel/messages" || ({ echo "$as_me:$LINENO: creating dlls/kernel/messages" >&5
 echo "$as_me: creating dlls/kernel/messages" >&6;} && mkdir "dlls/kernel/messages") ;;
-    dlls/user/dde ) test -d "dlls/user/dde" || ({ echo "$as_me:$LINENO: creating dlls/user/dde" >&5
-echo "$as_me: creating dlls/user/dde" >&6;} && mkdir "dlls/user/dde") ;;
     dlls/user/resources ) test -d "dlls/user/resources" || ({ echo "$as_me:$LINENO: creating dlls/user/resources" >&5
 echo "$as_me: creating dlls/user/resources" >&6;} && mkdir "dlls/user/resources") ;;
     dlls/wineps/data ) test -d "dlls/wineps/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps/data" >&5

configure.ac

@@ -1510,7 +1510,6 @@ AH_TOP([#define __WINE_CONFIG_H])
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
-WINE_CONFIG_EXTRA_DIR(dlls/user/dde)
 WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/wineps/data)
 WINE_CONFIG_EXTRA_DIR(include/wine)

dlls/user/Makefile.in

@@ -22,10 +22,10 @@ C_SRCS = \
 	clipboard.c \
 	combo.c \
 	cursoricon.c \
-	dde/client.c \
-	dde/ddeml16.c \
-	dde/misc.c \
-	dde/server.c \
+	dde_client.c \
+	dde_misc.c \
+	dde_server.c \
+	ddeml16.c \
 	defdlg.c \
 	defwnd.c \
 	desktop.c \
@@ -145,9 +145,7 @@ RC_SRCS16 = \
 
 SUBDIRS = tests
 
-EXTRASUBDIRS = \
-	dde \
-	resources
+EXTRASUBDIRS = resources
 
 @MAKE_DLL_RULES@
 

dlls/user/dde_client.c

@@ -1,5 +1,3 @@
-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
-
 /*
  * DDEML library
  *
@@ -37,7 +35,7 @@
 #include "ddeml.h"
 #include "win.h"
 #include "wine/debug.h"
-#include "dde/dde_private.h"
+#include "dde_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 

dlls/user/dde_misc.c

@@ -1,5 +1,3 @@
-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
-
 /*
  * DDEML library
  *
@@ -39,7 +37,7 @@
 #include "dde.h"
 #include "ddeml.h"
 #include "win.h"
-#include "dde/dde_private.h"
+#include "dde_private.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 

dlls/user/dde_private.h

@@ -1,5 +1,3 @@
-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
-
 /*
  * DDEML library
  *

dlls/user/dde_server.c

@@ -1,5 +1,3 @@
-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
-
 /*
  * DDEML library
  *
@@ -36,7 +34,7 @@
 #include "ddeml.h"
 #include "win.h"
 #include "wine/debug.h"
-#include "dde/dde_private.h"
+#include "dde_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 

dlls/user/ddeml16.c

@@ -30,7 +30,7 @@
 #include "wownt32.h"
 #include "dde.h"
 #include "ddeml.h"
-#include "dde/dde_private.h"
+#include "dde_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);