Several improvements to Enhanced MetaFile playback.

include/enhmetafile.h

+/*
+ * Enhanced Metafile definitions
+ *
+ */
+
+#ifndef __WINE_ENHMETAFILE_H
+#define __WINE_ENHMETAFILE_H
+
+#include "wingdi.h"
+#include "gdi.h"
+
+  /* GDI32 enhanced metafile object */
+typedef struct
+{
+    GDIOBJHDR      header;
+    ENHMETAHEADER  *emh;
+    HFILE          hFile;      /* File handle if EMF is disk-based */
+    HANDLE         hMapping;   /* Mapping handle if EMF is disk-based */
+} ENHMETAFILEOBJ;
+
+
+extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, HFILE hFile,
+					    HANDLE hMapping);
+
+
+#endif   /* __WINE_ENHMETAFILE_H */
+

include/wingdi.h

@@ -2386,6 +2386,19 @@ typedef struct {
 
 typedef struct {
     EMR   emr;
+    DWORD iMode;
+} EMRSELECTCLIPPATH,    *PEMRSELECTCLIPPATH,
+  EMRSETBKMODE,         *PEMRSETBKMODE,
+  EMRSETMAPMODE,        *PEMRSETMAPMODE,
+  EMRSETPOLYFILLMODE,   *PEMRSETPOLYFILLMODE,
+  EMRSETROP2,           *PEMRSETROP2,
+  EMRSETSTRETCHBLTMODE, *PEMRSETSTRETCHBLTMODE,
+  EMRSETTEXTALIGN,      *PEMRSETTEXTALIGN,
+  EMRSETICMMODE,        *PERMSETICMMODE,
+  EMRSETLAYOUT,         *PEMRSETLAYOUT;
+
+typedef struct {
+    EMR   emr;
     DWORD ihPal;
 } EMRSELECTPALETTE, *PEMRSELECTPALETTE;