Changeset 4124 for trunk/include/win/wine

Timestamp:

Aug 30, 2000, 3:56:39 PM (25 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win/wine

Files:

• obj_oleview.h (modified) (2 diffs)
• wingdi16.h (modified) (4 diffs)
• winuser16.h (modified) (2 diffs)

trunk/include/win/wine/obj_oleview.h

@@ -1 @@
-/* $Id: obj_oleview.h,v 1.6 1999-09-02 19:07:18 phaller Exp $ */
+/* $Id: obj_oleview.h,v 1.7 2000-08-30 13:56:39 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs related to ViewObject
@@ -36 +36 @@
  * IViewObject interface
  */
-typedef BOOL    (CALLBACK* IVO_ContCallback)(DWORD);
+typedef BOOL    (* CALLBACK IVO_ContCallback)(DWORD);
 
 #define ICOM_INTERFACE IViewObject

trunk/include/win/wine/wingdi16.h

@@ -1 @@
-/* $Id: wingdi16.h,v 1.2 1999-08-22 22:52:12 sandervl Exp $ */
+/* $Id: wingdi16.h,v 1.3 2000-08-30 13:56:39 sandervl Exp $ */
 #ifndef __WINE_WINE_WINGDI16_H
 #define __WINE_WINE_WINGDI16_H
@@ -213 +213 @@
 } NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16;
 
-typedef INT16 (CALLBACK *FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
-typedef INT16 (CALLBACK *FONTENUMPROCEX16)(SEGPTR,SEGPTR,UINT16,LPARAM);
-typedef VOID  (CALLBACK *LINEDDAPROC16)(INT16,INT16,LPARAM);
-typedef INT16 (CALLBACK *GOBJENUMPROC16)(SEGPTR,LPARAM);
+typedef INT16 (* CALLBACK FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
+typedef INT16 (* CALLBACK FONTENUMPROCEX16)(SEGPTR,SEGPTR,UINT16,LPARAM);
+#ifndef __WINE_WINDEF_H
+typedef VOID  (* CALLBACK LINEDDAPROC16)(INT16,INT16,LPARAM);
+typedef INT16 (* CALLBACK GOBJENUMPROC16)(SEGPTR,LPARAM);
+#endif
 
 typedef struct
@@ -254 +256 @@
 } METAFILEPICT16, *LPMETAFILEPICT16;
 
-typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
+typedef INT16 (* CALLBACK MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
                                        INT16,LPARAM);
 typedef struct 
@@ -263 +265 @@
 } DOCINFO16, *LPDOCINFO16;
 
-typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
+typedef BOOL16 (* CALLBACK ABORTPROC16)(HDC16, INT16);
 
 #define INT_PD_DEFAULT_DEVMODE  1

trunk/include/win/wine/winuser16.h

@@ -1 @@
-/* $Id: winuser16.h,v 1.5 1999-08-22 22:52:12 sandervl Exp $ */
+/* $Id: winuser16.h,v 1.6 2000-08-30 13:56:39 sandervl Exp $ */
 #ifndef __WINE_WINE_WINUSER16_H
 #define __WINE_WINE_WINUSER16_H
 
-#include "winuser.h" /* winuser.h needed for MSGBOXCALLBACK */
+#include "winuser.h" /* winuser.h needed for MSGBOX* CALLBACK /
                      /* wingdi.h needed for COLORREF */
 #include "wine/wingdi16.h"
@@ -158 +158 @@
 
 /* DrawState defines ... */
-typedef BOOL16 (CALLBACK *DRAWSTATEPROC16)(HDC16,LPARAM,WPARAM16,INT16,INT16);
+typedef BOOL16 (* CALLBACK DRAWSTATEPROC16)(HDC16,LPARAM,WPARAM16,INT16,INT16);
 
 /* Listbox messages */