Changeset 1445 for trunk/include/win/commctrl.h

Timestamp:

Oct 25, 1999, 10:16:03 PM (26 years ago)

Author:

sandervl

Message:

Calling convention bugfixes

File:

• trunk/include/win/commctrl.h (modified) (6 diffs)

trunk/include/win/commctrl.h

@@ -1 @@
-/* $Id: commctrl.h,v 1.14 1999-10-06 15:40:18 cbratschi Exp $ */
+/* $Id: commctrl.h,v 1.15 1999-10-25 20:16:03 sandervl Exp $ */
 /*
  * Common controls definitions
@@ -2033 +2033 @@
 #define TV_DISPINFO             NMTVDISPINFO
 
-//typedef INT (CALLBACK *PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);
-typedef INT (*PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);
+typedef INT (* CALLBACK PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);
 
 typedef struct tagTVSORTCB
@@ -2630 +2629 @@
 #define TC_HITTESTINFO TCHITTESTINFO
 
-//typedef INT (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
-typedef INT (*PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
+typedef INT (* CALLBACK PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
+//typedef INT (*PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
 
 #define ListView_GetNextItem(hwnd,nItem,flags) \
@@ -3369 +3368 @@
 BOOL WINAPI DSA_SetItem (const HDSA, INT, LPVOID);
 
-//typedef INT (CALLBACK *DSAENUMPROC)(LPVOID, DWORD);
-typedef INT (*DSAENUMPROC)(LPVOID, DWORD);
+typedef INT (* CALLBACK DSAENUMPROC)(LPVOID, DWORD);
 VOID   WINAPI DSA_EnumCallback (const HDSA, DSAENUMPROC, LPARAM);
 BOOL WINAPI DSA_DestroyCallback (const HDSA, DSAENUMPROC, LPARAM);
@@ -3398 +3396 @@
 BOOL WINAPI DPA_DeleteAllPtrs (const HDPA);
 
-//typedef INT (CALLBACK *PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM);
-typedef INT (*PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM);
+typedef INT (* CALLBACK PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM);
 BOOL WINAPI DPA_Sort (const HDPA, PFNDPACOMPARE, LPARAM);
 
@@ -3409 +3406 @@
 
 #define DPAM_SORT               0x0001
-//typedef PVOID(CALLBACK *PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM);
-typedef PVOID(*PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM);
+typedef PVOID(* CALLBACK PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM);
 BOOL WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM);
 
-//typedef INT (CALLBACK *DPAENUMPROC)(LPVOID, DWORD);
-typedef INT (*DPAENUMPROC)(LPVOID, DWORD);
+typedef INT (* CALLBACK DPAENUMPROC)(LPVOID, DWORD);
 VOID   WINAPI DPA_EnumCallback (const HDPA, DPAENUMPROC, LPARAM);
 BOOL WINAPI DPA_DestroyCallback (const HDPA, DPAENUMPROC, LPARAM);