From: Darren Grant Newsgroups: comp.os.msdos.djgpp Subject: Re: MSSDK Date: Thu, 09 Oct 1997 00:53:00 -0700 Organization: Vancouver Classic Video Games Club, http://www.vcvgc.bc.ca/ Lines: 4817 Message-ID: <343C8D5C.3413@vxl.imag.net> References: <343af5b90273002 AT bj DOT col DOT com DOT cn> Reply-To: darn AT merlin DOT imag DOT net NNTP-Posting-Host: 209.17.137.245 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EF13F665679" To: djgpp AT delorie DOT com DJ-Gateway: from newsgroup comp.os.msdos.djgpp Precedence: bulk This is a multi-part message in MIME format. --------------EF13F665679 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit tanph AT bj DOT col DOT com DOT cn wrote: > > Do I have to use MSSDK header to do serious Win32 programming using > RSXNTDJ 1.3.1? Headers are necessary of course, but if you know what's what, you can decrease compile time by being critical about what header files you include. Also, since the release of 1.3.1, the mssdk header files have been changed so that the included patch.dif file no longer works. I obtained an updated patch.dif file from Rainer, but don't know whether it's on the djgpp mirrors yet. Anyways, find it attached to this msg (hope no one minds). --------------EF13F665679 Content-Type: text/plain; charset=us-ascii; name="Patch.dif" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Patch.dif" *** f:/mssdk/include/WINDOWS.H Thu Aug 1 00:06:18 1996 --- WINDOWS.H Sun Sep 28 10:15:12 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 *************** *** 159,165 **** --- 162,170 ---- #ifdef INC_OLE1 #include #else + #ifndef __GNUC__ #include + #endif /* GNUC */ #endif /* !INC_OLE1 */ #endif /* !NOGDI */ #endif /* WIN32_LEAN_AND_MEAN */ *** f:/mssdk/include/WINNT.H Fri Feb 21 17:17:34 1997 --- WINNT.H Sun Sep 28 10:14:16 1997 *************** *** 242,248 **** typedef LONGLONG USN; ! #if defined(MIDL_PASS) typedef struct _LARGE_INTEGER { #else // MIDL_PASS typedef union _LARGE_INTEGER { --- 242,248 ---- typedef LONGLONG USN; ! #if defined(MIDL_PASS) || defined(__GNUC__) typedef struct _LARGE_INTEGER { #else // MIDL_PASS typedef union _LARGE_INTEGER { *************** *** 261,267 **** typedef LARGE_INTEGER *PLARGE_INTEGER; ! #if defined(MIDL_PASS) typedef struct _ULARGE_INTEGER { #else // MIDL_PASS typedef union _ULARGE_INTEGER { --- 261,267 ---- typedef LARGE_INTEGER *PLARGE_INTEGER; ! #if defined(MIDL_PASS) || defined(__GNUC__) typedef struct _ULARGE_INTEGER { #else // MIDL_PASS typedef union _ULARGE_INTEGER { *************** *** 296,302 **** // 32-bits by 32-bits to form a 64-bit product. // ! #if defined(MIDL_PASS) || defined(RC_INVOKED) // // Midl does not understand inline assembler. Therefore, the Rtl functions --- 296,302 ---- // 32-bits by 32-bits to form a 64-bit product. // ! #if defined(MIDL_PASS) || defined(RC_INVOKED) || defined(__GNUC__) // // Midl does not understand inline assembler. Therefore, the Rtl functions *************** *** 1315,1321 **** #endif ! #if !defined(MIDL_PASS) && defined(_M_IX86) #pragma warning (disable:4035) // disable 4035 (function must return something) _inline PVOID GetFiberData( void ) { __asm { mov eax, fs:[0x10] --- 1315,1321 ---- #endif ! #if !defined(MIDL_PASS) && defined(_M_IX86) && !defined(__GNUC__) #pragma warning (disable:4035) // disable 4035 (function must return something) _inline PVOID GetFiberData( void ) { __asm { mov eax, fs:[0x10] *************** *** 2150,2156 **** union { PVOID FiberData; DWORD Version; ! }; PVOID ArbitraryUserPointer; struct _NT_TIB *Self; } NT_TIB; --- 2150,2156 ---- union { PVOID FiberData; DWORD Version; ! }u1; PVOID ArbitraryUserPointer; struct _NT_TIB *Self; } NT_TIB; *************** *** 3974,3980 **** union { DWORD VirtualAddress; DWORD RelocCount; // Set to the real count when IMAGE_SCN_LNK_NRELOC_OVFL is set ! }; DWORD SymbolTableIndex; WORD Type; } IMAGE_RELOCATION; --- 3974,3980 ---- union { DWORD VirtualAddress; DWORD RelocCount; // Set to the real count when IMAGE_SCN_LNK_NRELOC_OVFL is set ! }u1; DWORD SymbolTableIndex; WORD Type; } IMAGE_RELOCATION; *************** *** 4190,4196 **** 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) --- 4190,4196 ---- union { DWORD Characteristics; // 0 for terminating null import descriptor PIMAGE_THUNK_DATA OriginalFirstThunk; // RVA to original unbound IAT ! }u1; DWORD TimeDateStamp; // 0 if not bound, // -1 if bound, and real date\time stamp // in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT (new BIND) *************** *** 4225,4231 **** // typedef VOID ! (NTAPI *PIMAGE_TLS_CALLBACK) ( PVOID DllHandle, DWORD Reason, PVOID Reserved --- 4225,4231 ---- // typedef VOID ! NTAPI (*PIMAGE_TLS_CALLBACK) ( PVOID DllHandle, DWORD Reason, PVOID Reserved *************** *** 4292,4308 **** 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; // --- 4292,4308 ---- struct { DWORD NameOffset:31; DWORD NameIsString:1; ! }s1; DWORD Name; WORD Id; ! }u1; union { DWORD OffsetToData; struct { DWORD OffsetToDirectory:31; DWORD DataIsDirectory:1; ! }s2; ! }u2; } IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY; // *** f:/mssdk/include/WINDEF.H Wed Jun 5 12:24:10 1996 --- WINDEF.H Sun Sep 28 10:14:16 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; *** f:/mssdk/include/WINBASE.H Wed Feb 5 19:28:46 1997 --- WINBASE.H Sun Sep 28 10:14:16 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; ! }s1; ! }u1; 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; ! }u1; } 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; *************** *** 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 *************** *** 3721,3727 **** #if(_WIN32_WINNT >= 0x0400) typedef VOID ! (APIENTRY *PTIMERAPCROUTINE)( LPVOID lpArgToCompletionRoutine, DWORD dwTimerLowValue, DWORD dwTimerHighValue --- 3721,3727 ---- #if(_WIN32_WINNT >= 0x0400) typedef VOID ! APIENTRY (*PTIMERAPCROUTINE)( LPVOID lpArgToCompletionRoutine, DWORD dwTimerLowValue, DWORD dwTimerHighValue *************** *** 4191,4201 **** #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; --- 4191,4201 ---- #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; *************** *** 5366,5372 **** #if(_WIN32_WINNT >= 0x0400) typedef DWORD ! (WINAPI *LPPROGRESS_ROUTINE)( LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, --- 5366,5372 ---- #if(_WIN32_WINNT >= 0x0400) typedef DWORD ! WINAPI (*LPPROGRESS_ROUTINE)( LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, *** f:/mssdk/include/COMMCTRL.H Thu Oct 10 09:57:18 1996 --- COMMCTRL.H Sun Sep 28 10:14:18 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; *** f:/mssdk/include/COMMDLG.H Fri Jul 12 19:09:02 1996 --- COMMDLG.H Sun Sep 28 10:14: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 { *** f:/mssdk/include/DDEML.H Fri Jul 12 19:08:58 1996 --- DDEML.H Sun Sep 28 10:14:18 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) *** f:/mssdk/include/IMM.H Thu Sep 19 20:14:24 1996 --- IMM.H Sun Sep 28 10:14:18 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 *** f:/mssdk/include/MMSYSTEM.H Fri Aug 9 02:30:00 1996 --- MMSYSTEM.H Sun Sep 28 10:14:20 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 *** f:/mssdk/include/MSWSOCK.H Wed Jul 3 09:58:36 1996 --- MSWSOCK.H Sun Sep 28 10:14:20 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, *** f:/mssdk/include/NB30.H Sun Jun 9 18:10:50 1996 --- NB30.H Sun Sep 28 10:14:20 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 */ *** f:/mssdk/include/PRSHT.H Fri Jul 12 19:09:02 1996 --- PRSHT.H Sun Sep 28 10:14:20 1997 *************** *** 60,67 **** 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 --- 60,67 ---- 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 *************** *** 159,165 **** #define PSH_MODELESS 0x0400 #define PSH_RTLREADING 0x0800 ! typedef int (CALLBACK *PFNPROPSHEETCALLBACK)(HWND, UINT, LPARAM); typedef struct _PROPSHEETHEADERA { DWORD dwSize; --- 159,165 ---- #define PSH_MODELESS 0x0400 #define PSH_RTLREADING 0x0800 ! typedef int CALLBACK (*PFNPROPSHEETCALLBACK)(HWND, UINT, LPARAM); typedef struct _PROPSHEETHEADERA { DWORD dwSize; *************** *** 241,248 **** ! typedef BOOL (CALLBACK FAR * LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM); ! typedef BOOL (CALLBACK FAR * LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM); typedef struct _PSHNOTIFY --- 241,248 ---- ! typedef BOOL CALLBACK FAR (*LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM); ! typedef BOOL CALLBACK FAR (*LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM); typedef struct _PSHNOTIFY *** f:/mssdk/include/PSHPACK8.H Sun Jun 9 18:10:54 1996 --- PSHPACK8.H Sun Sep 28 10:14:20 1997 *************** *** 27,32 **** --- 27,36 ---- #endif #pragma pack(8) #else + #ifdef __GNUC__ + #pragma pack() /* ! double align not implemented ! use -m486 */ + #else #pragma pack(8) + #endif #endif #endif // ! (defined(lint) || defined(_lint) || defined(RC_INVOKED)) *** f:/mssdk/include/RICHEDIT.H Sat Jun 29 20:30:04 1996 --- RICHEDIT.H Sun Sep 28 10:14:20 1997 *************** *** 303,309 **** --- 303,311 ---- typedef struct _charformat { UINT cbSize; + #ifndef __GNUC__ _WPAD _wPad1; + #endif DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 312,318 **** --- 314,322 ---- BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; + #ifndef __GNUC__ _WPAD _wPad2; + #endif } CHARFORMATA; typedef struct _charformatw *************** *** 327,333 **** --- 331,339 ---- BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; + #ifndef __GNUC__ _WPAD _wPad2; + #endif } CHARFORMATW; #if (_RICHEDIT_VER >= 0x0200) *************** *** 496,502 **** --- 502,510 ---- typedef struct _paraformat { UINT cbSize; + #ifndef __GNUC__ _WPAD _wPad1; + #endif DWORD dwMask; WORD wNumbering; WORD wReserved; *************** *** 562,568 **** --- 570,578 ---- typedef struct _charformat2w { UINT cbSize; + #ifndef __GNUC__ _WPAD _wPad1; + #endif DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 571,577 **** --- 581,589 ---- BYTE bCharSet; BYTE bPitchAndFamily; WCHAR szFaceName[LF_FACESIZE]; + #ifndef __GNUC__ _WPAD _wPad2; + #endif WORD wWeight; /* Font weight (LOGFONT value) */ SHORT sSpacing; /* Amount to space between letters */ COLORREF crBackColor; /* Background color */ *************** *** 588,594 **** --- 600,608 ---- typedef struct _charformat2a { UINT cbSize; + #ifndef __GNUC__ _WPAD _wPad1; + #endif DWORD dwMask; DWORD dwEffects; LONG yHeight; *************** *** 597,603 **** --- 611,619 ---- BYTE bCharSet; BYTE bPitchAndFamily; char szFaceName[LF_FACESIZE]; + #ifndef __GNUC__ _WPAD _wPad2; + #endif WORD wWeight; /* Font weight (LOGFONT value) */ SHORT sSpacing; /* Amount to space between letters */ COLORREF crBackColor; /* Background color */ *************** *** 718,724 **** --- 734,742 ---- typedef struct _paraformat2 { UINT cbSize; + #ifndef __GNUC__ _WPAD _wPad1; + #endif DWORD dwMask; WORD wNumbering; WORD wReserved; *************** *** 827,837 **** --- 845,861 ---- typedef struct _nmhdr { HWND hwndFrom; + #ifndef __GNUC__ _WPAD _wPad1; + #endif UINT idFrom; + #ifndef __GNUC__ _WPAD _wPad2; + #endif UINT code; + #ifndef __GNUC__ _WPAD _wPad3; + #endif } NMHDR; #endif /* !WM_NOTIFY */ *************** *** 839,847 **** --- 863,875 ---- { NMHDR nmhdr; UINT msg; + #ifndef __GNUC__ _WPAD _wPad1; + #endif WPARAM wParam; + #ifndef __GNUC__ _WPAD _wPad2; + #endif LPARAM lParam; } MSGFILTER; *************** *** 883,891 **** --- 911,923 ---- { NMHDR nmhdr; UINT msg; + #ifndef __GNUC__ _WPAD _wPad1; + #endif WPARAM wParam; + #ifndef __GNUC__ _WPAD _wPad2; + #endif LPARAM lParam; CHARRANGE chrg; } ENPROTECTED; *************** *** 920,928 **** --- 952,964 ---- { NMHDR nmhdr; UINT msg; + #ifndef __GNUC__ _WPAD _wPad1; + #endif WPARAM wParam; + #ifndef __GNUC__ _WPAD _wPad2; + #endif LPARAM lParam; CHARRANGE chrg; } ENLINK; *** f:/mssdk/include/RPCDCE.H Sun Jun 9 18:10:54 1996 --- RPCDCE.H Sun Sep 28 10:14:20 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 *** f:/mssdk/include/RPCDCEP.H Sun Jun 9 18:10:54 1996 --- RPCDCEP.H Sun Sep 28 10:14:20 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,197 **** IN I_RPC_MUTEX Mutex ); ! void __RPC_FAR * RPC_ENTRY I_RpcAllocate ( IN unsigned int Size ); --- 191,197 ---- IN I_RPC_MUTEX Mutex ); ! void __RPC_FAR RPC_ENTRY * I_RpcAllocate ( IN unsigned int Size ); *************** *** 208,214 **** typedef void ! (__RPC_USER __RPC_FAR * PRPC_RUNDOWN) ( void __RPC_FAR * AssociationContext ); --- 208,214 ---- typedef void ! __RPC_USER __RPC_FAR (*PRPC_RUNDOWN) ( void __RPC_FAR * AssociationContext ); *** f:/mssdk/include/RPCNDR.H Sun Dec 15 20:30:30 1996 --- RPCNDR.H Sun Sep 28 10:14:20 1997 *************** *** 205,211 **** #define __MIDL_USER_DEFINED #endif ! void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free( void __RPC_FAR * ); #ifdef __RPC_WIN16__ --- 205,211 ---- #define __MIDL_USER_DEFINED #endif ! void __RPC_FAR __RPC_USER * MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free( void __RPC_FAR * ); #ifdef __RPC_WIN16__ *************** *** 246,252 **** #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; --- 246,252 ---- #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; *************** *** 554,560 **** unsigned char MscPak ); ! void __RPC_FAR * RPC_ENTRY midl_allocate ( size_t size ); --- 554,560 ---- unsigned char MscPak ); ! RPC_ENTRY void __RPC_FAR * midl_allocate ( size_t size ); *************** *** 653,659 **** 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; --- 653,659 ---- 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; *************** *** 679,698 **** */ 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, --- 679,698 ---- */ 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, *************** *** 805,812 **** 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 --- 805,812 ---- unsigned long ActualCount; /* Allocation and Free routine to be used by the Ndr routines. */ ! __RPC_API void __RPC_FAR * __RPC_FAR (*pfnAllocate)(size_t); ! void __RPC_FAR __RPC_API (*pfnFree)(void __RPC_FAR *); /* * Top of parameter stack. Used for "single call" stubs during marshalling *************** *** 903,913 **** /* * 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 --- 903,913 ---- /* * Generic handle bind/unbind routine pair. */ ! typedef void __RPC_API __RPC_FAR * ! __RPC_FAR (*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 *************** *** 935,941 **** #endif ! typedef void (__RPC_FAR __RPC_USER * XMIT_HELPER_ROUTINE) ( PMIDL_STUB_MESSAGE ); typedef struct _XMIT_ROUTINE_QUINTUPLE --- 935,941 ---- #endif ! typedef void __RPC_FAR __RPC_USER (*XMIT_HELPER_ROUTINE) ( PMIDL_STUB_MESSAGE ); typedef struct _XMIT_ROUTINE_QUINTUPLE *************** *** 947,970 **** } 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 * ); --- 947,970 ---- } 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_USER __RPC_FAR * ! __RPC_FAR (*USER_MARSHAL_MARSHALLING_ROUTINE) (unsigned long __RPC_FAR *, unsigned char __RPC_FAR * , void __RPC_FAR * ); ! typedef unsigned char __RPC_USER __RPC_FAR * ! __RPC_FAR (*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 * ); *************** *** 989,996 **** 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 --- 989,996 ---- typedef struct _MALLOC_FREE_STRUCT { ! void __RPC_USER __RPC_FAR * __RPC_FAR (*pfnAllocate)(size_t); ! void __RPC_FAR __RPC_USER (*pfnFree)(void __RPC_FAR *); } MALLOC_FREE_STRUCT; typedef struct _COMM_FAULT_OFFSETS *************** *** 1008,1015 **** void __RPC_FAR * RpcInterfaceInformation; ! void __RPC_FAR * (__RPC_FAR __RPC_API * pfnAllocate)(size_t); ! void (__RPC_FAR __RPC_API * pfnFree)(void __RPC_FAR *); union { --- 1008,1015 ---- void __RPC_FAR * RpcInterfaceInformation; ! void __RPC_API __RPC_FAR * __RPC_FAR (*pfnAllocate)(size_t); ! void __RPC_FAR __RPC_API (*pfnFree)(void __RPC_FAR *); union { *************** *** 1067,1073 **** typedef struct _MIDL_FORMAT_STRING { short Pad; ! unsigned char Format[]; } MIDL_FORMAT_STRING; #if !defined( RC_INVOKED ) #pragma warning( default:4200 ) --- 1067,1073 ---- typedef struct _MIDL_FORMAT_STRING { short Pad; ! unsigned char Format[1]; } MIDL_FORMAT_STRING; #if !defined( RC_INVOKED ) #pragma warning( default:4200 ) *************** *** 1076,1084 **** /* * 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. --- 1076,1084 ---- /* * 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. *************** *** 1197,1203 **** unsigned char FormatChar ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrPointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1197,1203 ---- unsigned char FormatChar ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrPointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1206,1240 **** /* Structures */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrSimpleStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantVaryingStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrHardStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrComplexStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1206,1240 ---- /* Structures */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrSimpleStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantVaryingStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrHardStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrComplexStructMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1243,1277 **** /* Arrays */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrFixedArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrComplexArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1243,1277 ---- /* Arrays */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrFixedArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrComplexArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1280,1293 **** /* Strings */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrNonConformantStringMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantStringMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1280,1293 ---- /* Strings */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrNonConformantStringMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantStringMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1296,1309 **** /* Unions */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrEncapsulatedUnionMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrNonEncapsulatedUnionMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1296,1309 ---- /* Unions */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrEncapsulatedUnionMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, PFORMAT_STRING pFormat ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrNonEncapsulatedUnionMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1312,1318 **** /* Byte count pointer */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrByteCountPointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1312,1318 ---- /* Byte count pointer */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrByteCountPointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1321,1327 **** /* Transmit as and represent as*/ ! unsigned char __RPC_FAR * RPC_ENTRY NdrXmitOrRepAsMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1321,1327 ---- /* Transmit as and represent as*/ ! unsigned char RPC_ENTRY __RPC_FAR * NdrXmitOrRepAsMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1330,1336 **** /* User_marshal */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrUserMarshalMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1330,1336 ---- /* User_marshal */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrUserMarshalMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1339,1345 **** /* Cairo interface pointer */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrInterfacePointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, --- 1339,1345 ---- /* Cairo interface pointer */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrInterfacePointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pMemory, *************** *** 1373,1379 **** unsigned char FormatChar ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrPointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1373,1379 ---- unsigned char FormatChar ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrPointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1383,1389 **** /* Structures */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrSimpleStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1383,1389 ---- /* Structures */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrSimpleStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1391,1397 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1391,1397 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1399,1405 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantVaryingStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1399,1405 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantVaryingStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1407,1413 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrHardStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1407,1413 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrHardStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1415,1421 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrComplexStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1415,1421 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrComplexStructUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1425,1431 **** /* Arrays */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrFixedArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1425,1431 ---- /* Arrays */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrFixedArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1433,1439 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1433,1439 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1441,1447 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1441,1447 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1449,1455 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1449,1455 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1457,1463 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrComplexArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1457,1463 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrComplexArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1467,1473 **** /* Strings */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrNonConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1467,1473 ---- /* Strings */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrNonConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1475,1481 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1475,1481 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1485,1491 **** /* Unions */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrEncapsulatedUnionUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1485,1491 ---- /* Unions */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrEncapsulatedUnionUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1493,1499 **** unsigned char fMustAlloc ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrNonEncapsulatedUnionUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1493,1499 ---- unsigned char fMustAlloc ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrNonEncapsulatedUnionUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1503,1509 **** /* Byte count pointer */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrByteCountPointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1503,1509 ---- /* Byte count pointer */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrByteCountPointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1513,1519 **** /* Transmit as and represent as*/ ! unsigned char __RPC_FAR * RPC_ENTRY NdrXmitOrRepAsUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1513,1519 ---- /* Transmit as and represent as*/ ! unsigned char RPC_ENTRY __RPC_FAR * NdrXmitOrRepAsUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1523,1529 **** /* User_marshal */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrUserMarshalUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1523,1529 ---- /* User_marshal */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrUserMarshalUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 1533,1539 **** /* Cairo interface pointer */ ! unsigned char __RPC_FAR * RPC_ENTRY NdrInterfacePointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, --- 1533,1539 ---- /* Cairo interface pointer */ ! unsigned char RPC_ENTRY __RPC_FAR * NdrInterfacePointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * __RPC_FAR * ppMemory, *************** *** 2010,2016 **** #define USER_MARSHAL_FC_HYPER 11 #define USER_MARSHAL_FC_DOUBLE 12 ! unsigned char __RPC_FAR * RPC_ENTRY NdrUserMarshalSimpleTypeConvert( unsigned long * pFlags, unsigned char * pBuffer, --- 2010,2016 ---- #define USER_MARSHAL_FC_HYPER 11 #define USER_MARSHAL_FC_DOUBLE 12 ! unsigned char RPC_ENTRY __RPC_FAR * NdrUserMarshalSimpleTypeConvert( unsigned long * pFlags, unsigned char * pBuffer, *************** *** 2029,2035 **** unsigned int ProcNum ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, --- 2029,2035 ---- unsigned int ProcNum ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, *************** *** 2052,2065 **** unsigned int ProcNum ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrServerInitialize( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrServerInitializeUnmarshall ( PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, --- 2052,2065 ---- unsigned int ProcNum ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrServerInitialize( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrServerInitializeUnmarshall ( PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, *************** *** 2072,2092 **** PMIDL_STUB_MESSAGE pStubMsg ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, RPC_BINDING_HANDLE Handle ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrNsGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, RPC_BINDING_HANDLE Handle ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrGetPipeBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, --- 2072,2092 ---- PMIDL_STUB_MESSAGE pStubMsg ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, RPC_BINDING_HANDLE Handle ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrNsGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, RPC_BINDING_HANDLE Handle ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrGetPipeBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, *************** *** 2096,2108 **** NdrGetPartialBuffer( PMIDL_STUB_MESSAGE pStubMsg ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR* pBufferEnd ); ! unsigned char __RPC_FAR * RPC_ENTRY NdrNsSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pBufferEnd, --- 2096,2108 ---- NdrGetPartialBuffer( PMIDL_STUB_MESSAGE pStubMsg ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR* pBufferEnd ); ! unsigned char RPC_ENTRY __RPC_FAR * NdrNsSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char __RPC_FAR * pBufferEnd, *************** *** 2343,2349 **** typedef void __RPC_FAR * RPC_SS_THREAD_HANDLE; ! typedef void __RPC_FAR * __RPC_API RPC_CLIENT_ALLOC ( IN size_t Size ); --- 2343,2349 ---- typedef void __RPC_FAR * RPC_SS_THREAD_HANDLE; ! typedef void __RPC_API __RPC_FAR * RPC_CLIENT_ALLOC ( IN size_t Size ); *************** *** 2357,2363 **** RpcSs* package --*/ ! void __RPC_FAR * RPC_ENTRY RpcSsAllocate ( IN size_t Size ); --- 2357,2363 ---- RpcSs* package --*/ ! void RPC_ENTRY __RPC_FAR * RpcSsAllocate ( IN size_t Size ); *************** *** 2405,2411 **** RpcSm* package --*/ ! void __RPC_FAR * RPC_ENTRY RpcSmAllocate ( IN size_t Size, OUT RPC_STATUS __RPC_FAR * pStatus --- 2405,2411 ---- RpcSm* package --*/ ! void RPC_ENTRY __RPC_FAR * RpcSmAllocate ( IN size_t Size, OUT RPC_STATUS __RPC_FAR * pStatus *************** *** 2476,2482 **** NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); ! void __RPC_FAR * RPC_ENTRY NdrRpcSmClientAllocate ( IN size_t Size ); --- 2476,2482 ---- NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); ! void RPC_ENTRY __RPC_FAR * NdrRpcSmClientAllocate ( IN size_t Size ); *************** *** 2486,2492 **** IN void __RPC_FAR * NodeToFree ); ! void __RPC_FAR * RPC_ENTRY NdrRpcSsDefaultAllocate ( IN size_t Size ); --- 2486,2492 ---- IN void __RPC_FAR * NodeToFree ); ! void RPC_ENTRY __RPC_FAR * NdrRpcSsDefaultAllocate ( IN size_t Size ); *************** *** 2544,2550 **** void __RPC_FAR * Pointer ); ! void __RPC_FAR * RPC_ENTRY NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len --- 2544,2550 ---- void __RPC_FAR * Pointer ); ! void RPC_ENTRY __RPC_FAR * NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len *************** *** 2562,2568 **** * Proxy APIs ****************************************************************************/ ! void __RPC_FAR * RPC_ENTRY NdrOleAllocate ( IN size_t Size ); --- 2562,2568 ---- * Proxy APIs ****************************************************************************/ ! void RPC_ENTRY __RPC_FAR * NdrOleAllocate ( IN size_t Size ); *** f:/mssdk/include/SHELLAPI.H Fri Jul 12 19:08:58 1996 --- SHELLAPI.H Sun Sep 28 10:14:20 1997 *************** *** 57,63 **** #else #define FindExecutable FindExecutableA #endif // !UNICODE ! WINSHELLAPI LPWSTR * APIENTRY CommandLineToArgvW(LPCWSTR lpCmdLine, int*pNumArgs); WINSHELLAPI INT APIENTRY ShellAboutA(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIcon); WINSHELLAPI INT APIENTRY ShellAboutW(HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, HICON hIcon); --- 57,63 ---- #else #define FindExecutable FindExecutableA #endif // !UNICODE ! WINSHELLAPI LPWSTR APIENTRY * CommandLineToArgvW(LPCWSTR lpCmdLine, int*pNumArgs); WINSHELLAPI INT APIENTRY ShellAboutA(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIcon); WINSHELLAPI INT APIENTRY ShellAboutW(HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, HICON hIcon); *** f:/mssdk/include/WINGDI.H Fri Aug 9 02:30:00 1996 --- WINGDI.H Sun Sep 28 10:14:20 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 *** f:/mssdk/include/WINNETWK.H Thu Jul 18 10:48:06 1996 --- WINNETWK.H Sun Sep 28 10:14:20 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, *** f:/mssdk/include/WINNLS.H Fri Jul 12 19:08:56 1996 --- WINNLS.H Sun Sep 28 10:14:20 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 */ *** f:/mssdk/include/WINPERF.H Sun Jun 9 18:10:56 1996 --- WINPERF.H Sun Sep 28 10:14:22 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_ *** f:/mssdk/include/WINSOCK.H Sun Jun 9 18:10:56 1996 --- WINSOCK.H Sun Sep 28 10:14:22 1997 *************** *** 730,736 **** unsigned long PASCAL FAR inet_addr (const char FAR * cp); ! char FAR * PASCAL FAR inet_ntoa (struct in_addr in); int PASCAL FAR listen (SOCKET s, int backlog); --- 730,736 ---- unsigned long PASCAL FAR inet_addr (const char FAR * cp); ! char FAR PASCAL * FAR inet_ntoa (struct in_addr in); int PASCAL FAR listen (SOCKET s, int backlog); *************** *** 760,780 **** /* Database function prototypes */ ! struct hostent FAR * PASCAL FAR gethostbyaddr(const char FAR * addr, int len, int type); ! struct hostent FAR * PASCAL FAR gethostbyname(const char FAR * name); int PASCAL FAR gethostname (char FAR * name, int namelen); ! struct servent FAR * PASCAL FAR getservbyport(int port, const char FAR * proto); ! struct servent FAR * PASCAL FAR getservbyname(const char FAR * name, const char FAR * proto); ! struct protoent FAR * PASCAL FAR getprotobynumber(int proto); ! struct protoent FAR * PASCAL FAR getprotobyname(const char FAR * name); /* Microsoft Windows Extension function prototypes */ --- 760,780 ---- /* Database function prototypes */ ! struct hostent FAR PASCAL * FAR gethostbyaddr(const char FAR * addr, int len, int type); ! struct hostent FAR PASCAL * FAR gethostbyname(const char FAR * name); int PASCAL FAR gethostname (char FAR * name, int namelen); ! struct servent FAR PASCAL * FAR getservbyport(int port, const char FAR * proto); ! struct servent FAR PASCAL * FAR getservbyname(const char FAR * name, const char FAR * proto); ! struct protoent FAR PASCAL * FAR getprotobynumber(int proto); ! struct protoent FAR PASCAL * FAR getprotobyname(const char FAR * name); /* Microsoft Windows Extension function prototypes */ *** f:/mssdk/include/WINSOCK2.H Fri Aug 9 02:30:00 1996 --- WINSOCK2.H Sun Sep 28 10:14:22 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,1609 **** #if INCL_WINSOCK_API_TYPEDEFS typedef unsigned long ! (WSAAPI * LPFN_INET_ADDR)( const char FAR * cp ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! char FAR * ! WSAAPI inet_ntoa( struct in_addr in ); --- 1595,1608 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef unsigned long ! WSAAPI (*LPFN_INET_ADDR)( const char FAR * cp ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! char WSAAPI FAR * inet_ntoa( struct in_addr in ); *************** *** 1611,1618 **** #if INCL_WINSOCK_API_TYPEDEFS typedef ! char FAR * ! (WSAAPI * LPFN_INET_NTOA)( struct in_addr in ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1610,1617 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! char FAR WSAAPI * ! (*LPFN_INET_NTOA)( struct in_addr in ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 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 *************** *** 1864,1871 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct hostent FAR * ! WSAAPI gethostbyaddr( const char FAR * addr, int len, --- 1863,1870 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct hostent ! WSAAPI FAR * gethostbyaddr( const char FAR * addr, int len, *************** *** 1875,1882 **** #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct hostent FAR * ! (WSAAPI * LPFN_GETHOSTBYADDR)( const char FAR * addr, int len, int type --- 1874,1881 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct hostent WSAAPI FAR * ! (*LPFN_GETHOSTBYADDR)( const char FAR * addr, int len, int type *************** *** 1885,1892 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct hostent FAR * ! WSAAPI gethostbyname( const char FAR * name ); --- 1884,1891 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct hostent ! WSAAPI FAR * gethostbyname( const char FAR * name ); *************** *** 1894,1901 **** #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct hostent FAR * ! (WSAAPI * LPFN_GETHOSTBYNAME)( const char FAR * name ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1893,1900 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct hostent ! WSAAPI FAR * (*LPFN_GETHOSTBYNAME)( const char FAR * name ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 1913,1919 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_GETHOSTNAME)( char FAR * name, int namelen ); --- 1912,1918 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (*LPFN_GETHOSTNAME)( char FAR * name, int namelen ); *************** *** 1921,1928 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct servent FAR * ! WSAAPI getservbyport( int port, const char FAR * proto --- 1920,1927 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct servent ! WSAAPI FAR * getservbyport( int port, const char FAR * proto *************** *** 1931,1938 **** #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct servent FAR * ! (WSAAPI * LPFN_GETSERVBYPORT)( int port, const char FAR * proto ); --- 1930,1937 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct servent ! WSAAPI FAR * (*LPFN_GETSERVBYPORT)( int port, const char FAR * proto ); *************** *** 1940,1947 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct servent FAR * ! WSAAPI getservbyname( const char FAR * name, const char FAR * proto --- 1939,1946 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct servent ! WSAAPI FAR * getservbyname( const char FAR * name, const char FAR * proto *************** *** 1950,1957 **** #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct servent FAR * ! (WSAAPI * LPFN_GETSERVBYNAME)( const char FAR * name, const char FAR * proto ); --- 1949,1956 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct servent ! WSAAPI FAR * (*LPFN_GETSERVBYNAME)( const char FAR * name, const char FAR * proto ); *************** *** 1959,1966 **** #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct protoent FAR * ! WSAAPI getprotobynumber( int number ); --- 1958,1965 ---- #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct protoent ! WSAAPI FAR * getprotobynumber( int number ); *************** *** 1968,1983 **** #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 ); --- 1967,1982 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct protoent ! WSAAPI FAR * (*LPFN_GETPROTOBYNUMBER)( int number ); #endif // INCL_WINSOCK_API_TYPEDEFS #if INCL_WINSOCK_API_PROTOTYPES WINSOCK_API_LINKAGE ! struct protoent ! WSAAPI FAR * getprotobyname( const char FAR * name ); *************** *** 1985,1992 **** #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct protoent FAR * ! (WSAAPI * LPFN_GETPROTOBYNAME)( const char FAR * name ); #endif // INCL_WINSOCK_API_TYPEDEFS --- 1984,1991 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef ! struct protoent ! WSAAPI FAR * (*LPFN_GETPROTOBYNAME)( const char FAR * name ); #endif // INCL_WINSOCK_API_TYPEDEFS *************** *** 2006,2012 **** #if INCL_WINSOCK_API_TYPEDEFS typedef int ! (WSAAPI * LPFN_WSASTARTUP)( WORD wVersionRequested, LPWSADATA lpWSAData ); --- 2005,2011 ---- #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 --- 2023,2029 ---- #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 --- 2040,2046 ---- #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 --- 2057,2063 ---- #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 --- 2074,2080 ---- #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 --- 2091,2097 ---- #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 --- 2108,2114 ---- #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 --- 2125,2131 ---- #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, --- 2147,2153 ---- #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, --- 2174,2180 ---- #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, --- 2200,2206 ---- #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, --- 2225,2231 ---- #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, --- 2250,2256 ---- #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, --- 2277,2283 ---- #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 --- 2300,2306 ---- #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, --- 2320,2326 ---- #if INCL_WINSOCK_API_TYPEDEFS typedef int ! WSAAPI (*LPFN_WSAASYNCSELECT)( SOCKET s, HWND hWnd, u_int wMsg, *************** *** 2374,2380 **** #if INCL_WINSOCK_API_TYPEDEFS typedef SOCKET ! (WSAAPI * LPFN_WSAACCEPT)( SOCKET s, struct sockaddr FAR * addr, LPINT addrlen, --- 2373,2379 ---- #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 --- 2394,2400 ---- #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, --- 2417,2423 ---- #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 --- 2440,2446 ---- #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 --- 2472,2485 ---- #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 --- 2505,2511 ---- #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 --- 2539,2552 ---- #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 --- 2572,2578 ---- #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, --- 2595,2601 ---- #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 --- 2618,2624 ---- #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 --- 2639,2645 ---- #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 --- 2660,2666 ---- #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, --- 2687,2693 ---- #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, --- 2719,2725 ---- #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 --- 2745,2751 ---- #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 --- 2766,2772 ---- #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, --- 2791,2797 ---- #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 ); --- 2815,2821 ---- #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, --- 2841,2847 ---- #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 --- 2866,2872 ---- #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, --- 2889,2895 ---- #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 ); --- 2913,2919 ---- #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, --- 2939,2945 ---- #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 --- 2964,2970 ---- #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, --- 3002,3008 ---- #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, --- 3012,3018 ---- ); 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, --- 3043,3049 ---- #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, --- 3083,3089 ---- #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, --- 3092,3098 ---- ); 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, --- 3137,3143 ---- #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, --- 3146,3152 ---- ); 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 --- 3190,3203 ---- #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, --- 3238,3244 ---- #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, --- 3246,3252 ---- ); 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 --- 3271,3277 ---- #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 --- 3299,3310 ---- #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 --- 3326,3332 ---- #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, --- 3360,3366 ---- #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, --- 3368,3374 ---- ); 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 ); --- 3406,3418 ---- #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 --- 3450,3463 ---- #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 --- 3496,3509 ---- #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 *** f:/mssdk/include/WINUSER.H Mon Jul 22 15:34:14 1996 --- WINUSER.H Sun Sep 28 10:14:22 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 { *** f:/mssdk/include/WINSVC.H Fri Jul 12 19:08:56 1996 --- WINSVC.H Sun Sep 28 10:14:22 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 ); *** f:/mssdk/include/WTYPES.H Mon Jan 20 14:16:28 1997 --- WTYPES.H Sun Sep 28 10:14:22 1997 *************** *** 21,27 **** /* Forward Declarations */ ! void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free( void __RPC_FAR * ); /**************************************** --- 21,27 ---- /* Forward Declarations */ ! void __RPC_USER __RPC_FAR * MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free( void __RPC_FAR * ); /**************************************** *************** *** 436,442 **** /* size is 4 */ typedef const RECT __RPC_FAR *LPCRECT; - #endif //_WINDEF_ /* size is 1 */ typedef unsigned char UCHAR; --- 436,441 ---- *************** *** 449,454 **** --- 448,454 ---- /* size is 4 */ typedef DWORD ULONG; + #endif //_WINDEF_ /* size is 8 */ typedef double DOUBLE; *************** *** 1238,1244 **** unsigned long Lo; long Hi; #endif ! }; LONGLONG int64; } CY; #endif /* 0 */ --- 1238,1244 ---- unsigned long Lo; long Hi; #endif ! }s; LONGLONG int64; } CY; #endif /* 0 */ *************** *** 1264,1270 **** struct { BYTE scale; BYTE sign; ! }; USHORT signscale; }; ULONG Hi32; --- 1264,1270 ---- struct { BYTE scale; BYTE sign; ! }s1; USHORT signscale; }; ULONG Hi32; *************** *** 1277,1283 **** ULONG Lo32; ULONG Mid32; #endif ! }; ULONGLONG Lo64; }; } DECIMAL; --- 1277,1283 ---- ULONG Lo32; ULONG Mid32; #endif ! }s2; ULONGLONG Lo64; }; } DECIMAL; *************** *** 1298,1304 **** /* size is 2 */ typedef short VARIANT_BOOL; ! #if !__STDC__ && (_MSC_VER <= 1000) /* For backward compatibility */ /* size is 2 */ typedef VARIANT_BOOL _VARIANT_BOOL; --- 1298,1304 ---- /* size is 2 */ typedef short VARIANT_BOOL; ! #if (!__STDC__ && (_MSC_VER <= 1000)) || (defined(__GNUC__) && !defined(__GNUG__)) /* For backward compatibility */ /* size is 2 */ typedef VARIANT_BOOL _VARIANT_BOOL; *** f:/mssdk/include/UNKNWN.H Fri Jul 12 19:09:26 1996 --- UNKNWN.H Sun Sep 28 10:14:22 1997 *************** *** 40,46 **** /* header files for imported files */ #include "wtypes.h" ! void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free( void __RPC_FAR * ); /**************************************** --- 40,46 ---- /* header files for imported files */ #include "wtypes.h" ! void __RPC_USER __RPC_FAR * MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free( void __RPC_FAR * ); /**************************************** *** f:/mssdk/include/WINCON.H Fri Jul 12 19:08:56 1996 --- WINCON.H Sun Sep 28 10:14:22 1997 *************** *** 162,168 **** typedef BOOL ! (WINAPI *PHANDLER_ROUTINE)( DWORD CtrlType ); --- 162,168 ---- typedef BOOL ! WINAPI (*PHANDLER_ROUTINE)( DWORD CtrlType ); --------------EF13F665679--