Release 950109
Thu Jan 5 13:37:42 1995 Cameron Heide (heide@ee.ualberta.ca)
* [memory/global.c]
GlobalCompact should now return the correct value when the
largest run of free blocks includes the last block.
* [windows/mdi.c]
Tiling and cascading windows without any MDI children should
no longer crash (assuming no-op is the correct thing to do).
Sun Jan 1 23:30:25 1995 Fons Botman <botman@rabo.nl>
* [objects/font.c]
GetTextExtentPoint: fixed debug output, str is counted string, not
zero terminated.
* [if1632/relay.c]
DLLRelay: when debugging_stack got segv, added upper bound for
stack dump.
diff --git a/include/bitmap.h b/include/bitmap.h
index 7d730b7..9bac249 100644
--- a/include/bitmap.h
+++ b/include/bitmap.h
@@ -4,19 +4,19 @@
* Copyright 1993, 1994 Alexandre Julliard
*/
-#ifndef BITMAP_H
-#define BITMAP_H
+#ifndef __WINE_BITMAP_H
+#define __WINE_BITMAP_H
-#include <stdlib.h>
-#include <X11/Xlib.h>
-#include "windows.h"
+#include "gdi.h"
- /* objects/bitmap.c */
-extern BOOL BITMAP_Init(void);
-
- /* objects/dib.c */
-extern int DIB_GetImageWidthBytes( int width, int depth );
-extern int DIB_BitmapInfoSize( BITMAPINFO * info, WORD coloruse );
+ /* GDI logical bitmap object */
+typedef struct
+{
+ GDIOBJHDR header;
+ BITMAP bitmap;
+ Pixmap pixmap;
+ SIZE size; /* For SetBitmapDimension() */
+} BITMAPOBJ;
/* GCs used for B&W and color bitmap operations */
extern GC BITMAP_monoGC, BITMAP_colorGC;
@@ -32,4 +32,15 @@
(width), (height), 32, width_bytes ); \
}
-#endif /* BITMAP_H */
+ /* objects/bitmap.c */
+extern BOOL BITMAP_Init(void);
+extern int BITMAP_GetObject( BITMAPOBJ * bmp, int count, LPSTR buffer );
+extern BOOL BITMAP_DeleteObject( HBITMAP hbitmap, BITMAPOBJ * bitmap );
+extern HBITMAP BITMAP_SelectObject( HDC hdc, DC * dc, HBITMAP hbitmap,
+ BITMAPOBJ * bmp );
+
+ /* objects/dib.c */
+extern int DIB_GetImageWidthBytes( int width, int depth );
+extern int DIB_BitmapInfoSize( BITMAPINFO * info, WORD coloruse );
+
+#endif /* __WINE_BITMAP_H */
