include: Move the DDE_xxx macros to dde.rh.

Francois Gouget fgouget at free.fr
Mon Nov 14 03:03:20 CST 2011


Include dde.rh from dde.h to avoid duplication.
---
 include/dde.h      |   12 +-----------
 include/dde.rh     |   32 ++++++++++++++++++++++++++++++++
 include/winresrc.h |    2 +-
 3 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 include/dde.rh

diff --git a/include/dde.h b/include/dde.h
index 117b428..508c1ea 100644
--- a/include/dde.h
+++ b/include/dde.h
@@ -34,17 +34,7 @@ extern "C" {
 #define WINUSERAPI DECLSPEC_IMPORT
 #endif
 
-#define WM_DDE_INITIATE   0x3E0
-#define WM_DDE_TERMINATE  0x3E1
-#define WM_DDE_ADVISE	  0x3E2
-#define WM_DDE_UNADVISE   0x3E3
-#define WM_DDE_ACK	  0x3E4
-#define WM_DDE_DATA	  0x3E5
-#define WM_DDE_REQUEST	  0x3E6
-#define WM_DDE_POKE	  0x3E7
-#define WM_DDE_EXECUTE	  0x3E8
-#define WM_DDE_LAST	  WM_DDE_EXECUTE
-#define WM_DDE_FIRST	  WM_DDE_INITIATE
+#include <dde.rh>
 
 /* DDEACK: wStatus in WM_DDE_ACK message */
 typedef struct
diff --git a/include/dde.rh b/include/dde.rh
new file mode 100644
index 0000000..23076a8
--- /dev/null
+++ b/include/dde.rh
@@ -0,0 +1,32 @@
+/*
+ * Copyright 1995, Technion, Israel Institute of Technology
+ * Electrical Eng, Software Lab.
+ * Author:    Michael Veksler.
+ * Purpose:   dde declarations
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WM_DDE_INITIATE   0x3E0
+#define WM_DDE_TERMINATE  0x3E1
+#define WM_DDE_ADVISE	  0x3E2
+#define WM_DDE_UNADVISE   0x3E3
+#define WM_DDE_ACK	  0x3E4
+#define WM_DDE_DATA	  0x3E5
+#define WM_DDE_REQUEST	  0x3E6
+#define WM_DDE_POKE	  0x3E7
+#define WM_DDE_EXECUTE	  0x3E8
+#define WM_DDE_LAST	  WM_DDE_EXECUTE
+#define WM_DDE_FIRST	  WM_DDE_INITIATE
diff --git a/include/winresrc.h b/include/winresrc.h
index e179217..2f99661 100644
--- a/include/winresrc.h
+++ b/include/winresrc.h
@@ -37,7 +37,7 @@
 
 #include <winuser.rh>
 #include <commctrl.rh>
-/* FIXME: #include <dde.rh> */
+#include <dde.rh>
 #include <winnt.rh>
 #include <dlgs.h>
 #include <winver.h>
-- 
1.7.7.1




More information about the wine-patches mailing list