*** BH.H Wed May 29 02:04:32 1996 --- BH.H Tue Feb 18 10:42:30 1997 *************** *** 369,375 **** --- 369,379 ---- //============================================================================= #ifdef _X86_ + #ifdef __GNUC__ + #define BreakPoint() __asm__ ( "int 0x03" ) + #else #define BreakPoint() _asm { int 3h } + #endif #else #define BreakPoint() DebugBreak() #endif *** COMMCTRL.H Thu Oct 10 08:57:18 1996 --- COMMCTRL.H Sun Feb 9 12:07:14 1997 *************** *** 2308,2314 **** #define ListView_SetItemCountEx(hwndLV, cItems, dwFlags) \ SNDMSG((hwndLV), LVM_SETITEMCOUNT, (WPARAM)cItems, (LPARAM)dwFlags) ! typedef int (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM); #define LVM_SORTITEMS (LVM_FIRST + 48) --- 2308,2314 ---- #define ListView_SetItemCountEx(hwndLV, cItems, dwFlags) \ SNDMSG((hwndLV), LVM_SETITEMCOUNT, (WPARAM)cItems, (LPARAM)dwFlags) ! typedef int CALLBACK (*PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM); #define LVM_SORTITEMS (LVM_FIRST + 48) *************** *** 2909,2915 **** (BOOL)SNDMSG((hwndTV), TVM_GETISEARCHSTRING, 0, (LPARAM)(LPTSTR)lpsz) ! typedef int (CALLBACK *PFNTVCOMPARE)(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); typedef struct tagTVSORTCB { HTREEITEM hParent; --- 2909,2915 ---- (BOOL)SNDMSG((hwndTV), TVM_GETISEARCHSTRING, 0, (LPARAM)(LPTSTR)lpsz) ! typedef int CALLBACK (*PFNTVCOMPARE)(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); typedef struct tagTVSORTCB { HTREEITEM hParent; *** COMMDLG.H Fri Aug 9 01:30:00 1996 --- COMMDLG.H Tue Feb 18 10:50:18 1997 *************** *** 23,29 **** #endif /* __cplusplus */ #endif /* WINVER >= 0x0400 */ ! typedef UINT (APIENTRY *LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagOFNA { DWORD lStructSize; --- 23,29 ---- #endif /* __cplusplus */ #endif /* WINVER >= 0x0400 */ ! typedef UINT APIENTRY (*LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagOFNA { DWORD lStructSize; *************** *** 138,144 **** #define OFN_SHARENOWARN 1 #define OFN_SHAREWARN 0 ! typedef UINT (APIENTRY *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM); #if(WINVER >= 0x0400) // Structure used for all OpenFileName notifications --- 138,144 ---- #define OFN_SHARENOWARN 1 #define OFN_SHAREWARN 0 ! typedef UINT APIENTRY (*LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM); #if(WINVER >= 0x0400) // Structure used for all OpenFileName notifications *************** *** 301,307 **** #define CC_ANYCOLOR 0x00000100 #endif /* WINVER >= 0x0400 */ ! typedef UINT (APIENTRY *LPFRHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagFINDREPLACEA { DWORD lStructSize; // size of this struct 0x20 --- 301,307 ---- #define CC_ANYCOLOR 0x00000100 #endif /* WINVER >= 0x0400 */ ! typedef UINT APIENTRY (*LPFRHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagFINDREPLACEA { DWORD lStructSize; // size of this struct 0x20 *************** *** 372,378 **** #define ReplaceText ReplaceTextA #endif // !UNICODE ! typedef UINT (APIENTRY *LPCFHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagCHOOSEFONTA { DWORD lStructSize; --- 372,378 ---- #define ReplaceText ReplaceTextA #endif // !UNICODE ! typedef UINT APIENTRY (*LPCFHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagCHOOSEFONTA { DWORD lStructSize; *************** *** 524,531 **** #define CD_LBSELSUB 1 #define CD_LBSELADD 2 ! typedef UINT (APIENTRY *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); ! typedef UINT (APIENTRY *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagPDA { DWORD lStructSize; --- 524,531 ---- #define CD_LBSELSUB 1 #define CD_LBSELADD 2 ! typedef UINT APIENTRY (*LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); ! typedef UINT APIENTRY (*LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct tagPDA { DWORD lStructSize; *************** *** 633,640 **** #define WM_PSD_ENVSTAMPRECT (WM_USER+5) #define WM_PSD_YAFULLPAGERECT (WM_USER+6) ! typedef UINT (APIENTRY* LPPAGEPAINTHOOK)( HWND, UINT, WPARAM, LPARAM ); ! typedef UINT (APIENTRY* LPPAGESETUPHOOK)( HWND, UINT, WPARAM, LPARAM ); typedef struct tagPSDA { --- 633,640 ---- #define WM_PSD_ENVSTAMPRECT (WM_USER+5) #define WM_PSD_YAFULLPAGERECT (WM_USER+6) ! typedef UINT APIENTRY (* LPPAGEPAINTHOOK)( HWND, UINT, WPARAM, LPARAM ); ! typedef UINT APIENTRY (* LPPAGESETUPHOOK)( HWND, UINT, WPARAM, LPARAM ); typedef struct tagPSDA { *** DDEML.H Fri Aug 9 01:30:00 1996 --- DDEML.H Sun Feb 9 12:02:06 1997 *************** *** 201,207 **** typedef HDDEDATA CALLBACK FNCALLBACK(UINT wType, UINT wFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, DWORD dwData1, DWORD dwData2); ! typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT wType, UINT wFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, DWORD dwData1, DWORD dwData2); #define CBR_BLOCK ((HDDEDATA)0xffffffffL) --- 201,207 ---- typedef HDDEDATA CALLBACK FNCALLBACK(UINT wType, UINT wFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, DWORD dwData1, DWORD dwData2); ! typedef HDDEDATA CALLBACK (*PFNCALLBACK)(UINT wType, UINT wFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, DWORD dwData1, DWORD dwData2); #define CBR_BLOCK ((HDDEDATA)0xffffffffL) *** IMM.H Fri Aug 9 01:30:00 1996 --- IMM.H Sun Feb 9 12:00:02 1997 *************** *** 239,246 **** UINT WINAPI ImmGetVirtualKey(HWND); ! typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID); ! typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID); #ifdef UNICODE #define REGISTERWORDENUMPROC REGISTERWORDENUMPROCW #else --- 239,246 ---- UINT WINAPI ImmGetVirtualKey(HWND); ! typedef int CALLBACK (*REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID); ! typedef int CALLBACK (*REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID); #ifdef UNICODE #define REGISTERWORDENUMPROC REGISTERWORDENUMPROCW #else *** MMSYSTEM.H Fri Aug 9 01:30:00 1996 --- MMSYSTEM.H Tue Feb 18 10:55:36 1997 *************** *** 357,363 **** #ifdef _WIN32 #ifndef _WIN32_VXD ! typedef LRESULT (CALLBACK* DRIVERPROC)(DWORD, HDRVR, UINT, LPARAM, LPARAM); WINMMAPI LRESULT WINAPI CloseDriver(HDRVR hDriver, LONG lParam1, LONG lParam2); WINMMAPI HDRVR WINAPI OpenDriver(LPCWSTR szDriverName, LPCWSTR szSectionName, LONG lParam2); --- 357,363 ---- #ifdef _WIN32 #ifndef _WIN32_VXD ! typedef LRESULT CALLBACK (*DRIVERPROC)(DWORD, HDRVR, UINT, LPARAM, LPARAM); WINMMAPI LRESULT WINAPI CloseDriver(HDRVR hDriver, LONG lParam1, LONG lParam2); WINMMAPI HDRVR WINAPI OpenDriver(LPCWSTR szDriverName, LPCWSTR szSectionName, LONG lParam2); *************** *** 411,417 **** #ifndef _WIN32_VXD ! typedef void (CALLBACK DRVCALLBACK)(HDRVR hdrvr, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2); typedef DRVCALLBACK FAR *LPDRVCALLBACK; #ifdef _WIN32 --- 411,417 ---- #ifndef _WIN32_VXD ! typedef void CALLBACK (DRVCALLBACK)(HDRVR hdrvr, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2); typedef DRVCALLBACK FAR *LPDRVCALLBACK; #ifdef _WIN32 *************** *** 1620,1630 **** struct { LONG lMinimum; /* signed minimum for this control */ LONG lMaximum; /* signed maximum for this control */ ! }; struct { DWORD dwMinimum; /* unsigned minimum for this control */ DWORD dwMaximum; /* unsigned maximum for this control */ ! }; DWORD dwReserved[6]; } Bounds; union { --- 1620,1630 ---- struct { LONG lMinimum; /* signed minimum for this control */ LONG lMaximum; /* signed maximum for this control */ ! }s1; struct { DWORD dwMinimum; /* unsigned minimum for this control */ DWORD dwMaximum; /* unsigned maximum for this control */ ! }s2; DWORD dwReserved[6]; } Bounds; union { *************** *** 1645,1655 **** struct { LONG lMinimum; /* signed minimum for this control */ LONG lMaximum; /* signed maximum for this control */ ! }; struct { DWORD dwMinimum; /* unsigned minimum for this control */ DWORD dwMaximum; /* unsigned maximum for this control */ ! }; DWORD dwReserved[6]; } Bounds; union { --- 1645,1655 ---- struct { LONG lMinimum; /* signed minimum for this control */ LONG lMaximum; /* signed maximum for this control */ ! }s1; struct { DWORD dwMinimum; /* unsigned minimum for this control */ DWORD dwMaximum; /* unsigned maximum for this control */ ! }s2; DWORD dwReserved[6]; } Bounds; union { *************** *** 1681,1691 **** struct { LONG lMinimum; /* signed minimum for this control */ LONG lMaximum; /* signed maximum for this control */ ! }; struct { DWORD dwMinimum; /* unsigned minimum for this control */ DWORD dwMaximum; /* unsigned maximum for this control */ ! }; DWORD dwReserved[6]; } Bounds; union { --- 1681,1691 ---- struct { LONG lMinimum; /* signed minimum for this control */ LONG lMaximum; /* signed maximum for this control */ ! }s1; struct { DWORD dwMinimum; /* unsigned minimum for this control */ DWORD dwMaximum; /* unsigned maximum for this control */ ! }s2; DWORD dwReserved[6]; } Bounds; union { *************** *** 1785,1791 **** union { DWORD dwControlID; /* MIXER_GETLINECONTROLSF_ONEBYID */ DWORD dwControlType; /* MIXER_GETLINECONTROLSF_ONEBYTYPE */ ! }; DWORD cControls; /* count of controls pmxctrl points to */ DWORD cbmxctrl; /* size in bytes of _one_ MIXERCONTROL */ LPMIXERCONTROLA pamxctrl; /* pointer to first MIXERCONTROL array */ --- 1785,1791 ---- union { DWORD dwControlID; /* MIXER_GETLINECONTROLSF_ONEBYID */ DWORD dwControlType; /* MIXER_GETLINECONTROLSF_ONEBYTYPE */ ! }u; DWORD cControls; /* count of controls pmxctrl points to */ DWORD cbmxctrl; /* size in bytes of _one_ MIXERCONTROL */ LPMIXERCONTROLA pamxctrl; /* pointer to first MIXERCONTROL array */ *************** *** 1796,1802 **** union { DWORD dwControlID; /* MIXER_GETLINECONTROLSF_ONEBYID */ DWORD dwControlType; /* MIXER_GETLINECONTROLSF_ONEBYTYPE */ ! }; DWORD cControls; /* count of controls pmxctrl points to */ DWORD cbmxctrl; /* size in bytes of _one_ MIXERCONTROL */ LPMIXERCONTROLW pamxctrl; /* pointer to first MIXERCONTROL array */ --- 1796,1802 ---- union { DWORD dwControlID; /* MIXER_GETLINECONTROLSF_ONEBYID */ DWORD dwControlType; /* MIXER_GETLINECONTROLSF_ONEBYTYPE */ ! }u; DWORD cControls; /* count of controls pmxctrl points to */ DWORD cbmxctrl; /* size in bytes of _one_ MIXERCONTROL */ LPMIXERCONTROLW pamxctrl; /* pointer to first MIXERCONTROL array */ *************** *** 1818,1824 **** union { DWORD dwControlID; /* MIXER_GETLINECONTROLSF_ONEBYID */ DWORD dwControlType; /* MIXER_GETLINECONTROLSF_ONEBYTYPE */ ! }; DWORD cControls; /* count of controls pmxctrl points to */ DWORD cbmxctrl; /* size in bytes of _one_ MIXERCONTROL */ LPMIXERCONTROL pamxctrl; /* pointer to first MIXERCONTROL array */ --- 1818,1824 ---- union { DWORD dwControlID; /* MIXER_GETLINECONTROLSF_ONEBYID */ DWORD dwControlType; /* MIXER_GETLINECONTROLSF_ONEBYTYPE */ ! }u; DWORD cControls; /* count of controls pmxctrl points to */ DWORD cbmxctrl; /* size in bytes of _one_ MIXERCONTROL */ LPMIXERCONTROL pamxctrl; /* pointer to first MIXERCONTROL array */ *************** *** 1855,1861 **** union { HWND hwndOwner; /* for MIXER_SETCONTROLDETAILSF_CUSTOM */ DWORD cMultipleItems; /* if _MULTIPLE, the number of items per channel */ ! }; DWORD cbDetails; /* size of _one_ details_XX struct */ LPVOID paDetails; /* pointer to array of details_XX structs */ } MIXERCONTROLDETAILS, *PMIXERCONTROLDETAILS, FAR *LPMIXERCONTROLDETAILS; --- 1855,1861 ---- union { HWND hwndOwner; /* for MIXER_SETCONTROLDETAILSF_CUSTOM */ DWORD cMultipleItems; /* if _MULTIPLE, the number of items per channel */ ! }u; DWORD cbDetails; /* size of _one_ details_XX struct */ LPVOID paDetails; /* pointer to array of details_XX structs */ } MIXERCONTROLDETAILS, *PMIXERCONTROLDETAILS, FAR *LPMIXERCONTROLDETAILS; *************** *** 1959,1965 **** #define TIMERR_STRUCT (TIMERR_BASE+33) /* time struct size */ /* timer data types */ ! typedef void (CALLBACK TIMECALLBACK)(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2); typedef TIMECALLBACK FAR *LPTIMECALLBACK; --- 1959,1965 ---- #define TIMERR_STRUCT (TIMERR_BASE+33) /* time struct size */ /* timer data types */ ! typedef void CALLBACK (TIMECALLBACK)(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2); typedef TIMECALLBACK FAR *LPTIMECALLBACK; *************** *** 2288,2294 **** typedef DWORD FOURCC; /* a four character code */ typedef char _huge * HPSTR; /* a huge version of LPSTR */ DECLARE_HANDLE(HMMIO); /* a handle to an open file */ ! typedef LRESULT (CALLBACK MMIOPROC)(LPSTR lpmmioinfo, UINT uMsg, LPARAM lParam1, LPARAM lParam2); typedef MMIOPROC FAR *LPMMIOPROC; --- 2288,2294 ---- typedef DWORD FOURCC; /* a four character code */ typedef char _huge * HPSTR; /* a huge version of LPSTR */ DECLARE_HANDLE(HMMIO); /* a handle to an open file */ ! typedef LRESULT CALLBACK (MMIOPROC)(LPSTR lpmmioinfo, UINT uMsg, LPARAM lParam1, LPARAM lParam2); typedef MMIOPROC FAR *LPMMIOPROC; *************** *** 2486,2492 **** typedef UINT MCIDEVICEID; /* MCI device ID type */ #endif ! typedef UINT (CALLBACK *YIELDPROC)(MCIDEVICEID mciId, DWORD dwYieldData); /* MCI function prototypes */ #ifdef _WIN32 --- 2486,2492 ---- typedef UINT MCIDEVICEID; /* MCI device ID type */ #endif ! typedef UINT CALLBACK (*YIELDPROC)(MCIDEVICEID mciId, DWORD dwYieldData); /* MCI function prototypes */ #ifdef _WIN32 *** MSWSOCK.H Fri Aug 9 01:30:00 1996 --- MSWSOCK.H Tue Feb 18 11:34:02 1997 *************** *** 127,133 **** typedef BOOL ! (PASCAL FAR * LPFN_TRANSMITFILE)( IN SOCKET hSocket, IN HANDLE hFile, IN DWORD nNumberOfBytesToWrite, --- 127,133 ---- typedef BOOL ! PASCAL FAR (* LPFN_TRANSMITFILE)( IN SOCKET hSocket, IN HANDLE hFile, IN DWORD nNumberOfBytesToWrite, *************** *** 142,148 **** typedef BOOL ! (PASCAL FAR * LPFN_ACCEPTEX)( IN SOCKET sListenSocket, IN SOCKET sAcceptSocket, IN PVOID lpOutputBuffer, --- 142,148 ---- typedef BOOL ! PASCAL FAR (* LPFN_ACCEPTEX)( IN SOCKET sListenSocket, IN SOCKET sAcceptSocket, IN PVOID lpOutputBuffer, *************** *** 158,164 **** typedef VOID ! (PASCAL FAR * LPFN_GETACCEPTEXSOCKADDRS)( IN PVOID lpOutputBuffer, IN DWORD dwReceiveDataLength, IN DWORD dwLocalAddressLength, --- 158,164 ---- typedef VOID ! PASCAL FAR (* LPFN_GETACCEPTEXSOCKADDRS)( IN PVOID lpOutputBuffer, IN DWORD dwReceiveDataLength, IN DWORD dwLocalAddressLength, *** NB30.H Fri Aug 9 01:30:00 1996 --- NB30.H Tue Feb 18 10:56:18 1997 *************** *** 44,50 **** UCHAR ncb_name[NCBNAMSZ]; /* our blank-padded netname */ UCHAR ncb_rto; /* rcv timeout/retry count */ UCHAR ncb_sto; /* send timeout/sys timeout */ ! void (CALLBACK *ncb_post)( struct _NCB * ); /* POST routine address */ UCHAR ncb_lana_num; /* lana (adapter) number */ UCHAR ncb_cmd_cplt; /* 0xff => commmand pending */ UCHAR ncb_reserve[10]; /* reserved, used by BIOS */ --- 44,50 ---- UCHAR ncb_name[NCBNAMSZ]; /* our blank-padded netname */ UCHAR ncb_rto; /* rcv timeout/retry count */ UCHAR ncb_sto; /* send timeout/sys timeout */ ! void CALLBACK (*ncb_post)( struct _NCB * ); /* POST routine address */ UCHAR ncb_lana_num; /* lana (adapter) number */ UCHAR ncb_cmd_cplt; /* 0xff => commmand pending */ UCHAR ncb_reserve[10]; /* reserved, used by BIOS */ *** PRSHT.H Thu Jun 27 17:56:48 1996 --- PRSHT.H Tue Feb 18 10:02:12 1997 *************** *** 55,67 **** struct _PSP; typedef struct _PSP FAR* HPROPSHEETPAGE; ! #ifndef MIDL_PASS struct _PROPSHEETPAGEA; struct _PROPSHEETPAGEW; #endif ! typedef UINT (CALLBACK FAR * LPFNPSPCALLBACKA)(HWND hwnd, UINT uMsg, struct _PROPSHEETPAGEA FAR *ppsp); ! typedef UINT (CALLBACK FAR * LPFNPSPCALLBACKW)(HWND hwnd, UINT uMsg, struct _PROPSHEETPAGEW FAR *ppsp); #ifdef UNICODE #define LPFNPSPCALLBACK LPFNPSPCALLBACKW --- 55,67 ---- struct _PSP; typedef struct _PSP FAR* HPROPSHEETPAGE; ! #if !defined(MIDL_PASS) struct _PROPSHEETPAGEA; struct _PROPSHEETPAGEW; #endif ! typedef UINT CALLBACK FAR (* LPFNPSPCALLBACKA)(HWND hwnd, UINT uMsg, struct _PROPSHEETPAGEA FAR *ppsp); ! typedef UINT CALLBACK FAR (* LPFNPSPCALLBACKW)(HWND hwnd, UINT uMsg, struct _PROPSHEETPAGEW FAR *ppsp); #ifdef UNICODE #define LPFNPSPCALLBACK LPFNPSPCALLBACKW *************** *** 157,163 **** #define PSH_MODELESS 0x0400 #define PSH_RTLREADING 0x0800 ! typedef int (CALLBACK *PFNPROPSHEETCALLBACK)(HWND, UINT, LPARAM); typedef struct _PROPSHEETHEADERA { DWORD dwSize; --- 157,163 ---- #define PSH_MODELESS 0x0400 #define PSH_RTLREADING 0x0800 ! typedef int CALLBACK (*PFNPROPSHEETCALLBACK)(HWND, UINT, LPARAM); typedef struct _PROPSHEETHEADERA { DWORD dwSize; *************** *** 239,246 **** ! typedef BOOL (CALLBACK FAR * LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM); ! typedef BOOL (CALLBACK FAR * LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM); typedef struct _PSHNOTIFY --- 239,246 ---- ! typedef BOOL CALLBACK FAR (* LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM); ! typedef BOOL CALLBACK FAR (* LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM); typedef struct _PSHNOTIFY *** PSHPACK8.H Fri Aug 9 01:30:00 1996 --- PSHPACK8.H Sun Feb 9 12:20:00 1997 *************** *** 27,32 **** --- 27,36 ---- #endif #pragma pack(8) #else + #ifdef __GNUC__ + #pragma pack(4) /* ! double align not implemented ! use -m486 */ + #else #pragma pack(8) + #endif #endif #endif // ! (defined(lint) || defined(_lint) || defined(RC_INVOKED)) *** RICHEDIT.H Fri Aug 9 01:30:00 1996 --- RICHEDIT.H Tue Feb 18 09:11:52 1997 *************** *** 303,309 **** typedef struct _charformat { UINT cbSize; ! _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; --- 303,309 ---- typedef struct _charformat { UINT cbSize; ! // _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 312,324 **** BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; ! _WPAD _wPad2; } CHARFORMATA; typedef struct _charformatw { UINT cbSize; ! _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; --- 312,324 ---- BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; ! // _WPAD _wPad2; } CHARFORMATA; typedef struct _charformatw { UINT cbSize; ! // _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 327,333 **** BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; ! _WPAD _wPad2; } CHARFORMATW; #if (_RICHEDIT_VER >= 0x0200) --- 327,333 ---- BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; ! // _WPAD _wPad2; } CHARFORMATW; #if (_RICHEDIT_VER >= 0x0200) *************** *** 496,502 **** typedef struct _paraformat { UINT cbSize; ! _WPAD _wPad1; DWORD dwMask; WORD wNumbering; WORD wReserved; --- 496,502 ---- typedef struct _paraformat { UINT cbSize; ! // _WPAD _wPad1; DWORD dwMask; WORD wNumbering; WORD wReserved; *************** *** 562,568 **** typedef struct _charformat2w { UINT cbSize; ! _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; --- 562,568 ---- typedef struct _charformat2w { UINT cbSize; ! // _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 571,577 **** BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; ! _WPAD _wPad2; WORD wWeight; /* Font weight (LOGFONT value) */ SHORT sSpacing; /* Amount to space between letters */ COLORREF crBackColor; /* Background color */ --- 571,577 ---- BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; ! // _WPAD _wPad2; WORD wWeight; /* Font weight (LOGFONT value) */ SHORT sSpacing; /* Amount to space between letters */ COLORREF crBackColor; /* Background color */ *************** *** 588,594 **** typedef struct _charformat2a { UINT cbSize; ! _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; --- 588,594 ---- typedef struct _charformat2a { UINT cbSize; ! // _WPAD _wPad1; DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 597,603 **** BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; ! _WPAD _wPad2; WORD wWeight; /* Font weight (LOGFONT value) */ SHORT sSpacing; /* Amount to space between letters */ COLORREF crBackColor; /* Background color */ --- 597,603 ---- BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; ! // _WPAD _wPad2; WORD wWeight; /* Font weight (LOGFONT value) */ SHORT sSpacing; /* Amount to space between letters */ COLORREF crBackColor; /* Background color */ *************** *** 718,724 **** typedef struct _paraformat2 { UINT cbSize; ! _WPAD _wPad1; DWORD dwMask; WORD wNumbering; WORD wReserved; --- 718,724 ---- typedef struct _paraformat2 { UINT cbSize; ! // _WPAD _wPad1; DWORD dwMask; WORD wNumbering; WORD wReserved; *************** *** 816,822 **** */ ! #define PFA_JUSTIFY 4 /* New paragraph-alignment option 2.0 (*) /* notification structures */ --- 816,822 ---- */ ! #define PFA_JUSTIFY 4 /* New paragraph-alignment option 2.0 (*) */ /* notification structures */ *************** *** 827,837 **** typedef struct _nmhdr { HWND hwndFrom; ! _WPAD _wPad1; UINT idFrom; ! _WPAD _wPad2; UINT code; ! _WPAD _wPad3; } NMHDR; #endif /* !WM_NOTIFY */ --- 827,837 ---- typedef struct _nmhdr { HWND hwndFrom; ! // _WPAD _wPad1; UINT idFrom; ! // _WPAD _wPad2; UINT code; ! // _WPAD _wPad3; } NMHDR; #endif /* !WM_NOTIFY */ *************** *** 839,847 **** { NMHDR nmhdr; UINT msg; ! _WPAD _wPad1; WPARAM wParam; ! _WPAD _wPad2; LPARAM lParam; } MSGFILTER; --- 839,847 ---- { NMHDR nmhdr; UINT msg; ! // _WPAD _wPad1; WPARAM wParam; ! // _WPAD _wPad2; LPARAM lParam; } MSGFILTER; *************** *** 883,891 **** { NMHDR nmhdr; UINT msg; ! _WPAD _wPad1; WPARAM wParam; ! _WPAD _wPad2; LPARAM lParam; CHARRANGE chrg; } ENPROTECTED; --- 883,891 ---- { NMHDR nmhdr; UINT msg; ! // _WPAD _wPad1; WPARAM wParam; ! // _WPAD _wPad2; LPARAM lParam; CHARRANGE chrg; } ENPROTECTED; *************** *** 920,928 **** { NMHDR nmhdr; UINT msg; ! _WPAD _wPad1; WPARAM wParam; ! _WPAD _wPad2; LPARAM lParam; CHARRANGE chrg; } ENLINK; --- 920,928 ---- { NMHDR nmhdr; UINT msg; ! // _WPAD _wPad1; WPARAM wParam; ! // _WPAD _wPad2; LPARAM lParam; CHARRANGE chrg; } ENLINK; *** RPCDCE.H Fri Aug 9 01:30:00 1996 --- RPCDCE.H Tue Feb 18 10:59:50 1997 *************** *** 1171,1177 **** ); typedef void ! (__RPC_USER * RPC_AUTH_KEY_RETRIEVAL_FN) ( IN void __RPC_FAR * Arg, IN unsigned short __RPC_FAR * ServerPrincName, IN unsigned long KeyVer, --- 1171,1177 ---- ); typedef void ! __RPC_USER (* RPC_AUTH_KEY_RETRIEVAL_FN) ( IN void __RPC_FAR * Arg, IN unsigned short __RPC_FAR * ServerPrincName, IN unsigned long KeyVer, *************** *** 1244,1250 **** ); typedef void ! (__RPC_USER * RPC_AUTH_KEY_RETRIEVAL_FN) ( IN void __RPC_FAR * Arg, IN unsigned char __RPC_FAR * ServerPrincName, IN unsigned long KeyVer, --- 1244,1250 ---- ); typedef void ! __RPC_USER (* RPC_AUTH_KEY_RETRIEVAL_FN) ( IN void __RPC_FAR * Arg, IN unsigned char __RPC_FAR * ServerPrincName, IN unsigned long KeyVer, *************** *** 1559,1565 **** ); typedef int ! (__RPC_API * RPC_MGMT_AUTHORIZATION_FN) ( IN RPC_BINDING_HANDLE ClientBinding, IN unsigned long RequestedMgmtOperation, OUT RPC_STATUS __RPC_FAR * Status --- 1559,1565 ---- ); typedef int ! __RPC_API (* RPC_MGMT_AUTHORIZATION_FN) ( IN RPC_BINDING_HANDLE ClientBinding, IN unsigned long RequestedMgmtOperation, OUT RPC_STATUS __RPC_FAR * Status *** RPCDCEP.H Fri Aug 9 01:30:00 1996 --- RPCDCEP.H Tue Feb 18 11:22:26 1997 *************** *** 88,94 **** typedef void ! (__RPC_STUB __RPC_FAR * RPC_DISPATCH_FUNCTION) ( IN OUT PRPC_MESSAGE Message ); --- 88,94 ---- typedef void ! __RPC_STUB __RPC_FAR (* RPC_DISPATCH_FUNCTION) ( IN OUT PRPC_MESSAGE Message ); *************** *** 191,200 **** --- 191,207 ---- IN I_RPC_MUTEX Mutex ); + #ifdef __GNUC__ + void __RPC_FAR * + I_RpcAllocate ( + IN unsigned int Size + ) RPC_ENTRY ; + #else void __RPC_FAR * RPC_ENTRY I_RpcAllocate ( IN unsigned int Size ); + #endif void RPC_ENTRY I_RpcFree ( *************** *** 208,214 **** typedef void ! (__RPC_USER __RPC_FAR * PRPC_RUNDOWN) ( void __RPC_FAR * AssociationContext ); --- 215,221 ---- typedef void ! __RPC_USER __RPC_FAR (* PRPC_RUNDOWN) ( void __RPC_FAR * AssociationContext ); *** RPCNDR.H Fri Aug 9 01:30:00 1996 --- RPCNDR.H Tue Feb 18 11:28:14 1997 *************** *** 199,205 **** --- 199,209 ---- #define __MIDL_USER_DEFINED #endif + #ifdef __GNUC__ + void * MIDL_user_allocate(size_t) __stdcall; + #else void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); + #endif void __RPC_USER MIDL_user_free( void __RPC_FAR * ); #ifdef __RPC_WIN16__ *************** *** 240,246 **** #define cbNDRContext 20 /* size of context on WIRE */ ! typedef void (__RPC_USER __RPC_FAR * NDR_RUNDOWN)(void __RPC_FAR * context); typedef struct _SCONTEXT_QUEUE { unsigned long NumberOfObjects; --- 244,250 ---- #define cbNDRContext 20 /* size of context on WIRE */ ! typedef void __RPC_USER __RPC_FAR (* NDR_RUNDOWN)(void __RPC_FAR * context); typedef struct _SCONTEXT_QUEUE { unsigned long NumberOfObjects; *************** *** 548,557 **** --- 552,565 ---- unsigned char MscPak ); + #ifdef __GNUC__ + void __RPC_FAR * midl_allocate ( size_t size ) RPC_ENTRY ; + #else void __RPC_FAR * RPC_ENTRY midl_allocate ( size_t size ); + #endif /**************************************************************************** MIDL 2.0 ndr definitions. *************** *** 647,653 **** typedef unsigned long RPC_LENGTH; // Expression evaluation callback routine prototype. ! typedef void (__RPC_USER __RPC_FAR * EXPR_EVAL)( struct _MIDL_STUB_MESSAGE __RPC_FAR * ); typedef const unsigned char __RPC_FAR * PFORMAT_STRING; --- 655,661 ---- typedef unsigned long RPC_LENGTH; // Expression evaluation callback routine prototype. ! typedef void __RPC_USER __RPC_FAR (* EXPR_EVAL)( struct _MIDL_STUB_MESSAGE __RPC_FAR * ); typedef const unsigned char __RPC_FAR * PFORMAT_STRING; *************** *** 673,692 **** */ typedef void ! (__RPC_FAR __RPC_API * NDR_PIPE_PULL_RTN)( char __RPC_FAR * state, void __RPC_FAR * buf, unsigned long esize, unsigned long __RPC_FAR * ecount ); typedef void ! (__RPC_FAR __RPC_API * NDR_PIPE_PUSH_RTN)( char __RPC_FAR * state, void __RPC_FAR * buf, unsigned long ecount ); typedef void ! (__RPC_FAR __RPC_API * NDR_PIPE_ALLOC_RTN)( char __RPC_FAR * state, unsigned long bsize, void __RPC_FAR * __RPC_FAR * buf, --- 681,700 ---- */ typedef void ! __RPC_FAR __RPC_API (* NDR_PIPE_PULL_RTN)( char __RPC_FAR * state, void __RPC_FAR * buf, unsigned long esize, unsigned long __RPC_FAR * ecount ); typedef void ! __RPC_FAR __RPC_API (* NDR_PIPE_PUSH_RTN)( char __RPC_FAR * state, void __RPC_FAR * buf, unsigned long ecount ); typedef void ! __RPC_FAR __RPC_API (* NDR_PIPE_ALLOC_RTN)( char __RPC_FAR * state, unsigned long bsize, void __RPC_FAR * __RPC_FAR * buf, *************** *** 838,845 **** unsigned long ActualCount; /* Allocation and Free routine to be used by the Ndr routines. */ ! void __RPC_FAR * (__RPC_FAR __RPC_API * pfnAllocate)(size_t); ! void (__RPC_FAR __RPC_API * pfnFree)(void __RPC_FAR *); /* * Top of parameter stack. Used for "single call" stubs during marshalling --- 846,857 ---- unsigned long ActualCount; /* Allocation and Free routine to be used by the Ndr routines. */ ! #ifdef __GNUC__ ! void __RPC_FAR * __RPC_FAR (* pfnAllocate)(size_t) __RPC_API ; ! #else ! void __RPC_FAR * __RPC_FAR __RPC_API (* pfnAllocate)(size_t); ! #endif ! void __RPC_FAR __RPC_API (* pfnFree)(void __RPC_FAR *); /* * Top of parameter stack. Used for "single call" stubs during marshalling *************** *** 936,946 **** /* * Generic handle bind/unbind routine pair. */ typedef void __RPC_FAR * ! (__RPC_FAR __RPC_API * GENERIC_BINDING_ROUTINE) (void __RPC_FAR *); typedef void ! (__RPC_FAR __RPC_API * GENERIC_UNBIND_ROUTINE) (void __RPC_FAR *, unsigned char __RPC_FAR *); typedef struct _GENERIC_BINDING_ROUTINE_PAIR --- 948,964 ---- /* * Generic handle bind/unbind routine pair. */ + #ifdef __GNUC__ typedef void __RPC_FAR * ! __RPC_FAR (* GENERIC_BINDING_ROUTINE) ! (void __RPC_FAR *) __RPC_API ; ! #else ! typedef void __RPC_FAR * ! __RPC_FAR __RPC_API (* GENERIC_BINDING_ROUTINE) (void __RPC_FAR *); + #endif typedef void ! __RPC_FAR __RPC_API (* GENERIC_UNBIND_ROUTINE) (void __RPC_FAR *, unsigned char __RPC_FAR *); typedef struct _GENERIC_BINDING_ROUTINE_PAIR *************** *** 968,974 **** #endif ! typedef void (__RPC_FAR __RPC_USER * XMIT_HELPER_ROUTINE) ( PMIDL_STUB_MESSAGE ); typedef struct _XMIT_ROUTINE_QUINTUPLE --- 986,992 ---- #endif ! typedef void __RPC_FAR __RPC_USER (* XMIT_HELPER_ROUTINE) ( PMIDL_STUB_MESSAGE ); typedef struct _XMIT_ROUTINE_QUINTUPLE *************** *** 980,1003 **** } XMIT_ROUTINE_QUINTUPLE, __RPC_FAR *PXMIT_ROUTINE_QUINTUPLE; typedef unsigned long ! (__RPC_FAR __RPC_USER * USER_MARSHAL_SIZING_ROUTINE) (unsigned long __RPC_FAR *, unsigned long, void __RPC_FAR * ); typedef unsigned char __RPC_FAR * ! (__RPC_FAR __RPC_USER * USER_MARSHAL_MARSHALLING_ROUTINE) (unsigned long __RPC_FAR *, unsigned char __RPC_FAR * , void __RPC_FAR * ); typedef unsigned char __RPC_FAR * ! (__RPC_FAR __RPC_USER * USER_MARSHAL_UNMARSHALLING_ROUTINE) (unsigned long __RPC_FAR *, unsigned char __RPC_FAR * , void __RPC_FAR * ); ! typedef void (__RPC_FAR __RPC_USER * USER_MARSHAL_FREEING_ROUTINE) (unsigned long __RPC_FAR *, void __RPC_FAR * ); --- 998,1035 ---- } XMIT_ROUTINE_QUINTUPLE, __RPC_FAR *PXMIT_ROUTINE_QUINTUPLE; typedef unsigned long ! __RPC_FAR __RPC_USER (* USER_MARSHAL_SIZING_ROUTINE) (unsigned long __RPC_FAR *, unsigned long, void __RPC_FAR * ); + #ifdef __GNUC__ + typedef unsigned char __RPC_FAR * + __RPC_FAR (* USER_MARSHAL_MARSHALLING_ROUTINE) + (unsigned long __RPC_FAR *, + unsigned char __RPC_FAR * , + void __RPC_FAR * ) __RPC_USER; + typedef unsigned char __RPC_FAR * ! __RPC_FAR (* USER_MARSHAL_UNMARSHALLING_ROUTINE) ! (unsigned long __RPC_FAR *, ! unsigned char __RPC_FAR * , ! void __RPC_FAR * ) __RPC_USER; ! #else ! typedef unsigned char __RPC_FAR * ! __RPC_FAR __RPC_USER (* USER_MARSHAL_MARSHALLING_ROUTINE) (unsigned long __RPC_FAR *, unsigned char __RPC_FAR * , void __RPC_FAR * ); typedef unsigned char __RPC_FAR * ! __RPC_FAR __RPC_USER (* USER_MARSHAL_UNMARSHALLING_ROUTINE) (unsigned long __RPC_FAR *, unsigned char __RPC_FAR * , void __RPC_FAR * ); + #endif ! typedef void __RPC_FAR __RPC_USER (* USER_MARSHAL_FREEING_ROUTINE) (unsigned long __RPC_FAR *, void __RPC_FAR * ); *************** *** 1022,1029 **** typedef struct _MALLOC_FREE_STRUCT { void __RPC_FAR * (__RPC_FAR __RPC_USER * pfnAllocate)(size_t); ! void (__RPC_FAR __RPC_USER * pfnFree)(void __RPC_FAR *); } MALLOC_FREE_STRUCT; typedef struct _COMM_FAULT_OFFSETS --- 1054,1065 ---- typedef struct _MALLOC_FREE_STRUCT { + #ifdef __GNUC__ + void __RPC_FAR * (* pfnAllocate)(size_t) __RPC_USER; + #else void __RPC_FAR * (__RPC_FAR __RPC_USER * pfnAllocate)(size_t); ! #endif ! void __RPC_FAR __RPC_USER (* pfnFree)(void __RPC_FAR *); } MALLOC_FREE_STRUCT; typedef struct _COMM_FAULT_OFFSETS *************** *** 1041,1048 **** void __RPC_FAR * RpcInterfaceInformation; void __RPC_FAR * (__RPC_FAR __RPC_API * pfnAllocate)(size_t); ! void (__RPC_FAR __RPC_API * pfnFree)(void __RPC_FAR *); union { --- 1077,1088 ---- void __RPC_FAR * RpcInterfaceInformation; + #ifdef __GNUC__ + void __RPC_FAR * (__RPC_FAR * pfnAllocate)(size_t) __RPC_API ; + #else void __RPC_FAR * (__RPC_FAR __RPC_API * pfnAllocate)(size_t); ! #endif ! void __RPC_FAR __RPC_API (* pfnFree)(void __RPC_FAR *); union { *************** *** 1100,1106 **** --- 1140,1150 ---- typedef struct _MIDL_FORMAT_STRING { short Pad; + #ifdef __GNUC__ + unsigned char Format[1]; + #else unsigned char Format[]; + #endif } MIDL_FORMAT_STRING; #if !defined( RC_INVOKED ) #pragma warning( default:4200 ) *************** *** 1109,1117 **** /* * Stub thunk used for some interpreted server stubs. */ ! typedef void (__RPC_FAR __RPC_API * STUB_THUNK)( PMIDL_STUB_MESSAGE ); ! typedef long (__RPC_FAR __RPC_API * SERVER_ROUTINE)(); /* * Server Interpreter's information strucuture. --- 1153,1161 ---- /* * Stub thunk used for some interpreted server stubs. */ ! typedef void __RPC_FAR __RPC_API (* STUB_THUNK)( PMIDL_STUB_MESSAGE ); ! typedef long __RPC_FAR __RPC_API (* SERVER_ROUTINE)(); /* * Server Interpreter's information strucuture. *************** *** 2231,2236 **** --- 2275,2284 ---- PROXY_SENDRECEIVE, PROXY_UNMARSHAL }PROXY_PHASE; + + #ifdef __GNUC__ + struct IRpcStubBuffer; + #endif long RPC_ENTRY NdrStubCall2( *** SHELLAPI.H Fri Aug 9 01:30:00 1996 --- SHELLAPI.H Sun Feb 9 12:03:44 1997 *************** *** 57,63 **** --- 57,67 ---- #else #define FindExecutable FindExecutableA #endif // !UNICODE + #ifdef __GNUC__ + WINSHELLAPI LPWSTR * CommandLineToArgvW(LPCWSTR lpCmdLine, int*pNumArgs) APIENTRY; + #else WINSHELLAPI LPWSTR * APIENTRY CommandLineToArgvW(LPCWSTR lpCmdLine, int*pNumArgs); + #endif WINSHELLAPI INT APIENTRY ShellAboutA(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIcon); WINSHELLAPI INT APIENTRY ShellAboutW(HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, HICON hIcon); *** WINBASE.H Fri Aug 9 01:30:00 1996 --- WINBASE.H Tue Feb 18 09:58:38 1997 *************** *** 235,247 **** WORD wMilliseconds; } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; ! typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)( LPVOID lpThreadParameter ); typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; #if(_WIN32_WINNT >= 0x0400) ! typedef VOID (WINAPI *PFIBER_START_ROUTINE)( LPVOID lpFiberParameter ); typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; --- 235,247 ---- WORD wMilliseconds; } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; ! typedef DWORD WINAPI (*PTHREAD_START_ROUTINE)( LPVOID lpThreadParameter ); typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; #if(_WIN32_WINNT >= 0x0400) ! typedef VOID WINAPI (*PFIBER_START_ROUTINE)( LPVOID lpFiberParameter ); typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; *************** *** 478,485 **** struct { WORD wProcessorArchitecture; WORD wReserved; ! }; ! }; DWORD dwPageSize; LPVOID lpMinimumApplicationAddress; LPVOID lpMaximumApplicationAddress; --- 478,485 ---- struct { WORD wProcessorArchitecture; WORD wReserved; ! }s; ! }u; DWORD dwPageSize; LPVOID lpMinimumApplicationAddress; LPVOID lpMaximumApplicationAddress; *************** *** 1453,1459 **** LPVOID lpFirstBlock; LPVOID lpLastBlock; } Region; ! }; } PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY, *PPROCESS_HEAP_ENTRY; #define PROCESS_HEAP_REGION 0x0001 --- 1453,1459 ---- LPVOID lpFirstBlock; LPVOID lpLastBlock; } Region; ! }u; } PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY, *PPROCESS_HEAP_ENTRY; #define PROCESS_HEAP_REGION 0x0001 *************** *** 1692,1698 **** struct _EXCEPTION_POINTERS *ExceptionInfo ); ! typedef LONG (WINAPI *PTOP_LEVEL_EXCEPTION_FILTER)( struct _EXCEPTION_POINTERS *ExceptionInfo ); typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; --- 1692,1698 ---- struct _EXCEPTION_POINTERS *ExceptionInfo ); ! typedef LONG WINAPI (*PTOP_LEVEL_EXCEPTION_FILTER)( struct _EXCEPTION_POINTERS *ExceptionInfo ); typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; *************** *** 2018,2024 **** #if(_WIN32_WINNT >= 0x0400) typedef VOID ! (APIENTRY *PAPCFUNC)( DWORD dwParam ); --- 2018,2024 ---- #if(_WIN32_WINNT >= 0x0400) typedef VOID ! APIENTRY (*PAPCFUNC)( DWORD dwParam ); *************** *** 3310,3316 **** typedef VOID ! (WINAPI *LPOVERLAPPED_COMPLETION_ROUTINE)( DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped --- 3310,3316 ---- typedef VOID ! WINAPI (*LPOVERLAPPED_COMPLETION_ROUTINE)( DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped *************** *** 3697,3703 **** #if(_WIN32_WINNT >= 0x0400) typedef VOID ! (APIENTRY *PTIMERAPCROUTINE)( LPVOID lpArgToCompletionRoutine, DWORD dwTimerLowValue, DWORD dwTimerHighValue --- 3697,3703 ---- #if(_WIN32_WINNT >= 0x0400) typedef VOID ! APIENTRY (*PTIMERAPCROUTINE)( LPVOID lpArgToCompletionRoutine, DWORD dwTimerLowValue, DWORD dwTimerHighValue *************** *** 4167,4177 **** #endif // !UNICODE #ifdef STRICT ! typedef BOOL (CALLBACK* ENUMRESTYPEPROC)(HMODULE hModule, LPTSTR lpType, LONG lParam); ! typedef BOOL (CALLBACK* ENUMRESNAMEPROC)(HMODULE hModule, LPCTSTR lpType, LPTSTR lpName, LONG lParam); ! typedef BOOL (CALLBACK* ENUMRESLANGPROC)(HMODULE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG lParam); #else typedef FARPROC ENUMRESTYPEPROC; --- 4167,4177 ---- #endif // !UNICODE #ifdef STRICT ! typedef BOOL CALLBACK (* ENUMRESTYPEPROC)(HMODULE hModule, LPTSTR lpType, LONG lParam); ! typedef BOOL CALLBACK (* ENUMRESNAMEPROC)(HMODULE hModule, LPCTSTR lpType, LPTSTR lpName, LONG lParam); ! typedef BOOL CALLBACK (* ENUMRESLANGPROC)(HMODULE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG lParam); #else typedef FARPROC ENUMRESTYPEPROC; *************** *** 5342,5348 **** #if(_WIN32_WINNT >= 0x0400) typedef DWORD ! (WINAPI *LPPROGRESS_ROUTINE)( LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, --- 5342,5348 ---- #if(_WIN32_WINNT >= 0x0400) typedef DWORD ! WINAPI (*LPPROGRESS_ROUTINE)( LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, *** WINCON.H Fri Aug 9 01:30:00 1996 --- WINCON.H Sun Feb 9 11:57:24 1997 *************** *** 162,168 **** typedef BOOL ! (WINAPI *PHANDLER_ROUTINE)( DWORD CtrlType ); --- 162,168 ---- typedef BOOL ! WINAPI (*PHANDLER_ROUTINE)( DWORD CtrlType ); *** WINDEF.H Wed Jun 5 11:24:10 1996 --- WINDEF.H Sun Feb 9 11:51:18 1997 *************** *** 183,191 **** typedef HANDLE HLOCAL; typedef HANDLE GLOBALHANDLE; typedef HANDLE LOCALHANDLE; ! typedef int (FAR WINAPI *FARPROC)(); ! typedef int (NEAR WINAPI *NEARPROC)(); ! typedef int (WINAPI *PROC)(); #ifdef STRICT typedef void NEAR* HGDIOBJ; --- 183,191 ---- typedef HANDLE HLOCAL; typedef HANDLE GLOBALHANDLE; typedef HANDLE LOCALHANDLE; ! typedef int FAR WINAPI (*FARPROC)(); ! typedef int NEAR WINAPI (*NEARPROC)(); ! typedef int WINAPI (*PROC)(); #ifdef STRICT typedef void NEAR* HGDIOBJ; *** WINDOWS.H Wed Jul 31 23:06:18 1996 --- WINDOWS.H Sun Feb 9 11:46:52 1997 *************** *** 16,21 **** --- 16,24 ---- #ifndef _WINDOWS_ #define _WINDOWS_ + #ifdef __GNUC__ + #include /* rsxnt: this should be the first include file */ + #endif #ifndef WINVER #define WINVER 0x0400 *** WINGDI.H Fri Aug 9 01:30:00 1996 --- WINGDI.H Sun Feb 9 11:54:00 1997 *************** *** 2230,2245 **** #ifdef STRICT #if !defined(NOTEXTMETRIC) ! typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST TEXTMETRICA *, DWORD, LPARAM); ! typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST TEXTMETRICW *, DWORD, LPARAM); #ifdef UNICODE #define OLDFONTENUMPROC OLDFONTENUMPROCW #else #define OLDFONTENUMPROC OLDFONTENUMPROCA #endif // !UNICODE #else ! typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA * ,CONST VOID *, DWORD, LPARAM); ! typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW * ,CONST VOID *, DWORD, LPARAM); #ifdef UNICODE #define OLDFONTENUMPROC OLDFONTENUMPROCW #else --- 2230,2245 ---- #ifdef STRICT #if !defined(NOTEXTMETRIC) ! typedef int CALLBACK (* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST TEXTMETRICA *, DWORD, LPARAM); ! typedef int CALLBACK (* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST TEXTMETRICW *, DWORD, LPARAM); #ifdef UNICODE #define OLDFONTENUMPROC OLDFONTENUMPROCW #else #define OLDFONTENUMPROC OLDFONTENUMPROCA #endif // !UNICODE #else ! typedef int CALLBACK (* OLDFONTENUMPROCA)(CONST LOGFONTA * ,CONST VOID *, DWORD, LPARAM); ! typedef int CALLBACK (* OLDFONTENUMPROCW)(CONST LOGFONTW * ,CONST VOID *, DWORD, LPARAM); #ifdef UNICODE #define OLDFONTENUMPROC OLDFONTENUMPROCW #else *************** *** 2255,2262 **** typedef FONTENUMPROCA FONTENUMPROC; #endif // UNICODE ! typedef int (CALLBACK* GOBJENUMPROC)(LPVOID, LPARAM); ! typedef VOID (CALLBACK* LINEDDAPROC)(int, int, LPARAM); #else typedef FARPROC OLDFONTENUMPROC; typedef FARPROC FONTENUMPROCA; --- 2255,2262 ---- typedef FONTENUMPROCA FONTENUMPROC; #endif // UNICODE ! typedef int CALLBACK (* GOBJENUMPROC)(LPVOID, LPARAM); ! typedef VOID CALLBACK (* LINEDDAPROC)(int, int, LPARAM); #else typedef FARPROC OLDFONTENUMPROC; typedef FARPROC FONTENUMPROCA; *************** *** 2371,2379 **** * functions for Win 3.1 compatibility */ ! typedef UINT (CALLBACK* LPFNDEVMODE)(HWND, HMODULE, LPDEVMODE, LPSTR, LPSTR, LPDEVMODE, LPSTR, UINT); ! typedef DWORD (CALLBACK* LPFNDEVCAPS)(LPSTR, LPSTR, UINT, LPSTR, LPDEVMODE); /* mode selections for the device mode function */ #define DM_UPDATE 1 --- 2371,2379 ---- * functions for Win 3.1 compatibility */ ! typedef UINT CALLBACK (* LPFNDEVMODE)(HWND, HMODULE, LPDEVMODE, LPSTR, LPSTR, LPDEVMODE, LPSTR, UINT); ! typedef DWORD CALLBACK (* LPFNDEVCAPS)(LPSTR, LPSTR, UINT, LPSTR, LPDEVMODE); /* mode selections for the device mode function */ #define DM_UPDATE 1 *************** *** 2745,2754 **** #ifndef NOMETAFILE WINGDIAPI BOOL WINAPI PlayMetaFileRecord(HDC, LPHANDLETABLE, LPMETARECORD, UINT); ! typedef int (CALLBACK* MFENUMPROC)(HDC, HANDLETABLE FAR*, METARECORD FAR*, int, LPARAM); WINGDIAPI BOOL WINAPI EnumMetaFile(HDC, HMETAFILE, MFENUMPROC, LPARAM); ! typedef int (CALLBACK* ENHMFENUMPROC)(HDC, HANDLETABLE FAR*, CONST ENHMETARECORD *, int, LPARAM); // Enhanced Metafile Function Declarations --- 2745,2754 ---- #ifndef NOMETAFILE WINGDIAPI BOOL WINAPI PlayMetaFileRecord(HDC, LPHANDLETABLE, LPMETARECORD, UINT); ! typedef int CALLBACK (* MFENUMPROC)(HDC, HANDLETABLE FAR*, METARECORD FAR*, int, LPARAM); WINGDIAPI BOOL WINAPI EnumMetaFile(HDC, HMETAFILE, MFENUMPROC, LPARAM); ! typedef int CALLBACK (* ENHMFENUMPROC)(HDC, HANDLETABLE FAR*, CONST ENHMETARECORD *, int, LPARAM); // Enhanced Metafile Function Declarations *************** *** 2885,2891 **** WINGDIAPI HPALETTE WINAPI CreateHalftonePalette(HDC); #ifdef STRICT ! typedef BOOL (CALLBACK* ABORTPROC)(HDC, int); #else typedef FARPROC ABORTPROC; #endif --- 2885,2891 ---- WINGDIAPI HPALETTE WINAPI CreateHalftonePalette(HDC); #ifdef STRICT ! typedef BOOL CALLBACK (* ABORTPROC)(HDC, int); #else typedef FARPROC ABORTPROC; #endif *************** *** 3079,3086 **** BOOL WINAPI GetDeviceGammaRamp(HDC,LPVOID); BOOL WINAPI SetDeviceGammaRamp(HDC,LPVOID); BOOL WINAPI ColorMatchToTarget(HDC,HDC,DWORD); ! typedef int (CALLBACK* ICMENUMPROCA)(LPSTR, LPARAM); ! typedef int (CALLBACK* ICMENUMPROCW)(LPWSTR, LPARAM); #ifdef UNICODE #define ICMENUMPROC ICMENUMPROCW #else --- 3079,3086 ---- BOOL WINAPI GetDeviceGammaRamp(HDC,LPVOID); BOOL WINAPI SetDeviceGammaRamp(HDC,LPVOID); BOOL WINAPI ColorMatchToTarget(HDC,HDC,DWORD); ! typedef int CALLBACK (* ICMENUMPROCA)(LPSTR, LPARAM); ! typedef int CALLBACK (* ICMENUMPROCW)(LPWSTR, LPARAM); #ifdef UNICODE #define ICMENUMPROC ICMENUMPROCW #else *** WINNETWK.H Fri Aug 9 01:30:00 1996 --- WINNETWK.H Sun Feb 9 11:58:36 1997 *************** *** 627,638 **** // User Profiles. // ! typedef UINT (FAR PASCAL *PFNGETPROFILEPATHA) ( LPCSTR pszUsername, LPSTR pszBuffer, UINT cbBuffer ); ! typedef UINT (FAR PASCAL *PFNGETPROFILEPATHW) ( LPCWSTR pszUsername, LPWSTR pszBuffer, UINT cbBuffer --- 627,638 ---- // User Profiles. // ! typedef UINT FAR PASCAL (*PFNGETPROFILEPATHA) ( LPCSTR pszUsername, LPSTR pszBuffer, UINT cbBuffer ); ! typedef UINT FAR PASCAL (*PFNGETPROFILEPATHW) ( LPCWSTR pszUsername, LPWSTR pszBuffer, UINT cbBuffer *************** *** 643,654 **** #define PFNGETPROFILEPATH PFNGETPROFILEPATHA #endif // !UNICODE ! typedef UINT (FAR PASCAL *PFNRECONCILEPROFILEA) ( LPCSTR pszCentralFile, LPCSTR pszLocalFile, DWORD dwFlags ); ! typedef UINT (FAR PASCAL *PFNRECONCILEPROFILEW) ( LPCWSTR pszCentralFile, LPCWSTR pszLocalFile, DWORD dwFlags --- 643,654 ---- #define PFNGETPROFILEPATH PFNGETPROFILEPATHA #endif // !UNICODE ! typedef UINT FAR PASCAL (*PFNRECONCILEPROFILEA) ( LPCSTR pszCentralFile, LPCSTR pszLocalFile, DWORD dwFlags ); ! typedef UINT FAR PASCAL (*PFNRECONCILEPROFILEW) ( LPCWSTR pszCentralFile, LPCWSTR pszLocalFile, DWORD dwFlags *************** *** 667,680 **** // Policies. // ! typedef BOOL (FAR PASCAL *PFNPROCESSPOLICIESA) ( HWND hwnd, LPCSTR pszPath, LPCSTR pszUsername, LPCSTR pszComputerName, DWORD dwFlags ); ! typedef BOOL (FAR PASCAL *PFNPROCESSPOLICIESW) ( HWND hwnd, LPCWSTR pszPath, LPCWSTR pszUsername, --- 667,680 ---- // Policies. // ! typedef BOOL FAR PASCAL (*PFNPROCESSPOLICIESA) ( HWND hwnd, LPCSTR pszPath, LPCSTR pszUsername, LPCSTR pszComputerName, DWORD dwFlags ); ! typedef BOOL FAR PASCAL (*PFNPROCESSPOLICIESW) ( HWND hwnd, LPCWSTR pszPath, LPCWSTR pszUsername, *** WINNLS.H Fri Aug 9 01:30:00 1996 --- WINNLS.H Sun Feb 9 11:56:54 1997 *************** *** 575,591 **** #ifdef STRICT ! typedef BOOL (CALLBACK* LOCALE_ENUMPROCA)(LPSTR); ! typedef BOOL (CALLBACK* CODEPAGE_ENUMPROCA)(LPSTR); ! typedef BOOL (CALLBACK* DATEFMT_ENUMPROCA)(LPSTR); ! typedef BOOL (CALLBACK* TIMEFMT_ENUMPROCA)(LPSTR); ! typedef BOOL (CALLBACK* CALINFO_ENUMPROCA)(LPSTR); ! typedef BOOL (CALLBACK* LOCALE_ENUMPROCW)(LPWSTR); ! typedef BOOL (CALLBACK* CODEPAGE_ENUMPROCW)(LPWSTR); ! typedef BOOL (CALLBACK* DATEFMT_ENUMPROCW)(LPWSTR); ! typedef BOOL (CALLBACK* TIMEFMT_ENUMPROCW)(LPWSTR); ! typedef BOOL (CALLBACK* CALINFO_ENUMPROCW)(LPWSTR); #else /* !STRICT */ --- 575,591 ---- #ifdef STRICT ! typedef BOOL CALLBACK (* LOCALE_ENUMPROCA)(LPSTR); ! typedef BOOL CALLBACK (* CODEPAGE_ENUMPROCA)(LPSTR); ! typedef BOOL CALLBACK (* DATEFMT_ENUMPROCA)(LPSTR); ! typedef BOOL CALLBACK (* TIMEFMT_ENUMPROCA)(LPSTR); ! typedef BOOL CALLBACK (* CALINFO_ENUMPROCA)(LPSTR); ! typedef BOOL CALLBACK (* LOCALE_ENUMPROCW)(LPWSTR); ! typedef BOOL CALLBACK (* CODEPAGE_ENUMPROCW)(LPWSTR); ! typedef BOOL CALLBACK (* DATEFMT_ENUMPROCW)(LPWSTR); ! typedef BOOL CALLBACK (* TIMEFMT_ENUMPROCW)(LPWSTR); ! typedef BOOL CALLBACK (* CALINFO_ENUMPROCW)(LPWSTR); #else /* !STRICT */ *** WINNT.H Fri Aug 9 01:30:00 1996 --- WINNT.H Tue Feb 18 10:28:30 1997 *************** *** 154,159 **** --- 154,160 ---- typedef WORD FSHORT; typedef DWORD FLONG; + #define _LCID_DEFINED typedef char CCHAR; typedef DWORD LCID; typedef PDWORD PLCID; *************** *** 196,206 **** struct { DWORD LowPart; LONG HighPart; ! }; struct { DWORD LowPart; LONG HighPart; ! } u; #endif //MIDL_PASS LONGLONG QuadPart; } LARGE_INTEGER; --- 197,207 ---- struct { DWORD LowPart; LONG HighPart; ! } s1; struct { DWORD LowPart; LONG HighPart; ! } s2; #endif //MIDL_PASS LONGLONG QuadPart; } LARGE_INTEGER; *************** *** 215,225 **** struct { DWORD LowPart; DWORD HighPart; ! }; struct { DWORD LowPart; DWORD HighPart; ! } u; #endif //MIDL_PASS DWORDLONG QuadPart; } ULARGE_INTEGER; --- 216,226 ---- struct { DWORD LowPart; DWORD HighPart; ! } s1; struct { DWORD LowPart; DWORD HighPart; ! } s2; #endif //MIDL_PASS DWORDLONG QuadPart; } ULARGE_INTEGER; *************** *** 355,360 **** --- 356,362 ---- DWORD ShiftCount ); + #ifndef __GNUC__ #pragma warning(disable:4035) // re-enable below __inline DWORDLONG *************** *** 406,411 **** --- 408,414 ---- } #pragma warning(default:4035) + #endif /* __GNUC__ */ #elif defined(_M_ALPHA) *************** *** 1263,1268 **** --- 1266,1272 ---- #if !defined(MIDL_PASS) && defined(_M_IX86) + #ifndef __GNUC__ #pragma warning (disable:4035) // disable 4035 (function must return something) _inline PVOID GetFiberData( void ) { __asm { mov eax, fs:[0x10] *************** *** 1272,1277 **** --- 1276,1282 ---- _inline PVOID GetCurrentFiber( void ) { __asm mov eax, fs:[0x10] } #pragma warning (default:4035) // Reenable it + #endif /* __GNUC__ */ #endif // begin_wx86 *************** *** 2097,2103 **** union { PVOID FiberData; DWORD Version; ! }; PVOID ArbitraryUserPointer; struct _NT_TIB *Self; } NT_TIB; --- 2102,2108 ---- union { PVOID FiberData; DWORD Version; ! }u; PVOID ArbitraryUserPointer; struct _NT_TIB *Self; } NT_TIB; *************** *** 2467,2473 **** BYTE Revision; BYTE SubAuthorityCount; SID_IDENTIFIER_AUTHORITY IdentifierAuthority; ! #ifdef MIDL_PASS [size_is(SubAuthorityCount)] DWORD SubAuthority[*]; #else // MIDL_PASS DWORD SubAuthority[ANYSIZE_ARRAY]; --- 2472,2478 ---- BYTE Revision; BYTE SubAuthorityCount; SID_IDENTIFIER_AUTHORITY IdentifierAuthority; ! #if defined(MIDL_PASS) [size_is(SubAuthorityCount)] DWORD SubAuthority[*]; #else // MIDL_PASS DWORD SubAuthority[ANYSIZE_ARRAY]; *************** *** 3906,3912 **** union { DWORD VirtualAddress; DWORD RelocCount; // Set to the real count when IMAGE_SCN_LNK_NRELOC_OVFL is set ! }; DWORD SymbolTableIndex; WORD Type; } IMAGE_RELOCATION; --- 3911,3917 ---- union { DWORD VirtualAddress; DWORD RelocCount; // Set to the real count when IMAGE_SCN_LNK_NRELOC_OVFL is set ! }u; DWORD SymbolTableIndex; WORD Type; } IMAGE_RELOCATION; *************** *** 4122,4128 **** union { DWORD Characteristics; // 0 for terminating null import descriptor PIMAGE_THUNK_DATA OriginalFirstThunk; // RVA to original unbound IAT ! }; DWORD TimeDateStamp; // 0 if not bound, // -1 if bound, and real date\time stamp // in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT (new BIND) --- 4127,4133 ---- union { DWORD Characteristics; // 0 for terminating null import descriptor PIMAGE_THUNK_DATA OriginalFirstThunk; // RVA to original unbound IAT ! }u; DWORD TimeDateStamp; // 0 if not bound, // -1 if bound, and real date\time stamp // in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT (new BIND) *************** *** 4157,4163 **** // typedef VOID ! (NTAPI *PIMAGE_TLS_CALLBACK) ( PVOID DllHandle, DWORD Reason, PVOID Reserved --- 4162,4168 ---- // typedef VOID ! NTAPI (*PIMAGE_TLS_CALLBACK) ( PVOID DllHandle, DWORD Reason, PVOID Reserved *************** *** 4224,4240 **** struct { DWORD NameOffset:31; DWORD NameIsString:1; ! }; DWORD Name; WORD Id; ! }; union { DWORD OffsetToData; struct { DWORD OffsetToDirectory:31; DWORD DataIsDirectory:1; ! }; ! }; } IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY; // --- 4229,4245 ---- struct { DWORD NameOffset:31; DWORD NameIsString:1; ! }s; DWORD Name; WORD Id; ! }u1; union { DWORD OffsetToData; struct { DWORD OffsetToDirectory:31; DWORD DataIsDirectory:1; ! }s; ! }u2; } IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY; // *** WINPERF.H Fri Aug 9 01:30:00 1996 --- WINPERF.H Tue Feb 18 11:03:02 1997 *************** *** 552,560 **** // // function typedefs for extensible counter function prototypes // ! typedef DWORD (APIENTRY PM_OPEN_PROC) (LPWSTR); ! typedef DWORD (APIENTRY PM_COLLECT_PROC) (LPWSTR, LPVOID *, LPDWORD, LPDWORD); ! typedef DWORD (APIENTRY PM_CLOSE_PROC) (void); #endif // _WINPERF_ --- 552,560 ---- // // function typedefs for extensible counter function prototypes // ! typedef DWORD APIENTRY (PM_OPEN_PROC) (LPWSTR); ! typedef DWORD APIENTRY (PM_COLLECT_PROC) (LPWSTR, LPVOID *, LPDWORD, LPDWORD); ! typedef DWORD APIENTRY (PM_CLOSE_PROC) (void); #endif // _WINPERF_ *** WINSOCK.H Fri Aug 9 01:30:00 1996 --- WINSOCK.H Tue Feb 18 11:09:24 1997 *************** *** 730,736 **** --- 730,740 ---- unsigned long PASCAL FAR inet_addr (const char FAR * cp); + #ifdef __GNUC__ + char * inet_ntoa (struct in_addr in) __stdcall; + #else char FAR * PASCAL FAR inet_ntoa (struct in_addr in); + #endif int PASCAL FAR listen (SOCKET s, int backlog); *************** *** 760,765 **** --- 764,786 ---- /* Database function prototypes */ + #ifdef __GNUC__ + struct hostent FAR * gethostbyaddr(const char FAR * addr, + int len, int type) __stdcall; + + struct hostent FAR * gethostbyname(const char FAR * name) __stdcall; + + int PASCAL FAR gethostname (char FAR * name, int namelen); + + struct servent FAR * getservbyport(int port, const char FAR * proto) __stdcall; + + struct servent FAR * getservbyname(const char FAR * name, + const char FAR * proto) __stdcall; + + struct protoent FAR * getprotobynumber(int proto) __stdcall; + + struct protoent FAR * getprotobyname(const char FAR * name) __stdcall; + #else struct hostent FAR * PASCAL FAR gethostbyaddr(const char FAR * addr, int len, int type); *************** *** 775,780 **** --- 796,802 ---- struct protoent FAR * PASCAL FAR getprotobynumber(int proto); struct protoent FAR * PASCAL FAR getprotobyname(const char FAR * name); + #endif /* Microsoft Windows Extension function prototypes */ *** WINSOCK2.H Fri Aug 9 01:30:00 1996 --- WINSOCK2.H Tue Feb 18 11:44:48 1997 *************** *** 1395,1401 **** #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! (WSAAPI * LPFN_ACCEPT)( SOCKET s, struct sockaddr FAR * addr, int FAR * addrlen --- 1395,1401 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! WSAAPI (* LPFN_ACCEPT)( SOCKET s, struct sockaddr FAR * addr, int FAR * addrlen *************** *** 1416,1422 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_BIND)( SOCKET s, const struct sockaddr FAR * name, int namelen --- 1416,1422 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_BIND)( SOCKET s, const struct sockaddr FAR * name, int namelen *************** *** 1435,1441 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_CLOSESOCKET)( SOCKET s ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1435,1441 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_CLOSESOCKET)( SOCKET s ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1454,1460 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_CONNECT)( SOCKET s, const struct sockaddr FAR * name, int namelen --- 1454,1460 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_CONNECT)( SOCKET s, const struct sockaddr FAR * name, int namelen *************** *** 1475,1481 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_IOCTLSOCKET)( SOCKET s, long cmd, u_long FAR * argp --- 1475,1481 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_IOCTLSOCKET)( SOCKET s, long cmd, u_long FAR * argp *************** *** 1496,1502 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_GETPEERNAME)( SOCKET s, struct sockaddr FAR * name, int FAR * namelen --- 1496,1502 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_GETPEERNAME)( SOCKET s, struct sockaddr FAR * name, int FAR * namelen *************** *** 1517,1523 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_GETSOCKNAME)( SOCKET s, struct sockaddr FAR * name, int FAR * namelen --- 1517,1523 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_GETSOCKNAME)( SOCKET s, struct sockaddr FAR * name, int FAR * namelen *************** *** 1540,1546 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_GETSOCKOPT)( SOCKET s, int level, int optname, --- 1540,1546 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_GETSOCKOPT)( SOCKET s, int level, int optname, *************** *** 1561,1567 **** #if INCL_WINSOCK_API_TYPEDEFS typedef u_long ! (WSAAPI * LPFN_HTONL)( u_long hostlong ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1561,1567 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef u_long ! WSAAPI (* LPFN_HTONL)( u_long hostlong ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1578,1584 **** #if INCL_WINSOCK_API_TYPEDEFS typedef u_short ! (WSAAPI * LPFN_HTONS)( u_short hostshort ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1578,1584 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef u_short ! WSAAPI (* LPFN_HTONS)( u_short hostshort ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1595,1601 **** #if INCL_WINSOCK_API_TYPEDEFS typedef unsigned long ! (WSAAPI * LPFN_INET_ADDR)( const char FAR * cp ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1595,1601 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef unsigned long ! WSAAPI (* LPFN_INET_ADDR)( const char FAR * cp ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1603,1620 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE char FAR * - WSAAPI inet_ntoa( struct in_addr in ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef char FAR * ! (WSAAPI * LPFN_INET_NTOA)( struct in_addr in ! ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES --- 1603,1619 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE char FAR * inet_ntoa( struct in_addr in ! ) WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef char FAR * ! (* LPFN_INET_NTOA)( struct in_addr in ! ) WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES *************** *** 1630,1636 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_LISTEN)( SOCKET s, int backlog ); --- 1629,1635 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_LISTEN)( SOCKET s, int backlog ); *************** *** 1648,1654 **** #if INCL_WINSOCK_API_TYPEDEFS typedef u_long ! (WSAAPI * LPFN_NTOHL)( u_long netlong ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1647,1653 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef u_long ! WSAAPI (* LPFN_NTOHL)( u_long netlong ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1665,1671 **** #if INCL_WINSOCK_API_TYPEDEFS typedef u_short ! (WSAAPI * LPFN_NTOHS)( u_short netshort ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1664,1670 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef u_short ! WSAAPI (* LPFN_NTOHS)( u_short netshort ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1685,1691 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_RECV)( SOCKET s, char FAR * buf, int len, --- 1684,1690 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_RECV)( SOCKET s, char FAR * buf, int len, *************** *** 1710,1716 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_RECVFROM)( SOCKET s, char FAR * buf, int len, --- 1709,1715 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_RECVFROM)( SOCKET s, char FAR * buf, int len, *************** *** 1736,1742 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_SELECT)( int nfds, fd_set FAR * readfds, fd_set FAR * writefds, --- 1735,1741 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_SELECT)( int nfds, fd_set FAR * readfds, fd_set FAR * writefds, *************** *** 1760,1766 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_SEND)( SOCKET s, const char FAR * buf, int len, --- 1759,1765 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_SEND)( SOCKET s, const char FAR * buf, int len, *************** *** 1785,1791 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_SENDTO)( SOCKET s, const char FAR * buf, int len, --- 1784,1790 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_SENDTO)( SOCKET s, const char FAR * buf, int len, *************** *** 1811,1817 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_SETSOCKOPT)( SOCKET s, int level, int optname, --- 1810,1816 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_SETSOCKOPT)( SOCKET s, int level, int optname, *************** *** 1833,1839 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_SHUTDOWN)( SOCKET s, int how ); --- 1832,1838 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_SHUTDOWN)( SOCKET s, int how ); *************** *** 1853,1859 **** #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! (WSAAPI * LPFN_SOCKET)( int af, int type, int protocol --- 1852,1858 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! WSAAPI (* LPFN_SOCKET)( int af, int type, int protocol *************** *** 1865,1903 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct hostent FAR * - WSAAPI gethostbyaddr( const char FAR * addr, int len, int type ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct hostent FAR * ! (WSAAPI * LPFN_GETHOSTBYADDR)( const char FAR * addr, int len, int type ! ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct hostent FAR * - WSAAPI gethostbyname( const char FAR * name ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct hostent FAR * ! (WSAAPI * LPFN_GETHOSTBYNAME)( const char FAR * name ! ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES --- 1864,1900 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct hostent FAR * gethostbyaddr( const char FAR * addr, int len, int type ! ) WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct hostent FAR * ! (* LPFN_GETHOSTBYADDR)( const char FAR * addr, int len, int type ! ) WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct hostent FAR * gethostbyname( const char FAR * name ! )WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct hostent FAR * ! (* LPFN_GETHOSTBYNAME)( const char FAR * name ! )WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES *************** *** 1913,1919 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_GETHOSTNAME)( char FAR * name, int namelen ); --- 1910,1916 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_GETHOSTNAME)( char FAR * name, int namelen ); *************** *** 1922,1994 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct servent FAR * - WSAAPI getservbyport( int port, const char FAR * proto ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct servent FAR * ! (WSAAPI * LPFN_GETSERVBYPORT)( int port, const char FAR * proto ! ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct servent FAR * - WSAAPI getservbyname( const char FAR * name, const char FAR * proto ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct servent FAR * ! (WSAAPI * LPFN_GETSERVBYNAME)( const char FAR * name, const char FAR * proto ! ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct protoent FAR * - WSAAPI getprotobynumber( int number ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct protoent FAR * ! (WSAAPI * LPFN_GETPROTOBYNUMBER)( int number ! ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct protoent FAR * - WSAAPI getprotobyname( const char FAR * name ! ); #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct protoent FAR * ! (WSAAPI * LPFN_GETPROTOBYNAME)( const char FAR * name ! ); #endif // INCL_WINSOCK_API_TYPEDEFS /* Microsoft Windows Extension function prototypes */ --- 1919,1987 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct servent FAR * getservbyport( int port, const char FAR * proto ! )WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct servent FAR * ! (* LPFN_GETSERVBYPORT)( int port, const char FAR * proto ! )WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct servent FAR * getservbyname( const char FAR * name, const char FAR * proto ! )WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct servent FAR * ! (* LPFN_GETSERVBYNAME)( const char FAR * name, const char FAR * proto ! )WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct protoent FAR * getprotobynumber( int number ! )WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct protoent FAR * ! (* LPFN_GETPROTOBYNUMBER)( int number ! )WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE struct protoent FAR * getprotobyname( const char FAR * name ! )WSAAPI; #endif // INCL_WINSOCK_API_PROTOTYPES #if INCL_WINSOCK_API_TYPEDEFS typedef struct protoent FAR * ! (* LPFN_GETPROTOBYNAME)( const char FAR * name ! )WSAAPI; #endif // INCL_WINSOCK_API_TYPEDEFS /* Microsoft Windows Extension function prototypes */ *************** *** 2006,2012 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSASTARTUP)( WORD wVersionRequested, LPWSADATA lpWSAData ); --- 1999,2005 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI(* LPFN_WSASTARTUP)( WORD wVersionRequested, LPWSADATA lpWSAData ); *************** *** 2024,2030 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSACLEANUP)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2017,2023 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSACLEANUP)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2041,2047 **** #if INCL_WINSOCK_API_TYPEDEFS typedef void ! (WSAAPI * LPFN_WSASETLASTERROR)( int iError ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2034,2040 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef void ! WSAAPI (* LPFN_WSASETLASTERROR)( int iError ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2058,2064 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAGETLASTERROR)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2051,2057 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAGETLASTERROR)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2075,2081 **** #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! (WSAAPI * LPFN_WSAISBLOCKING)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2068,2074 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! WSAAPI (* LPFN_WSAISBLOCKING)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2092,2098 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAUNHOOKBLOCKINGHOOK)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2085,2091 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAUNHOOKBLOCKINGHOOK)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2109,2115 **** #if INCL_WINSOCK_API_TYPEDEFS typedef FARPROC ! (WSAAPI * LPFN_WSASETBLOCKINGHOOK)( FARPROC lpBlockFunc ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2102,2108 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef FARPROC ! WSAAPI (* LPFN_WSASETBLOCKINGHOOK)( FARPROC lpBlockFunc ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2126,2132 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSACANCELBLOCKINGCALL)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2119,2125 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSACANCELBLOCKINGCALL)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2148,2154 **** #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! (WSAAPI * LPFN_WSAASYNCGETSERVBYNAME)( HWND hWnd, u_int wMsg, const char FAR * name, --- 2141,2147 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! WSAAPI (* LPFN_WSAASYNCGETSERVBYNAME)( HWND hWnd, u_int wMsg, const char FAR * name, *************** *** 2175,2181 **** #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! (WSAAPI * LPFN_WSAASYNCGETSERVBYPORT)( HWND hWnd, u_int wMsg, int port, --- 2168,2174 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! WSAAPI (* LPFN_WSAASYNCGETSERVBYPORT)( HWND hWnd, u_int wMsg, int port, *************** *** 2201,2207 **** #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! (WSAAPI * LPFN_WSAASYNCGETPROTOBYNAME)( HWND hWnd, u_int wMsg, const char FAR * name, --- 2194,2200 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! WSAAPI (* LPFN_WSAASYNCGETPROTOBYNAME)( HWND hWnd, u_int wMsg, const char FAR * name, *************** *** 2226,2232 **** #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! (WSAAPI * LPFN_WSAASYNCGETPROTOBYNUMBER)( HWND hWnd, u_int wMsg, int number, --- 2219,2225 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! WSAAPI (* LPFN_WSAASYNCGETPROTOBYNUMBER)( HWND hWnd, u_int wMsg, int number, *************** *** 2251,2257 **** #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! (WSAAPI * LPFN_WSAASYNCGETHOSTBYNAME)( HWND hWnd, u_int wMsg, const char FAR * name, --- 2244,2250 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! WSAAPI (* LPFN_WSAASYNCGETHOSTBYNAME)( HWND hWnd, u_int wMsg, const char FAR * name, *************** *** 2278,2284 **** #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! (WSAAPI * LPFN_WSAASYNCGETHOSTBYADDR)( HWND hWnd, u_int wMsg, const char FAR * addr, --- 2271,2277 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef HANDLE ! WSAAPI (* LPFN_WSAASYNCGETHOSTBYADDR)( HWND hWnd, u_int wMsg, const char FAR * addr, *************** *** 2301,2307 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSACANCELASYNCREQUEST)( HANDLE hAsyncTaskHandle ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2294,2300 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSACANCELASYNCREQUEST)( HANDLE hAsyncTaskHandle ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2321,2327 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAASYNCSELECT)( SOCKET s, HWND hWnd, u_int wMsg, --- 2314,2320 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAASYNCSELECT)( SOCKET s, HWND hWnd, u_int wMsg, *************** *** 2336,2342 **** typedef int ! (CALLBACK * LPCONDITIONPROC)( LPWSABUF lpCallerId, LPWSABUF lpCallerData, LPQOS lpSQOS, --- 2329,2335 ---- typedef int ! CALLBACK (* LPCONDITIONPROC)( LPWSABUF lpCallerId, LPWSABUF lpCallerData, LPQOS lpSQOS, *************** *** 2349,2355 **** typedef void ! (CALLBACK * LPWSAOVERLAPPED_COMPLETION_ROUTINE)( DWORD dwError, DWORD cbTransferred, LPWSAOVERLAPPED lpOverlapped, --- 2342,2348 ---- typedef void ! CALLBACK (* LPWSAOVERLAPPED_COMPLETION_ROUTINE)( DWORD dwError, DWORD cbTransferred, LPWSAOVERLAPPED lpOverlapped, *************** *** 2374,2380 **** #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! (WSAAPI * LPFN_WSAACCEPT)( SOCKET s, struct sockaddr FAR * addr, LPINT addrlen, --- 2367,2373 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! WSAAPI (* LPFN_WSAACCEPT)( SOCKET s, struct sockaddr FAR * addr, LPINT addrlen, *************** *** 2395,2401 **** #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! (WSAAPI * LPFN_WSACLOSEEVENT)( WSAEVENT hEvent ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2388,2394 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! WSAAPI (* LPFN_WSACLOSEEVENT)( WSAEVENT hEvent ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2418,2424 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSACONNECT)( SOCKET s, const struct sockaddr FAR * name, int namelen, --- 2411,2417 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSACONNECT)( SOCKET s, const struct sockaddr FAR * name, int namelen, *************** *** 2441,2447 **** #if INCL_WINSOCK_API_TYPEDEFS typedef WSAEVENT ! (WSAAPI * LPFN_WSACREATEEVENT)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2434,2440 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef WSAEVENT ! WSAAPI (* LPFN_WSACREATEEVENT)( void ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2473,2486 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSADUPLICATESOCKETA)( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOA lpProtocolInfo ); typedef int ! (WSAAPI * LPFN_WSADUPLICATESOCKETW)( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOW lpProtocolInfo --- 2466,2479 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSADUPLICATESOCKETA)( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOA lpProtocolInfo ); typedef int ! WSAAPI (* LPFN_WSADUPLICATESOCKETW)( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOW lpProtocolInfo *************** *** 2506,2512 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAENUMNETWORKEVENTS)( SOCKET s, WSAEVENT hEventObject, LPWSANETWORKEVENTS lpNetworkEvents --- 2499,2505 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAENUMNETWORKEVENTS)( SOCKET s, WSAEVENT hEventObject, LPWSANETWORKEVENTS lpNetworkEvents *************** *** 2540,2553 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAENUMPROTOCOLSA)( LPINT lpiProtocols, LPWSAPROTOCOL_INFOA lpProtocolBuffer, LPDWORD lpdwBufferLength ); typedef int ! (WSAAPI * LPFN_WSAENUMPROTOCOLSW)( LPINT lpiProtocols, LPWSAPROTOCOL_INFOW lpProtocolBuffer, LPDWORD lpdwBufferLength --- 2533,2546 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAENUMPROTOCOLSA)( LPINT lpiProtocols, LPWSAPROTOCOL_INFOA lpProtocolBuffer, LPDWORD lpdwBufferLength ); typedef int ! WSAAPI (* LPFN_WSAENUMPROTOCOLSW)( LPINT lpiProtocols, LPWSAPROTOCOL_INFOW lpProtocolBuffer, LPDWORD lpdwBufferLength *************** *** 2573,2579 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAEVENTSELECT)( SOCKET s, WSAEVENT hEventObject, long lNetworkEvents --- 2566,2572 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAEVENTSELECT)( SOCKET s, WSAEVENT hEventObject, long lNetworkEvents *************** *** 2596,2602 **** #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! (WSAAPI * LPFN_WSAGETOVERLAPPEDRESULT)( SOCKET s, LPWSAOVERLAPPED lpOverlapped, LPDWORD lpcbTransfer, --- 2589,2595 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! WSAAPI (* LPFN_WSAGETOVERLAPPEDRESULT)( SOCKET s, LPWSAOVERLAPPED lpOverlapped, LPDWORD lpcbTransfer, *************** *** 2619,2625 **** #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! (WSAAPI * LPFN_WSAGETQOSBYNAME)( SOCKET s, LPWSABUF lpQOSName, LPQOS lpQOS --- 2612,2618 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! WSAAPI (* LPFN_WSAGETQOSBYNAME)( SOCKET s, LPWSABUF lpQOSName, LPQOS lpQOS *************** *** 2640,2646 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAHTONL)( SOCKET s, u_long hostlong, u_long FAR * lpnetlong --- 2633,2639 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAHTONL)( SOCKET s, u_long hostlong, u_long FAR * lpnetlong *************** *** 2661,2667 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAHTONS)( SOCKET s, u_short hostshort, u_short FAR * lpnetshort --- 2654,2660 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAHTONS)( SOCKET s, u_short hostshort, u_short FAR * lpnetshort *************** *** 2688,2694 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSAIOCTL)( SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer, --- 2681,2687 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSAIOCTL)( SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer, *************** *** 2720,2726 **** #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! (WSAAPI * LPFN_WSAJOINLEAF)( SOCKET s, const struct sockaddr FAR * name, int namelen, --- 2713,2719 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! WSAAPI (* LPFN_WSAJOINLEAF)( SOCKET s, const struct sockaddr FAR * name, int namelen, *************** *** 2746,2752 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSANTOHL)( SOCKET s, u_long netlong, u_long FAR * lphostlong --- 2739,2745 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSANTOHL)( SOCKET s, u_long netlong, u_long FAR * lphostlong *************** *** 2767,2773 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSANTOHS)( SOCKET s, u_short netshort, u_short FAR * lphostshort --- 2760,2766 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSANTOHS)( SOCKET s, u_short netshort, u_short FAR * lphostshort *************** *** 2792,2798 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSARECV)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, --- 2785,2791 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSARECV)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, *************** *** 2816,2822 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSARECVDISCONNECT)( SOCKET s, LPWSABUF lpInboundDisconnectData ); --- 2809,2815 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSARECVDISCONNECT)( SOCKET s, LPWSABUF lpInboundDisconnectData ); *************** *** 2842,2848 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSARECVFROM)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, --- 2835,2841 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSARECVFROM)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, *************** *** 2867,2873 **** #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! (WSAAPI * LPFN_WSARESETEVENT)( WSAEVENT hEvent ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2860,2866 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! WSAAPI (* LPFN_WSARESETEVENT)( WSAEVENT hEvent ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2890,2896 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSASEND)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, --- 2883,2889 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSASEND)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, *************** *** 2914,2920 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSASENDDISCONNECT)( SOCKET s, LPWSABUF lpOutboundDisconnectData ); --- 2907,2913 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSASENDDISCONNECT)( SOCKET s, LPWSABUF lpOutboundDisconnectData ); *************** *** 2940,2946 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSASENDTO)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, --- 2933,2939 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (* LPFN_WSASENDTO)( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, *************** *** 2965,2971 **** #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! (WSAAPI * LPFN_WSASETEVENT)( WSAEVENT hEvent ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 2958,2964 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef BOOL ! WSAAPI (* LPFN_WSASETEVENT)( WSAEVENT hEvent ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 3003,3009 **** #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! (WSAAPI * LPFN_WSASOCKETA)( int af, int type, int protocol, --- 2996,3002 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! WSAAPI (* LPFN_WSASOCKETA)( int af, int type, int protocol, *************** *** 3013,3019 **** ); typedef SOCKET ! (WSAAPI * LPFN_WSASOCKETW)( int af, int type, int protocol, --- 3006,3012 ---- ); typedef SOCKET ! WSAAPI (* LPFN_WSASOCKETW)( int af, int type, int protocol, *************** *** 3044,3050 **** #if INCL_WINSOCK_API_TYPEDEFS typedef DWORD ! (WSAAPI * LPFN_WSAWAITFORMULTIPLEEVENTS)( DWORD cEvents, const WSAEVENT FAR * lphEvents, BOOL fWaitAll, --- 3037,3043 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef DWORD ! WSAAPI (* LPFN_WSAWAITFORMULTIPLEEVENTS)( DWORD cEvents, const WSAEVENT FAR * lphEvents, BOOL fWaitAll, *************** *** 3084,3090 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSAADDRESSTOSTRINGA)( IN LPSOCKADDR lpsaAddress, IN DWORD dwAddressLength, IN LPWSAPROTOCOL_INFOA lpProtocolInfo, --- 3077,3083 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSAADDRESSTOSTRINGA)( IN LPSOCKADDR lpsaAddress, IN DWORD dwAddressLength, IN LPWSAPROTOCOL_INFOA lpProtocolInfo, *************** *** 3093,3099 **** ); typedef INT ! (WSAAPI * LPFN_WSAADDRESSTOSTRINGW)( IN LPSOCKADDR lpsaAddress, IN DWORD dwAddressLength, IN LPWSAPROTOCOL_INFOW lpProtocolInfo, --- 3086,3092 ---- ); typedef INT ! WSAAPI (* LPFN_WSAADDRESSTOSTRINGW)( IN LPSOCKADDR lpsaAddress, IN DWORD dwAddressLength, IN LPWSAPROTOCOL_INFOW lpProtocolInfo, *************** *** 3138,3144 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSASTRINGTOADDRESSA)( IN LPSTR AddressString, IN INT AddressFamily, IN LPWSAPROTOCOL_INFOA lpProtocolInfo, --- 3131,3137 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSASTRINGTOADDRESSA)( IN LPSTR AddressString, IN INT AddressFamily, IN LPWSAPROTOCOL_INFOA lpProtocolInfo, *************** *** 3147,3153 **** ); typedef INT ! (WSAAPI * LPFN_WSASTRINGTOADDRESSW)( IN LPWSTR AddressString, IN INT AddressFamily, IN LPWSAPROTOCOL_INFOW lpProtocolInfo, --- 3140,3146 ---- ); typedef INT ! WSAAPI (* LPFN_WSASTRINGTOADDRESSW)( IN LPWSTR AddressString, IN INT AddressFamily, IN LPWSAPROTOCOL_INFOW lpProtocolInfo, *************** *** 3191,3204 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSALOOKUPSERVICEBEGINA)( IN LPWSAQUERYSETA lpqsRestrictions, IN DWORD dwControlFlags, OUT LPHANDLE lphLookup ); typedef INT ! (WSAAPI * LPFN_WSALOOKUPSERVICEBEGINW)( IN LPWSAQUERYSETW lpqsRestrictions, IN DWORD dwControlFlags, OUT LPHANDLE lphLookup --- 3184,3197 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSALOOKUPSERVICEBEGINA)( IN LPWSAQUERYSETA lpqsRestrictions, IN DWORD dwControlFlags, OUT LPHANDLE lphLookup ); typedef INT ! WSAAPI (* LPFN_WSALOOKUPSERVICEBEGINW)( IN LPWSAQUERYSETW lpqsRestrictions, IN DWORD dwControlFlags, OUT LPHANDLE lphLookup *************** *** 3239,3245 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSALOOKUPSERVICENEXTA)( IN HANDLE hLookup, IN DWORD dwControlFlags, IN OUT LPDWORD lpdwBufferLength, --- 3232,3238 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSALOOKUPSERVICENEXTA)( IN HANDLE hLookup, IN DWORD dwControlFlags, IN OUT LPDWORD lpdwBufferLength, *************** *** 3247,3253 **** ); typedef INT ! (WSAAPI * LPFN_WSALOOKUPSERVICENEXTW)( IN HANDLE hLookup, IN DWORD dwControlFlags, IN OUT LPDWORD lpdwBufferLength, --- 3240,3246 ---- ); typedef INT ! WSAAPI (* LPFN_WSALOOKUPSERVICENEXTW)( IN HANDLE hLookup, IN DWORD dwControlFlags, IN OUT LPDWORD lpdwBufferLength, *************** *** 3272,3278 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSALOOKUPSERVICEEND)( IN HANDLE hLookup ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 3265,3271 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSALOOKUPSERVICEEND)( IN HANDLE hLookup ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 3300,3311 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSAINSTALLSERVICECLASSA)( IN LPWSASERVICECLASSINFOA lpServiceClassInfo ); typedef INT ! (WSAAPI * LPFN_WSAINSTALLSERVICECLASSW)( IN LPWSASERVICECLASSINFOW lpServiceClassInfo ); #ifdef UNICODE --- 3293,3304 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSAINSTALLSERVICECLASSA)( IN LPWSASERVICECLASSINFOA lpServiceClassInfo ); typedef INT ! WSAAPI (* LPFN_WSAINSTALLSERVICECLASSW)( IN LPWSASERVICECLASSINFOW lpServiceClassInfo ); #ifdef UNICODE *************** *** 3327,3333 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSAREMOVESERVICECLASS)( IN LPGUID lpServiceClassId ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 3320,3326 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSAREMOVESERVICECLASS)( IN LPGUID lpServiceClassId ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 3361,3367 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSAGETSERVICECLASSINFOA)( IN LPGUID lpProviderId, IN LPGUID lpServiceClassId, IN OUT LPDWORD lpdwBufSize, --- 3354,3360 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSAGETSERVICECLASSINFOA)( IN LPGUID lpProviderId, IN LPGUID lpServiceClassId, IN OUT LPDWORD lpdwBufSize, *************** *** 3369,3375 **** ); typedef INT ! (WSAAPI * LPFN_WSAGETSERVICECLASSINFOW)( IN LPGUID lpProviderId, IN LPGUID lpServiceClassId, IN OUT LPDWORD lpdwBufSize, --- 3362,3368 ---- ); typedef INT ! WSAAPI (* LPFN_WSAGETSERVICECLASSINFOW)( IN LPGUID lpProviderId, IN LPGUID lpServiceClassId, IN OUT LPDWORD lpdwBufSize, *************** *** 3407,3419 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSAENUMNAMESPACEPROVIDERSA)( IN OUT LPDWORD lpdwBufferLength, IN LPWSANAMESPACE_INFOA lpnspBuffer ); typedef INT ! (WSAAPI * LPFN_WSAENUMNAMESPACEPROVIDERSW)( IN OUT LPDWORD lpdwBufferLength, IN LPWSANAMESPACE_INFOW lpnspBuffer ); --- 3400,3412 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSAENUMNAMESPACEPROVIDERSA)( IN OUT LPDWORD lpdwBufferLength, IN LPWSANAMESPACE_INFOA lpnspBuffer ); typedef INT ! WSAAPI (* LPFN_WSAENUMNAMESPACEPROVIDERSW)( IN OUT LPDWORD lpdwBufferLength, IN LPWSANAMESPACE_INFOW lpnspBuffer ); *************** *** 3451,3464 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)( IN LPGUID lpServiceClassId, OUT LPSTR lpszServiceClassName, IN OUT LPDWORD lpdwBufferLength ); typedef INT ! (WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)( IN LPGUID lpServiceClassId, OUT LPWSTR lpszServiceClassName, IN OUT LPDWORD lpdwBufferLength --- 3444,3457 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)( IN LPGUID lpServiceClassId, OUT LPSTR lpszServiceClassName, IN OUT LPDWORD lpdwBufferLength ); typedef INT ! WSAAPI (* LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)( IN LPGUID lpServiceClassId, OUT LPWSTR lpszServiceClassName, IN OUT LPDWORD lpdwBufferLength *************** *** 3497,3510 **** #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! (WSAAPI * LPFN_WSASETSERVICEA)( IN LPWSAQUERYSETA lpqsRegInfo, IN WSAESETSERVICEOP essoperation, IN DWORD dwControlFlags ); typedef INT ! (WSAAPI * LPFN_WSASETSERVICEW)( IN LPWSAQUERYSETW lpqsRegInfo, IN WSAESETSERVICEOP essoperation, IN DWORD dwControlFlags --- 3490,3503 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef INT ! WSAAPI (* LPFN_WSASETSERVICEA)( IN LPWSAQUERYSETA lpqsRegInfo, IN WSAESETSERVICEOP essoperation, IN DWORD dwControlFlags ); typedef INT ! WSAAPI (* LPFN_WSASETSERVICEW)( IN LPWSAQUERYSETW lpqsRegInfo, IN WSAESETSERVICEOP essoperation, IN DWORD dwControlFlags *** WINUSER.H Mon Jul 22 14:34:14 1996 --- WINUSER.H Sun Feb 9 11:56:08 1997 *************** *** 49,76 **** typedef LPMENUTEMPLATEA LPMENUTEMPLATE; #endif // UNICODE ! typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM); #ifdef STRICT ! typedef BOOL (CALLBACK* DLGPROC)(HWND, UINT, WPARAM, LPARAM); ! typedef VOID (CALLBACK* TIMERPROC)(HWND, UINT, UINT, DWORD); ! typedef BOOL (CALLBACK* GRAYSTRINGPROC)(HDC, LPARAM, int); ! typedef BOOL (CALLBACK* WNDENUMPROC)(HWND, LPARAM); ! typedef LRESULT (CALLBACK* HOOKPROC)(int code, WPARAM wParam, LPARAM lParam); ! typedef VOID (CALLBACK* SENDASYNCPROC)(HWND, UINT, DWORD, LRESULT); ! typedef BOOL (CALLBACK* PROPENUMPROCA)(HWND, LPCSTR, HANDLE); ! typedef BOOL (CALLBACK* PROPENUMPROCW)(HWND, LPCWSTR, HANDLE); ! typedef BOOL (CALLBACK* PROPENUMPROCEXA)(HWND, LPSTR, HANDLE, DWORD); ! typedef BOOL (CALLBACK* PROPENUMPROCEXW)(HWND, LPWSTR, HANDLE, DWORD); ! typedef int (CALLBACK* EDITWORDBREAKPROCA)(LPSTR lpch, int ichCurrent, int cch, int code); ! typedef int (CALLBACK* EDITWORDBREAKPROCW)(LPWSTR lpch, int ichCurrent, int cch, int code); #if(WINVER >= 0x0400) ! typedef BOOL (CALLBACK* DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int cx, int cy); #endif /* WINVER >= 0x0400 */ #else /* !STRICT */ --- 49,76 ---- typedef LPMENUTEMPLATEA LPMENUTEMPLATE; #endif // UNICODE ! typedef LRESULT CALLBACK (* WNDPROC)(HWND, UINT, WPARAM, LPARAM); #ifdef STRICT ! typedef BOOL CALLBACK (* DLGPROC)(HWND, UINT, WPARAM, LPARAM); ! typedef VOID CALLBACK (* TIMERPROC)(HWND, UINT, UINT, DWORD); ! typedef BOOL CALLBACK (* GRAYSTRINGPROC)(HDC, LPARAM, int); ! typedef BOOL CALLBACK (* WNDENUMPROC)(HWND, LPARAM); ! typedef LRESULT CALLBACK (* HOOKPROC)(int code, WPARAM wParam, LPARAM lParam); ! typedef VOID CALLBACK (* SENDASYNCPROC)(HWND, UINT, DWORD, LRESULT); ! typedef BOOL CALLBACK (* PROPENUMPROCA)(HWND, LPCSTR, HANDLE); ! typedef BOOL CALLBACK (* PROPENUMPROCW)(HWND, LPCWSTR, HANDLE); ! typedef BOOL CALLBACK (* PROPENUMPROCEXA)(HWND, LPSTR, HANDLE, DWORD); ! typedef BOOL CALLBACK (* PROPENUMPROCEXW)(HWND, LPWSTR, HANDLE, DWORD); ! typedef int CALLBACK (* EDITWORDBREAKPROCA)(LPSTR lpch, int ichCurrent, int cch, int code); ! typedef int CALLBACK (* EDITWORDBREAKPROCW)(LPWSTR lpch, int ichCurrent, int cch, int code); #if(WINVER >= 0x0400) ! typedef BOOL CALLBACK (* DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int cx, int cy); #endif /* WINVER >= 0x0400 */ #else /* !STRICT */ *************** *** 107,114 **** #ifdef STRICT ! typedef BOOL (CALLBACK* NAMEENUMPROCA)(LPSTR, LPARAM); ! typedef BOOL (CALLBACK* NAMEENUMPROCW)(LPWSTR, LPARAM); typedef NAMEENUMPROCA WINSTAENUMPROCA; typedef NAMEENUMPROCA DESKTOPENUMPROCA; --- 107,114 ---- #ifdef STRICT ! typedef BOOL CALLBACK (* NAMEENUMPROCA)(LPSTR, LPARAM); ! typedef BOOL CALLBACK (* NAMEENUMPROCW)(LPWSTR, LPARAM); typedef NAMEENUMPROCA WINSTAENUMPROCA; typedef NAMEENUMPROCA DESKTOPENUMPROCA; *************** *** 5710,5716 **** #if(WINVER >= 0x0400) ! typedef void (CALLBACK *MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo); typedef struct tagMSGBOXPARAMSA { --- 5710,5716 ---- #if(WINVER >= 0x0400) ! typedef void CALLBACK (*MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo); typedef struct tagMSGBOXPARAMSA { *** WINSVC.H Fri Aug 9 01:30:00 1996 --- WINSVC.H Sun Feb 9 11:59:30 1997 *************** *** 271,282 **** // Function Prototype for the Service Main Function // ! typedef VOID (WINAPI *LPSERVICE_MAIN_FUNCTIONW)( DWORD dwNumServicesArgs, LPWSTR *lpServiceArgVectors ); ! typedef VOID (WINAPI *LPSERVICE_MAIN_FUNCTIONA)( DWORD dwNumServicesArgs, LPSTR *lpServiceArgVectors ); --- 271,282 ---- // Function Prototype for the Service Main Function // ! typedef VOID WINAPI (*LPSERVICE_MAIN_FUNCTIONW)( DWORD dwNumServicesArgs, LPWSTR *lpServiceArgVectors ); ! typedef VOID WINAPI (*LPSERVICE_MAIN_FUNCTIONA)( DWORD dwNumServicesArgs, LPSTR *lpServiceArgVectors ); *************** *** 312,318 **** // Prototype for the Service Control Handler Function // ! typedef VOID (WINAPI *LPHANDLER_FUNCTION)( DWORD dwControl ); --- 312,318 ---- // Prototype for the Service Control Handler Function // ! typedef VOID WINAPI (*LPHANDLER_FUNCTION)( DWORD dwControl ); *** WTYPES.H Fri Aug 9 01:30:00 1996 --- WTYPES.H Tue Feb 18 10:39:56 1997 *************** *** 358,364 **** typedef const RECT __RPC_FAR *LPCRECT; - #endif //_WINDEF_ typedef unsigned char UCHAR; typedef short SHORT; --- 358,363 ---- *************** *** 367,372 **** --- 366,372 ---- typedef DWORD ULONG; + #endif //_WINDEF_ typedef double DOUBLE; #ifndef _DWORDLONG_ *************** *** 374,387 **** typedef DWORDLONG __RPC_FAR *PDWORDLONG; #endif // !_DWORDLONG_ #ifndef _ULONGLONG_ - typedef hyper LONGLONG; typedef MIDL_uhyper ULONGLONG; - typedef LONGLONG __RPC_FAR *PLONGLONG; - typedef ULONGLONG __RPC_FAR *PULONGLONG; #endif // _ULONGLONG_ --- 374,387 ---- typedef DWORDLONG __RPC_FAR *PDWORDLONG; + typedef hyper LONGLONG; + typedef LONGLONG __RPC_FAR *PLONGLONG; #endif // !_DWORDLONG_ + #ifndef _ULONGLONG_ typedef MIDL_uhyper ULONGLONG; typedef ULONGLONG __RPC_FAR *PULONGLONG; #endif // _ULONGLONG_ *************** *** 1061,1067 **** struct { BYTE scale; BYTE sign; ! }; USHORT signscale; }; ULONG Hi32; --- 1061,1067 ---- struct { BYTE scale; BYTE sign; ! } s; USHORT signscale; }; ULONG Hi32; *************** *** 1091,1097 **** /* 0 == FALSE, -1 == TRUE */ typedef short VARIANT_BOOL; ! #if !__STDC__ && (_MSC_VER <= 1000) /* For backward compatibility */ typedef VARIANT_BOOL _VARIANT_BOOL; --- 1091,1097 ---- /* 0 == FALSE, -1 == TRUE */ typedef short VARIANT_BOOL; ! #if (!__STDC__ && (_MSC_VER <= 1000)) || defined (__GNUC__) /* For backward compatibility */ typedef VARIANT_BOOL _VARIANT_BOOL;