diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index 10d5b0141b1..19517edfa71 100644 --- a/dlls/gdi/bitmap.c +++ b/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; diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h index c87eec20e2f..77201f0254e 100644 --- a/dlls/gdi/gdi_private.h +++ b/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 */ diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c index 7124424a1a7..fc28cd67da0 100644 --- a/dlls/gdi/wing.c +++ b/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" diff --git a/include/gdi.h b/include/gdi.h index 0faae82a4ed..e4f608553da 100644 --- a/include/gdi.h +++ b/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 */