From d1e85a0f1f76ff9048b74651f7c8adae16d93af3 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Mon, 14 Nov 2011 10:03:20 +0100
Subject: [PATCH] include: Move the DDE_xxx macros to dde.rh.

---
 include/Makefile.in            |  1 +
 include/dde.h                  | 12 +-----------
 include/{winresrc.h => dde.rh} | 43 +++++++++++++++---------------------------
 include/winresrc.h             |  2 +-
 4 files changed, 18 insertions(+), 40 deletions(-)
 copy include/{winresrc.h => dde.rh} (59%)

diff --git a/include/Makefile.in b/include/Makefile.in
index ddc07ba8c64..00e9cf4a27d 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -203,6 +203,7 @@ SRCDIR_INCLUDES = \
 	dciddi.h \
 	dciman.h \
 	dde.h \
+	dde.rh \
 	ddeml.h \
 	ddk/compstui.h \
 	ddk/hidsdi.h \
diff --git a/include/dde.h b/include/dde.h
index 117b428e7fe..508c1eaa905 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/winresrc.h b/include/dde.rh
similarity index 59%
copy from include/winresrc.h
copy to include/dde.rh
index e179217c34b..23076a87207 100644
--- a/include/winresrc.h
+++ b/include/dde.rh
@@ -1,5 +1,8 @@
 /*
- * Copyright (C) 2002 Alexandre Julliard
+ * 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
@@ -16,30 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WINRESRC_
-#define _WINRESRC_
-
-#ifndef WINVER
-#define WINVER 0x0500
-#endif
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
-
-#ifndef _WIN32_WINDOWS
-#define _WIN32_WINDOWS 0x0410
-#endif
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
-
-#include <winuser.rh>
-#include <commctrl.rh>
-/* FIXME: #include <dde.rh> */
-#include <winnt.rh>
-#include <dlgs.h>
-#include <winver.h>
-
-#endif /* _WINRESRC_ */
+#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 e179217c34b..2f99661f39e 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>
-- 
2.11.4.GIT