Alexandre Julliard : gdi32: Move DC hook private definitions out of wingdi. h.
Alexandre Julliard
julliard at winehq.org
Thu May 31 13:30:40 CDT 2012
Module: wine
Branch: master
Commit: f1bf4ea3fc7386d0aec24d8e735f4595da0d3577
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bf4ea3fc7386d0aec24d8e735f4595da0d3577
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu May 31 11:44:23 2012 +0200
gdi32: Move DC hook private definitions out of wingdi.h.
---
dlls/gdi.exe16/gdi.c | 3 ++-
dlls/user32/painting.c | 1 +
dlls/user32/sysparams.c | 1 +
include/wine/gdi_driver.h | 16 ++++++++++++++++
include/wingdi.h | 19 -------------------
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c
index 4eff2bc..45c2c78 100644
--- a/dlls/gdi.exe16/gdi.c
+++ b/dlls/gdi.exe16/gdi.c
@@ -2017,7 +2017,8 @@ DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc )
*/
WORD WINAPI SetHookFlags16( HDC16 hdc, WORD flags )
{
- return SetHookFlags( HDC_32(hdc), flags );
+ FIXME( "%04x %x: not supported\n", hdc, flags );
+ return 0;
}
diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
index 60252c6..5a3614c 100644
--- a/dlls/user32/painting.c
+++ b/dlls/user32/painting.c
@@ -36,6 +36,7 @@
#include "win.h"
#include "user_private.h"
#include "controls.h"
+#include "wine/gdi_driver.h"
#include "wine/list.h"
#include "wine/debug.h"
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 6a80687..fecaeda 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -39,6 +39,7 @@
#include "controls.h"
#include "user_private.h"
+#include "wine/gdi_driver.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index fffc459..5568eaa 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -235,4 +235,20 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g
*dev = physdev;
}
+/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */
+
+#define DCHC_INVALIDVISRGN 0x0001
+#define DCHC_DELETEDC 0x0002
+#define DCHF_INVALIDATEVISRGN 0x0001
+#define DCHF_VALIDATEVISRGN 0x0002
+
+typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);
+
+WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*);
+WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR);
+WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD);
+
+extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set );
+extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect );
+
#endif /* __WINE_WINE_GDI_DRIVER_H */
diff --git a/include/wingdi.h b/include/wingdi.h
index 2f9fa08..858d3c1 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -3785,25 +3785,6 @@ WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,I
WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT);
#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines)
-#ifdef __WINESRC__
-/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */
-
-#define DCHC_INVALIDVISRGN 0x0001
-#define DCHC_DELETEDC 0x0002
-#define DCHF_INVALIDATEVISRGN 0x0001
-#define DCHF_VALIDATEVISRGN 0x0002
-
-typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);
-
-WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*);
-WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR);
-WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD);
-
-extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set );
-extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect );
-
-#endif /* __WINESRC__ */
-
#ifdef __cplusplus
}
#endif
More information about the wine-cvs
mailing list