Alexandre Julliard : gdi32: Stop exporting GDI_GetObjPtr and
GDI_ReleaseObj .
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 17 11:49:04 CST 2006
Module: wine
Branch: master
Commit: 456891b37771583ab70f72687ba9343aed582b8f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=456891b37771583ab70f72687ba9343aed582b8f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Nov 17 14:39:04 2006 +0100
gdi32: Stop exporting GDI_GetObjPtr and GDI_ReleaseObj.
---
dlls/gdi32/gdi32.spec | 6 ------
dlls/gdi32/gdi_private.h | 37 +++++++++++++++++++++++++++++++++++++
include/gdi.h | 43 -------------------------------------------
3 files changed, 37 insertions(+), 49 deletions(-)
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index cea9a5c..10ec996 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -528,9 +528,3 @@
# GDI objects
@ cdecl __wine_make_gdi_object_system(long long)
-
-################################################################
-# Wine dll separation hacks, these will go away, don't use them
-#
-@ cdecl GDI_GetObjPtr(long long)
-@ cdecl GDI_ReleaseObj(long)
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 31130a6..f4d8900 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -39,6 +39,33 @@ typedef struct {
/* extra stock object: default 1x1 bitmap for memory DCs */
#define DEFAULT_BITMAP (STOCK_LAST+1)
+ /* GDI objects magic numbers */
+#define FIRST_MAGIC 0x4f47
+#define PEN_MAGIC 0x4f47
+#define BRUSH_MAGIC 0x4f48
+#define FONT_MAGIC 0x4f49
+#define PALETTE_MAGIC 0x4f4a
+#define BITMAP_MAGIC 0x4f4b
+#define REGION_MAGIC 0x4f4c
+#define DC_MAGIC 0x4f4d
+#define DISABLED_DC_MAGIC 0x4f4e
+#define META_DC_MAGIC 0x4f4f
+#define METAFILE_MAGIC 0x4f50
+#define METAFILE_DC_MAGIC 0x4f51
+#define ENHMETAFILE_MAGIC 0x4f52
+#define ENHMETAFILE_DC_MAGIC 0x4f53
+#define MEMORY_DC_MAGIC 0x4f54
+#define EXT_PEN_MAGIC 0x4f55
+#define LAST_MAGIC 0x4f55
+
+#define MAGIC_DONTCARE 0xffff
+
+/* GDI constants for making objects private/system (naming undoc. !) */
+#define OBJECT_PRIVATE 0x2000
+#define OBJECT_NOSYSTEM 0x8000
+
+#define GDIMAGIC(magic) ((magic) & ~(OBJECT_PRIVATE|OBJECT_NOSYSTEM))
+
struct gdi_obj_funcs
{
HGDIOBJ (*pSelectObject)( HGDIOBJ handle, void *obj, HDC hdc );
@@ -55,6 +82,14 @@ struct hdc_list
struct hdc_list *next;
};
+typedef struct tagGDIOBJHDR
+{
+ WORD wMagic;
+ DWORD dwCount;
+ const struct gdi_obj_funcs *funcs;
+ struct hdc_list *hdcs;
+} GDIOBJHDR;
+
/* Device functions for the Wine driver interface */
typedef struct { int opaque; } *PHYSDEV; /* PHYSDEV is an opaque pointer */
@@ -406,6 +441,8 @@ extern BOOL GDI_Init(void);
extern void *GDI_AllocObject( WORD, WORD, HGDIOBJ *, const struct gdi_obj_funcs *funcs );
extern void *GDI_ReallocObject( WORD, HGDIOBJ, void *obj );
extern BOOL GDI_FreeObject( HGDIOBJ, void *obj );
+extern void *GDI_GetObjPtr( HGDIOBJ, WORD );
+extern void GDI_ReleaseObj( HGDIOBJ );
extern void GDI_CheckNotLock(void);
extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc);
extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc);
diff --git a/include/gdi.h b/include/gdi.h
index 487e78c..a5ad7f4 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -28,51 +28,8 @@
#include <wine/wingdi16.h>
#include <math.h>
- /* GDI objects magic numbers */
-#define FIRST_MAGIC 0x4f47
-#define PEN_MAGIC 0x4f47
-#define BRUSH_MAGIC 0x4f48
-#define FONT_MAGIC 0x4f49
-#define PALETTE_MAGIC 0x4f4a
-#define BITMAP_MAGIC 0x4f4b
-#define REGION_MAGIC 0x4f4c
-#define DC_MAGIC 0x4f4d
-#define DISABLED_DC_MAGIC 0x4f4e
-#define META_DC_MAGIC 0x4f4f
-#define METAFILE_MAGIC 0x4f50
-#define METAFILE_DC_MAGIC 0x4f51
-#define ENHMETAFILE_MAGIC 0x4f52
-#define ENHMETAFILE_DC_MAGIC 0x4f53
-#define MEMORY_DC_MAGIC 0x4f54
-#define EXT_PEN_MAGIC 0x4f55
-#define LAST_MAGIC 0x4f55
-
-#define MAGIC_DONTCARE 0xffff
-
-/* GDI constants for making objects private/system (naming undoc. !) */
-#define OBJECT_PRIVATE 0x2000
-#define OBJECT_NOSYSTEM 0x8000
-
-#define GDIMAGIC(magic) ((magic) & ~(OBJECT_PRIVATE|OBJECT_NOSYSTEM))
-
-struct gdi_obj_funcs;
-struct hdc_list;
-
-typedef struct tagGDIOBJHDR
-{
- WORD wMagic;
- DWORD dwCount;
- const struct gdi_obj_funcs *funcs;
- struct hdc_list *hdcs;
-} GDIOBJHDR;
-
#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */
- /* GDI local heap */
-
-extern void *GDI_GetObjPtr( HGDIOBJ, WORD );
-extern void GDI_ReleaseObj( HGDIOBJ );
-
/* GetGlyphOutline */
#define WINE_GGO_GRAY16_BITMAP 0x7f
More information about the wine-cvs
mailing list