From 4091704bf4a9663b9fc4efc7993036cd4fab6734 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 21 Sep 2017 22:29:33 +0200
Subject: [PATCH] include: Convert dcommon.h to IDL.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 include/Makefile.in                |  2 +-
 include/d2d1.idl                   |  2 +-
 include/{dcommon.h => dcommon.idl} | 17 ++++++++++-------
 include/dwrite.idl                 |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)
 rename include/{dcommon.h => dcommon.idl} (90%)

diff --git a/include/Makefile.in b/include/Makefile.in
index 41a23d3e08c..1f6656aa5ac 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -53,6 +53,7 @@ IDL_SRCS = \
 	dbinit.idl \
 	dbprop.idl \
 	dbs.idl \
+	dcommon.idl \
 	ddstream.idl \
 	devenum.idl \
 	devicetopology.idl \
@@ -294,7 +295,6 @@ HEADER_SRCS = \
 	dbt.h \
 	dciddi.h \
 	dciman.h \
-	dcommon.h \
 	dde.h \
 	dde.rh \
 	ddeml.h \
diff --git a/include/d2d1.idl b/include/d2d1.idl
index 4a62f7c5e15..fbfb40d93d6 100644
--- a/include/d2d1.idl
+++ b/include/d2d1.idl
@@ -17,7 +17,7 @@
  */
 
 import "unknwn.idl";
-import "dcommon.h";
+import "dcommon.idl";
 import "d2dbasetypes.h";
 import "d3d10_1.idl";
 import "d2derr.h";
diff --git a/include/dcommon.h b/include/dcommon.idl
similarity index 90%
rename from include/dcommon.h
rename to include/dcommon.idl
index a516e8aae19..b77ec4835a9 100644
--- a/include/dcommon.h
+++ b/include/dcommon.idl
@@ -16,10 +16,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __WINE_DCOMMON_H
-#define __WINE_DCOMMON_H
+import "dxgiformat.h";
 
-#include "dxgiformat.h"
+cpp_quote("#if 0")
+typedef struct
+{
+    long x, y;
+} POINT;
+typedef unsigned int UINT32;
+cpp_quote("#endif")
 
 typedef enum DWRITE_MEASURING_MODE
 {
@@ -45,8 +50,8 @@ typedef struct D2D1_PIXEL_FORMAT
 
 typedef struct D2D_POINT_2F
 {
-    FLOAT x;
-    FLOAT y;
+    float x;
+    float y;
 } D2D_POINT_2F, D2D1_POINT_2F;
 
 typedef POINT D2D_POINT_2L, D2D1_POINT_2L;
@@ -56,5 +61,3 @@ typedef struct D2D_SIZE_U
     UINT32 width;
     UINT32 height;
 } D2D_SIZE_U, D2D1_SIZE_U;
-
-#endif /* __WINE_DCOMMON_H */
diff --git a/include/dwrite.idl b/include/dwrite.idl
index 06ae767fa2f..115f958649a 100644
--- a/include/dwrite.idl
+++ b/include/dwrite.idl
@@ -17,7 +17,7 @@
  */
 
 import "unknwn.idl";
-import "dcommon.h";
+import "dcommon.idl";
 
 interface IDWriteFactory;
 interface IDWriteFontCollection;
-- 
2.11.4.GIT