Commit 4091704b authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

include: Convert dcommon.h to IDL.

parent 3a5c3394
...@@ -53,6 +53,7 @@ IDL_SRCS = \ ...@@ -53,6 +53,7 @@ IDL_SRCS = \
dbinit.idl \ dbinit.idl \
dbprop.idl \ dbprop.idl \
dbs.idl \ dbs.idl \
dcommon.idl \
ddstream.idl \ ddstream.idl \
devenum.idl \ devenum.idl \
devicetopology.idl \ devicetopology.idl \
...@@ -294,7 +295,6 @@ HEADER_SRCS = \ ...@@ -294,7 +295,6 @@ HEADER_SRCS = \
dbt.h \ dbt.h \
dciddi.h \ dciddi.h \
dciman.h \ dciman.h \
dcommon.h \
dde.h \ dde.h \
dde.rh \ dde.rh \
ddeml.h \ ddeml.h \
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
*/ */
import "unknwn.idl"; import "unknwn.idl";
import "dcommon.h"; import "dcommon.idl";
import "d2dbasetypes.h"; import "d2dbasetypes.h";
import "d3d10_1.idl"; import "d3d10_1.idl";
import "d2derr.h"; import "d2derr.h";
......
...@@ -16,10 +16,15 @@ ...@@ -16,10 +16,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_DCOMMON_H import "dxgiformat.h";
#define __WINE_DCOMMON_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 typedef enum DWRITE_MEASURING_MODE
{ {
...@@ -45,8 +50,8 @@ typedef struct D2D1_PIXEL_FORMAT ...@@ -45,8 +50,8 @@ typedef struct D2D1_PIXEL_FORMAT
typedef struct D2D_POINT_2F typedef struct D2D_POINT_2F
{ {
FLOAT x; float x;
FLOAT y; float y;
} D2D_POINT_2F, D2D1_POINT_2F; } D2D_POINT_2F, D2D1_POINT_2F;
typedef POINT D2D_POINT_2L, D2D1_POINT_2L; typedef POINT D2D_POINT_2L, D2D1_POINT_2L;
...@@ -56,5 +61,3 @@ typedef struct D2D_SIZE_U ...@@ -56,5 +61,3 @@ typedef struct D2D_SIZE_U
UINT32 width; UINT32 width;
UINT32 height; UINT32 height;
} D2D_SIZE_U, D2D1_SIZE_U; } D2D_SIZE_U, D2D1_SIZE_U;
#endif /* __WINE_DCOMMON_H */
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
*/ */
import "unknwn.idl"; import "unknwn.idl";
import "dcommon.h"; import "dcommon.idl";
interface IDWriteFactory; interface IDWriteFactory;
interface IDWriteFontCollection; interface IDWriteFontCollection;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment