Jacek Caban : gdi32: Move metafile defines to gdi_private.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 691cb12e5bf04be5547d874c3ed6a4e58b49ddcb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=691cb12e5bf04be5547d874c3...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Tue Sep  7 14:11:28 2021 +0200

gdi32: Move metafile defines to gdi_private.h.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/gdi32/gdi_private.h   | 45 +++++++++++++++++++++++++++++++++++++++++++++
 dlls/gdi32/ntgdi_private.h | 43 -------------------------------------------
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 7ed11a17e2e..af152e10644 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -42,6 +42,35 @@ static inline DWORD gdi_handle_type( HGDIOBJ obj )
     return handle & NTGDI_HANDLE_TYPE_MASK;
 }
 
+/* metafile defines */
+
+#define META_EOF 0x0000
+
+#define METAFILE_MEMORY 1
+#define METAFILE_DISK   2
+
+#define MFVERSION 0x300
+
+/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */
+#define DIB_PAL_MONO 2
+
+/* Format of comment record added by GetWinMetaFileBits */
+#include <pshpack2.h>
+typedef struct
+{
+    DWORD comment_id;   /* WMFC */
+    DWORD comment_type; /* Always 0x00000001 */
+    DWORD version;      /* Always 0x00010000 */
+    WORD checksum;
+    DWORD flags;        /* Always 0 */
+    DWORD num_chunks;
+    DWORD chunk_size;
+    DWORD remaining_size;
+    DWORD emf_size;
+    BYTE emf_data[1];
+} emf_in_wmf_comment;
+#include <poppack.h>
+
 static inline BOOL is_meta_dc( HDC hdc )
 {
     return gdi_handle_type( hdc ) == NTGDI_OBJ_METADC;
@@ -124,7 +153,20 @@ extern INT  METADC_StretchDIBits( HDC hdc, INT x_dst, INT y_dst, INT width_dst,
                                   INT x_src, INT y_src, INT width_src, INT height_src,
                                   const void *bits, const BITMAPINFO *info, UINT coloruse,
                                   DWORD rop ) DECLSPEC_HIDDEN;
+
+extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN;
+
 /* enhanced metafiles */
+
+#define WMFC_MAGIC 0x43464d57
+
+typedef struct
+{
+    EMR   emr;
+    INT   nBreakExtra;
+    INT   nBreakCount;
+} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION;
+
 extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN;
 extern BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst,
                               HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src,
@@ -225,6 +267,9 @@ extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN;
 extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN;
 extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN;
 
+extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize,
+                                             BOOL on_disk ) DECLSPEC_HIDDEN;
+
 extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits,
                                    UINT *usage ) DECLSPEC_HIDDEN;
 
diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h
index 3f241a87dbc..1e379649591 100644
--- a/dlls/gdi32/ntgdi_private.h
+++ b/dlls/gdi32/ntgdi_private.h
@@ -30,21 +30,6 @@
 #include "ntgdi.h"
 #include "wine/gdi_driver.h"
 
-/* Metafile defines */
-#define META_EOF 0x0000
-/* values of mtType in METAHEADER.  Note however that the disk image of a disk
-   based metafile has mtType == 1 */
-#define METAFILE_MEMORY 1
-#define METAFILE_DISK   2
-#define MFHEADERSIZE (sizeof(METAHEADER))
-#define MFVERSION 0x300
-
-typedef struct {
-    EMR   emr;
-    INT   nBreakExtra;
-    INT   nBreakCount;
-} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION;
-
 /* extra stock object: default 1x1 bitmap for memory DCs */
 #define DEFAULT_BITMAP (STOCK_LAST+1)
 
@@ -237,9 +222,6 @@ extern const struct gdi_dc_funcs font_driver DECLSPEC_HIDDEN;
 extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN;
 extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN;
 
-/* enhmetafile.c */
-extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN;
-
 /* font.c */
 
 struct font_gamma_ramp
@@ -410,28 +392,6 @@ extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN;
 extern void combine_transform( XFORM *result, const XFORM *xform1,
                                const XFORM *xform2 ) DECLSPEC_HIDDEN;
 
-/* metafile.c */
-extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN;
-
-/* Format of comment record added by GetWinMetaFileBits */
-#include <pshpack2.h>
-typedef struct
-{
-    DWORD comment_id;   /* WMFC */
-    DWORD comment_type; /* Always 0x00000001 */
-    DWORD version;      /* Always 0x00010000 */
-    WORD checksum;
-    DWORD flags;        /* Always 0 */
-    DWORD num_chunks;
-    DWORD chunk_size;
-    DWORD remaining_size;
-    DWORD emf_size;
-    BYTE emf_data[1];
-} emf_in_wmf_comment;
-#include <poppack.h>
-
-#define WMFC_MAGIC 0x43464d57
-
 /* driver.c */
 extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN;
 
@@ -566,9 +526,6 @@ static inline DC *get_physdev_dc( PHYSDEV dev )
     return get_nulldrv_dc( dev );
 }
 
-/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */
-#define DIB_PAL_MONO 2
-
 BOOL WINAPI FontIsLinked(HDC);
 
 BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size);