Moved the BITMAPOBJ structure to gdi_private.h.

dlls/gdi/bitmap.c

@@ -277,7 +277,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
     bmpobj->bitmap = bm;
     bmpobj->bitmap.bmBits = NULL;
     bmpobj->funcs = NULL;
-    bmpobj->physBitmap = NULL;
     bmpobj->dib = NULL;
     bmpobj->segptr_bits = 0;
 

dlls/gdi/gdi_private.h

@@ -294,6 +294,19 @@ static inline INT GDI_ROUND(FLOAT val)
    return (int)floor(val + 0.5);
 }
 
+/* bitmap object */
+
+typedef struct tagBITMAPOBJ
+{
+    GDIOBJHDR           header;
+    BITMAP              bitmap;
+    SIZE                size;   /* For SetBitmapDimension() */
+    const DC_FUNCTIONS *funcs; /* DC function table */
+    /* For device-independent bitmaps: */
+    DIBSECTION         *dib;
+    SEGPTR              segptr_bits;  /* segptr to DIB bits */
+} BITMAPOBJ;
+
 /* bidi.c */
 
 /* Wine_GCPW Flags */

dlls/gdi/wing.c

@@ -23,6 +23,7 @@
 #include "windef.h"
 #include "wownt32.h"
 #include "gdi.h"
+#include "gdi_private.h"
 #include "wine/wingdi16.h"
 #include "wine/debug.h"
 

include/gdi.h

@@ -65,20 +65,6 @@ typedef struct tagGDIOBJHDR
     struct hdc_list *hdcs;
 } GDIOBJHDR;
 
-/* bitmap object */
-
-typedef struct tagBITMAPOBJ
-{
-    GDIOBJHDR   header;
-    BITMAP      bitmap;
-    SIZE        size;   /* For SetBitmapDimension() */
-    const struct tagDC_FUNCS *funcs; /* DC function table */
-    void	*physBitmap; /* ptr to device specific data */
-    /* For device-independent bitmaps: */
-    DIBSECTION *dib;
-    SEGPTR      segptr_bits;  /* segptr to DIB bits */
-} BITMAPOBJ;
-
 /* palette object */
 
 #define NB_RESERVED_COLORS     20   /* number of fixed colors in system palette */