Make sure that all calls use the extended structures which are a
superset of the regular structures.

diff --git a/include/gdi.h b/include/gdi.h
index 86ceca6..9234be9 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -165,7 +165,7 @@
 
 /* Device functions for the Wine driver interface */
 
-typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONT16,LPNEWTEXTMETRIC16,UINT16,LPARAM);
+typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONTEX16,LPNEWTEXTMETRIC16,UINT16,LPARAM);
 
 typedef struct tagDC_FUNCS
 {
diff --git a/include/x11font.h b/include/x11font.h
index 4b1b80b..1e989b4 100644
--- a/include/x11font.h
+++ b/include/x11font.h
@@ -201,7 +201,7 @@
 typedef struct
 {
   LPLOGFONTW		lpLogFontParam;
-  FONTENUMPROCW	lpEnumFunc;
+  FONTENUMPROCEXW	lpEnumFunc;
   LPARAM		lpData;
 
   LPNEWTEXTMETRICEXW  lpTextMetric;