From e920ae33a2cffba1b99f00246832fd28b6700da7 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Tue, 11 Sep 2012 17:08:40 -0400 Subject: [PATCH] Redo the filters based on assumptions discussed in mingw-dvlpr list. * include/lm.h (_mingw.h): Include. * include/lmaccess.h: Ditto. * include/lmalert.h: Ditto. * include/lmapibuf.h: Ditto. * include/lmat.h: Ditto. * include/lmaudit.h: Ditto. * include/lmbrowsr.h: Ditto. * include/lmchdev.h: Ditto. * include/lmconfig.h: Ditto. * include/lmerr.h: Ditto. * include/lmerrlog.h: Ditto. * include/lmmsg.h: Ditto. * include/lmremutl.h: Ditto. * include/lmrepl.h: Ditto. * include/lmserver.h: Ditto. * include/lmshare.h: Ditto. * include/lmsname.h: Ditto. * include/lmstats.h: Ditto. * include/lmsvc.h: Ditto. * include/lmuse.h: Ditto. * include/lmuseflg.h: Ditto. * include/lmwksta.h: Ditto. * include/mapi.h: Ditto. * include/mbctype.h: Ditto. * include/mbstring.h: Ditto. * include/mciavi.h: Ditto. * include/mcx.h: Ditto. * include/mem.h: Ditto. * include/memory.h: Ditto. * include/mgmtapi.h: Ditto. * include/mlang.h: Ditto. * include/mmreg.h: Ditto. * include/mpegtype.h: Ditto. * include/mgm.h (_mingw.h): Include. (_WIN32_WINNT): Use MACRO constant for comparison instead of integer and move filters to the end of the file. * include/mprapi.h: Ditto. * include/locale.h (_mingw.h): Remove comment and move to top of file. * include/malloc.h (_mingw.h): Remove comment and move to top of file. (__MSVCRT_VERSION__): Remove as unneeded. * include/math.h (_mingw.h): Remove comment and move to top of file. (__MSVCRT_VERSION__): Remove as unneeded. (__GNUC__): Assume we are using a version >= 3.4.5 * include/lzexpand.h (_mingw.h): Include. (UNICODE): Use __AW() macro for mapping non-specific symbols. * include/lmcons.h (_mingw.h): Include. (LMSTR): Correct filter for definition determination. (LMCSTR): Ditto. * include/mmsystem.h (_mingw.h): Include. (UNICODE): Use __AW() macro for mapping non-specific symbols. (WINVER): Use _WIN32_WINNT instead. (_WIN32_WINNT): Use MACRO constant for comparison instead of integer and move filters to the end of the file. * include/_mingw.h (FORCE_UNICODE): Another filter for determining UNICODE for __AW and __STR. * TODO: New file. --- ChangeLog | 70 ++++++++++++++++++++++++ TODO | 8 +++ include/_mingw.h | 2 +- include/lm.h | 1 + include/lmaccess.h | 1 + include/lmalert.h | 5 ++ include/lmapibuf.h | 4 ++ include/lmat.h | 4 ++ include/lmaudit.h | 4 ++ include/lmbrowsr.h | 4 ++ include/lmchdev.h | 4 ++ include/lmconfig.h | 4 ++ include/lmcons.h | 3 +- include/lmerr.h | 1 + include/lmerrlog.h | 4 ++ include/lmmsg.h | 4 ++ include/lmremutl.h | 4 ++ include/lmrepl.h | 4 ++ include/lmserver.h | 4 ++ include/lmshare.h | 4 ++ include/lmsname.h | 2 + include/lmstats.h | 4 ++ include/lmsvc.h | 4 ++ include/lmuse.h | 4 ++ include/lmuseflg.h | 2 + include/lmwksta.h | 3 ++ include/locale.h | 4 +- include/lzexpand.h | 13 +++-- include/malloc.h | 11 +--- include/mapi.h | 1 + include/math.h | 14 ----- include/mbctype.h | 4 +- include/mbstring.h | 4 +- include/mciavi.h | 1 + include/mcx.h | 4 ++ include/mem.h | 1 + include/memory.h | 1 + include/mgm.h | 6 ++- include/mgmtapi.h | 12 ++--- include/mlang.h | 5 +- include/mmreg.h | 4 +- include/mmsystem.h | 156 +++++++++++++++++++---------------------------------- include/mpegtype.h | 2 + include/mprapi.h | 145 ++++++++++++++++++++++++------------------------- 44 files changed, 317 insertions(+), 229 deletions(-) create mode 100644 TODO diff --git a/ChangeLog b/ChangeLog index e3bd7b3..cc25bca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,76 @@ Redo the filters based on assumptions discussed in mingw-dvlpr list. + * include/lm.h (_mingw.h): Include. + * include/lmaccess.h: Ditto. + * include/lmalert.h: Ditto. + * include/lmapibuf.h: Ditto. + * include/lmat.h: Ditto. + * include/lmaudit.h: Ditto. + * include/lmbrowsr.h: Ditto. + * include/lmchdev.h: Ditto. + * include/lmconfig.h: Ditto. + * include/lmerr.h: Ditto. + * include/lmerrlog.h: Ditto. + * include/lmmsg.h: Ditto. + * include/lmremutl.h: Ditto. + * include/lmrepl.h: Ditto. + * include/lmserver.h: Ditto. + * include/lmshare.h: Ditto. + * include/lmsname.h: Ditto. + * include/lmstats.h: Ditto. + * include/lmsvc.h: Ditto. + * include/lmuse.h: Ditto. + * include/lmuseflg.h: Ditto. + * include/lmwksta.h: Ditto. + * include/mapi.h: Ditto. + * include/mbctype.h: Ditto. + * include/mbstring.h: Ditto. + * include/mciavi.h: Ditto. + * include/mcx.h: Ditto. + * include/mem.h: Ditto. + * include/memory.h: Ditto. + * include/mgmtapi.h: Ditto. + * include/mlang.h: Ditto. + * include/mmreg.h: Ditto. + * include/mpegtype.h: Ditto. + + * include/mgm.h (_mingw.h): Include. + (_WIN32_WINNT): Use MACRO constant for comparison instead of integer + and move filters to the end of the file. + * include/mprapi.h: Ditto. + + * include/locale.h (_mingw.h): Remove comment and move to top of file. + + * include/malloc.h (_mingw.h): Remove comment and move to top of file. + (__MSVCRT_VERSION__): Remove as unneeded. + + * include/math.h (_mingw.h): Remove comment and move to top of file. + (__MSVCRT_VERSION__): Remove as unneeded. + (__GNUC__): Assume we are using a version >= 3.4.5 + + * include/lzexpand.h (_mingw.h): Include. + (UNICODE): Use __AW() macro for mapping non-specific symbols. + + * include/lmcons.h (_mingw.h): Include. + (LMSTR): Correct filter for definition determination. + (LMCSTR): Ditto. + + * include/mmsystem.h (_mingw.h): Include. + (UNICODE): Use __AW() macro for mapping non-specific symbols. + (WINVER): Use _WIN32_WINNT instead. + (_WIN32_WINNT): Use MACRO constant for comparison instead of integer + and move filters to the end of the file. + + * include/_mingw.h (FORCE_UNICODE): Another filter for determining + UNICODE for __AW and __STR. + + * TODO: New file. + +2012-09-11 Earnie Boyd + + Redo the filters based on assumptions discussed in mingw-dvlpr list. + * include/icm.h (_mingw.h): Include. (_WIN32_WINNT): Use MACRO constant for comparison instead of integer and move filters to the end of the file. diff --git a/TODO b/TODO new file mode 100644 index 0000000..91ff4c0 --- /dev/null +++ b/TODO @@ -0,0 +1,8 @@ +* Review the following headers: +** io.h +** limits.h +** lmaccess.h +** lmremutl.h +** lmstats.h - What is LM20_WORKSTATION_STATISTICS? +** malloc.h - What about calloc, free, malloc, realloc and _recalloc? +** math.h - Commented out code. diff --git a/include/_mingw.h b/include/_mingw.h index 0fd1dc7..0e66e9d 100644 --- a/include/_mingw.h +++ b/include/_mingw.h @@ -199,7 +199,7 @@ typedef struct localeinfo_struct { * the symbol passed and concantenating either A or W to the symbol. */ #define __AW__(AW, AW_) AW ## AW_ -#if (defined(UNICODE) || defined(_UNICODE)) +#if (defined(UNICODE) || defined(_UNICODE) || defined(FORCE_UNICODE)) #define __AW(AW) __AW__(AW, W) #define __STR(AW) __AW__(L, AW) #else diff --git a/include/lm.h b/include/lm.h index aa258df..506c583 100644 --- a/include/lm.h +++ b/include/lm.h @@ -24,6 +24,7 @@ #ifndef _LM_H #define _LM_H #pragma GCC system_header +#include <_mingw.h> #include #include diff --git a/include/lmaccess.h b/include/lmaccess.h index 917a843..1e09c66 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -24,6 +24,7 @@ #ifndef _LMACCESS_H #define _LMACCESS_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { diff --git a/include/lmalert.h b/include/lmalert.h index 5c518b9..5440877 100644 --- a/include/lmalert.h +++ b/include/lmalert.h @@ -24,6 +24,7 @@ #ifndef _LMALERT_H #define _LMALERT_H #pragma GCC system_header +#include <_mingw.h> #define ALERTER_MAILSLOT TEXT("\\\\.\\MAILSLOT\\Alerter") #define ALERT_PRINT_EVENT TEXT("PRINTING") @@ -47,9 +48,11 @@ #define PRJOB_QS_PAUSED 1 #define PRJOB_QS_SPOOLING 2 #define PRJOB_QS_PRINTING 3 + #ifdef __cplusplus extern "C" { #endif + typedef struct _ADMIN_OTHER_INFO { DWORD alrtad_errcode; DWORD alrtad_numstrings; @@ -75,7 +78,9 @@ typedef struct _USER_OTHER_INFO { }USER_OTHER_INFO,*PUSER_OTHER_INFO,*LPUSER_OTHER_INFO; NET_API_STATUS WINAPI NetAlertRaise(LPCWSTR,PVOID,DWORD); NET_API_STATUS WINAPI NetAlertRaiseEx(LPCWSTR,PVOID,DWORD,LPCWSTR); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmapibuf.h b/include/lmapibuf.h index 345fb2b..a84f128 100644 --- a/include/lmapibuf.h +++ b/include/lmapibuf.h @@ -24,16 +24,20 @@ #ifndef _LMAPIBUF_H #define _LMAPIBUF_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD,PVOID*); NET_API_STATUS WINAPI NetApiBufferFree(PVOID); NET_API_STATUS WINAPI NetApiBufferReallocate(PVOID,DWORD,PVOID*); NET_API_STATUS WINAPI NetApiBufferSize(PVOID,PDWORD); NET_API_STATUS WINAPI NetapipBufferAllocate(DWORD,PVOID*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmat.h b/include/lmat.h index b71a22c..19474f1 100644 --- a/include/lmat.h +++ b/include/lmat.h @@ -24,10 +24,12 @@ #ifndef _LMAT_H #define _LMAT_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define JOB_RUN_PERIODICALLY 1 #define JOB_EXEC_ERROR 2 #define JOB_RUNS_TODAY 4 @@ -54,7 +56,9 @@ NET_API_STATUS WINAPI NetScheduleJobAdd(LPWSTR,PBYTE,LPDWORD); NET_API_STATUS WINAPI NetScheduleJobDel(LPWSTR,DWORD,DWORD); NET_API_STATUS WINAPI NetScheduleJobEnum(LPWSTR,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetScheduleJobGetInfo(LPWSTR,DWORD,PBYTE*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmaudit.h b/include/lmaudit.h index 18d510c..bbfc92b 100644 --- a/include/lmaudit.h +++ b/include/lmaudit.h @@ -24,10 +24,12 @@ #ifndef _LMAUDIT_H #define _LMAUDIT_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define REVISED_AUDIT_ENTRY_STRUCT #define LOGFLAGS_FORWARD 0 #define LOGFLAGS_BACKWARD 1 @@ -265,7 +267,9 @@ NET_API_STATUS WINAPI NetAuditWrite(DWORD,PBYTE,DWORD,LPTSTR,PBYTE); #define AE_SRVPAUSED 1 #define AE_SRVCONT 2 #define AE_SRVSTOP 3 + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmbrowsr.h b/include/lmbrowsr.h index 72ad088..0dbc213 100644 --- a/include/lmbrowsr.h +++ b/include/lmbrowsr.h @@ -24,10 +24,12 @@ #ifndef _LMBROWSR_H #define _LMBROWSR_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define BROWSER_ROLE_PDC 1 #define BROWSER_ROLE_BDC 2 typedef struct _BROWSER_STATISTICS { @@ -89,7 +91,9 @@ NET_API_STATUS I_BrowserQueryStatistics(LPCWSTR,LPBROWSER_STATISTICS*); NET_API_STATUS I_BrowserResetStatistics(LPCWSTR); WORD I_BrowserServerEnumForXactsrv(LPCWSTR,LPCWSTR,ULONG,USHORT,PVOID,WORD,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR,PWORD); NET_API_STATUS I_BrowserDebugTrace(PWCHAR,PCHAR); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmchdev.h b/include/lmchdev.h index 11c0d0b..0887c66 100644 --- a/include/lmchdev.h +++ b/include/lmchdev.h @@ -24,10 +24,12 @@ #ifndef _LMCHDEV_H #define _LMCHDEV_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define CHARDEVQ_NO_REQUESTS (-1) #define CHARDEV_CLOSE 0 #define CHARDEVQ_MAX_PRIORITY 1 @@ -76,7 +78,9 @@ NET_API_STATUS WINAPI NetCharDevQPurge(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetCharDevQPurgeSelf(LPCWSTR,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetHandleGetInfo(HANDLE,DWORD,PBYTE*); NET_API_STATUS WINAPI NetHandleSetInfo(HANDLE,DWORD,PBYTE,DWORD,PDWORD); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmconfig.h b/include/lmconfig.h index 7f9f392..bedd3e1 100644 --- a/include/lmconfig.h +++ b/include/lmconfig.h @@ -24,10 +24,12 @@ #ifndef _LMCONFIG_H #define _LMCONFIG_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define REVISED_CONFIG_APIS typedef struct _CONFIG_INFO_0 { LPWSTR cfgi0_key; @@ -36,7 +38,9 @@ typedef struct _CONFIG_INFO_0 { NET_API_STATUS WINAPI NetConfigGet(LPCWSTR,LPCWSTR,LPCWSTR,PBYTE*); NET_API_STATUS WINAPI NetConfigGetAll(LPCWSTR,LPCWSTR,PBYTE*); NET_API_STATUS WINAPI NetConfigSet(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE,DWORD); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmcons.h b/include/lmcons.h index ac4f257..5cdf666 100644 --- a/include/lmcons.h +++ b/include/lmcons.h @@ -24,6 +24,7 @@ #ifndef _LMCONS_H #define _LMCONS_H #pragma GCC system_header +#include <_mingw.h> #define MESSAGE_FILENAME TEXT("NETMSG") #define OS2MSG_FILENAME TEXT("BASE") @@ -85,7 +86,7 @@ #define PLATFORM_ID_OSF 600 #define PLATFORM_ID_VMS 700 /* new typedef in W2K */ -#if defined( _WIN32_WINNT ) || defined( WINNT ) || defined( FORCE_UNICODE ) +#if defined(_WIN32_WINNT >= _WIN32_WINNT_WIN2K) || defined(FORCE_UNICODE) #define LMSTR LPWSTR #define LMCSTR LPCWSTR #else diff --git a/include/lmerr.h b/include/lmerr.h index 78db766..d38c563 100644 --- a/include/lmerr.h +++ b/include/lmerr.h @@ -24,6 +24,7 @@ #ifndef _LMERR_H #define _LMERR_H #pragma GCC system_header +#include <_mingw.h> #include #define NERR_Success 0 diff --git a/include/lmerrlog.h b/include/lmerrlog.h index bdaaf71..1d1d863 100644 --- a/include/lmerrlog.h +++ b/include/lmerrlog.h @@ -24,10 +24,12 @@ #ifndef _LMERRLOG_H #define _LMERRLOG_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define ERRLOG_BASE 3100 #define ERRLOG2_BASE 5700 #define LOGFLAGS_FORWARD 0 @@ -226,7 +228,9 @@ typedef struct _ERROR_LOG { NET_API_STATUS WINAPI NetErrorLogClear(LPCWSTR,LPCWSTR,LPBYTE); NET_API_STATUS WINAPI NetErrorLogRead(LPCWSTR,LPWSTR,LPHLOG,DWORD,LPDWORD,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetErrorLogWrite(LPBYTE,DWORD,LPCWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPBYTE); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmmsg.h b/include/lmmsg.h index 564ca27..a59a93f 100644 --- a/include/lmmsg.h +++ b/include/lmmsg.h @@ -24,10 +24,12 @@ #ifndef _LMMSG_H #define _LMMSG_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define MSGNAME_NOT_FORWARDED 0 #define MSGNAME_FORWARDED_TO 4 #define MSGNAME_FORWARDED_FROM 16 @@ -42,7 +44,9 @@ NET_API_STATUS WINAPI NetMessageNameAdd(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetMessageNameDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetMessageNameEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetMessageNameGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmremutl.h b/include/lmremutl.h index 01f510c..374cb26 100644 --- a/include/lmremutl.h +++ b/include/lmremutl.h @@ -24,10 +24,12 @@ #ifndef _LMREMUTL_H #define _LMREMUTL_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define SUPPORTS_REMOTE_ADMIN_PROTOCOL 2 #define SUPPORTS_RPC 4 #define SUPPORTS_SAM_PROTOCOL 8 @@ -60,7 +62,9 @@ typedef struct _TIME_OF_DAY_INFO { NET_API_STATUS WINAPI NetRemoteTOD(LPCWSTR,PBYTE*); NET_API_STATUS WINAPI NetRemoteComputerSupports(LPCWSTR,DWORD,PDWORD); NET_API_STATUS RxRemoteApi(DWORD,LPCWSTR,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,DWORD,... ); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmrepl.h b/include/lmrepl.h index c0915d0..9253094 100644 --- a/include/lmrepl.h +++ b/include/lmrepl.h @@ -24,10 +24,12 @@ #ifndef _LMREPL_H #define _LMREPL_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define REPL_ROLE_EXPORT 1 #define REPL_ROLE_IMPORT 2 #define REPL_ROLE_BOTH 3 @@ -109,7 +111,9 @@ NET_API_STATUS WINAPI NetReplImportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDW NET_API_STATUS WINAPI NetReplImportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); NET_API_STATUS WINAPI NetReplImportDirLock(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetReplImportDirUnlock(LPCWSTR,LPCWSTR,DWORD); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmserver.h b/include/lmserver.h index d08ff14..4480aec 100644 --- a/include/lmserver.h +++ b/include/lmserver.h @@ -24,10 +24,12 @@ #ifndef _LMSERVER_H #define _LMSERVER_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #include #include typedef struct _SERVER_INFO_100 { @@ -621,7 +623,9 @@ BOOL SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL); #define SV_MAXPAGEDPOOLCHUNKSIZE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXPAGEDPOOLCHUNKSIZE_PARMNUM) #define SV_SENDSFROMPREFERREDPROCESSOR_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SENDSFROMPREFERREDPROCESSOR_PARMNUM) #define SV_MAXTHREADSPERQUEUE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXTHREADSPERQUEUE_PARMNUM) + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmshare.h b/include/lmshare.h index 3073bb6..698ef65 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -24,10 +24,12 @@ #ifndef _LMSHARE_H #define _LMSHARE_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #include #define SHARE_NETNAME_PARMNUM 1 #define SHARE_TYPE_PARMNUM 3 @@ -162,7 +164,9 @@ NET_API_STATUS WINAPI NetConnectionEnum(LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD, NET_API_STATUS WINAPI NetFileClose(LPWSTR,DWORD); NET_API_STATUS WINAPI NetFileEnum(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetFileGetInfo(LPWSTR,DWORD,DWORD,PBYTE*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmsname.h b/include/lmsname.h index aad3ab6..d097dc1 100644 --- a/include/lmsname.h +++ b/include/lmsname.h @@ -24,6 +24,7 @@ #ifndef _LMSNAME_H #define _LMSNAME_H #pragma GCC system_header +#include <_mingw.h> #define SERVICE_WORKSTATION TEXT("LanmanWorkstation") #define SERVICE_LM20_WORKSTATION TEXT("WORKSTATION") @@ -76,4 +77,5 @@ #define SERVICE_LM20_NWSAP SERVICE_NWSAP #define NWSAP_DISPLAY_NAME TEXT("NW Sap Agent") #define SERVICE_NWCS TEXT("NWCWorkstation") + #endif diff --git a/include/lmstats.h b/include/lmstats.h index 2812298..363ee59 100644 --- a/include/lmstats.h +++ b/include/lmstats.h @@ -24,10 +24,12 @@ #ifndef _LMSTATS_H #define _LMSTATS_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define STATSOPT_CLR 1 #define STATS_NO_VALUE ((ULONG)-1) #define STATS_OVERFLOW ((ULONG)-2) @@ -129,7 +131,9 @@ typedef struct _STAT_WORKSTATION_0 { #endif NET_API_STATUS WINAPI NetStatisticsGet(LPWSTR,LPWSTR,DWORD,DWORD,PBYTE*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmsvc.h b/include/lmsvc.h index a2e2761..c8df7ad 100644 --- a/include/lmsvc.h +++ b/include/lmsvc.h @@ -24,10 +24,12 @@ #ifndef _LMSVC_H #define _LMSVC_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #include #define SERVICE_DOS_ENCRYPTION TEXT("ENCRYPT") #define SERVICE_UNINSTALLED 0 @@ -149,7 +151,9 @@ NET_API_STATUS WINAPI NetServiceInstall(LPCWSTR,LPCWSTR,DWORD,LPCWSTR*,PBYTE*); #define SERVICE_UIC_CODE(c,m) ((long)(((long)c<<16)|(long)(USHORT)m)) #define SERVICE_NT_CCP_CODE(t,n) (((long)SERVICE_CCP_QUERY_HINT)|((long)(n))|(((t)&LOWER_HINT_MASK)<>SERVICE_NTIP_WAITTIME_SHIFT)|(((c)&LOWER_GET_HINT_MASK)>>SERVICE_IP_WAITTIME_SHIFT)) + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmuse.h b/include/lmuse.h index e11edf0..e63fa55 100644 --- a/include/lmuse.h +++ b/include/lmuse.h @@ -24,10 +24,12 @@ #ifndef _LMUSE_H #define _LMUSE_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #include #define USE_LOCAL_PARMNUM 1 #define USE_REMOTE_PARMNUM 2 @@ -75,7 +77,9 @@ NET_API_STATUS WINAPI NetUseAdd(LPWSTR,DWORD,PBYTE,PDWORD); NET_API_STATUS WINAPI NetUseDel(LPWSTR,LPWSTR,DWORD); NET_API_STATUS WINAPI NetUseEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetUseGetInfo(LPWSTR,LPWSTR,DWORD,PBYTE*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/lmuseflg.h b/include/lmuseflg.h index a1e3de1..5fcda15 100644 --- a/include/lmuseflg.h +++ b/include/lmuseflg.h @@ -24,8 +24,10 @@ #ifndef _LMUSEFLG_H #define _LMUSEFLG_H #pragma GCC system_header +#include <_mingw.h> #define USE_NOFORCE 0 #define USE_FORCE 1 #define USE_LOTS_OF_FORCE 2 + #endif diff --git a/include/lmwksta.h b/include/lmwksta.h index 6f5bdd8..52a568f 100644 --- a/include/lmwksta.h +++ b/include/lmwksta.h @@ -24,10 +24,12 @@ #ifndef _LMWKSTA_H #define _LMWKSTA_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #include #define WKSTA_PLATFORM_ID_PARMNUM 100 #define WKSTA_COMPUTERNAME_PARMNUM 1 @@ -251,4 +253,5 @@ NET_API_STATUS WINAPI NetWkstaTransportEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDW #ifdef __cplusplus } #endif + #endif diff --git a/include/locale.h b/include/locale.h index 7fc0df9..b70ecf7 100644 --- a/include/locale.h +++ b/include/locale.h @@ -24,15 +24,13 @@ #ifndef _LOCALE_H #define _LOCALE_H #pragma GCC system_header +#include <_mingw.h> /* * Functions and types for localization (ie. changing the appearance of * output based on the standards of a certain country). */ -/* All the headers include this file. */ -#include <_mingw.h> - /* * NOTE: I have tried to test this, but I am limited by my knowledge of * locale issues. The structure does not bomb if you look at the diff --git a/include/lzexpand.h b/include/lzexpand.h index 2de3543..fbae010 100644 --- a/include/lzexpand.h +++ b/include/lzexpand.h @@ -24,10 +24,12 @@ #ifndef _LZEXPAND_H #define _LZEXPAND_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define LZERROR_BADINHANDLE (-1) #define LZERROR_BADOUTHANDLE (-2) #define LZERROR_READ (-3) @@ -48,14 +50,11 @@ INT WINAPI LZOpenFileW(LPWSTR,LPOFSTRUCT,WORD); INT WINAPI LZRead(INT,LPSTR,INT); LONG WINAPI LZSeek(INT,LONG,INT); INT WINAPI LZStart(VOID); -#ifdef UNICODE -#define GetExpandedName GetExpandedNameW -#define LZOpenFile LZOpenFileW -#else -#define GetExpandedName GetExpandedNameA -#define LZOpenFile LZOpenFileA -#endif +#define GetExpandedName __AW(GetExpandedName) +#define LZOpenFile __AW(LZOpenFile) + #ifdef __cplusplus } + #endif #endif diff --git a/include/malloc.h b/include/malloc.h index f4a526b..ac5db7d 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -24,6 +24,7 @@ #ifndef _MALLOC_H #define _MALLOC_H #pragma GCC system_header +#include <_mingw.h> /* * Support for programs which want to use malloc.h to get memory management @@ -32,9 +33,6 @@ * instead. */ -/* All the headers include this file. */ -#include <_mingw.h> - #include #ifndef RC_INVOKED @@ -72,15 +70,11 @@ extern "C" { but not W9x. On latter, they always set errno to ENOSYS. */ _CRTIMP int __cdecl __MINGW_NOTHROW _heapwalk (_HEAPINFO*); -#ifdef __GNUC__ #define _alloca(x) __builtin_alloca((x)) -#endif #ifndef _NO_OLDNAMES _CRTIMP int __cdecl __MINGW_NOTHROW heapwalk (_HEAPINFO*); -#ifdef __GNUC__ #define alloca(x) __builtin_alloca((x)) -#endif #endif /* Not _NO_OLDNAMES */ _CRTIMP int __cdecl __MINGW_NOTHROW _heapchk (void); /* Verify heap integrety. */ @@ -92,8 +86,6 @@ _CRTIMP size_t __cdecl __MINGW_NOTHROW _get_sbh_threshold (void); _CRTIMP int __cdecl __MINGW_NOTHROW _set_sbh_threshold (size_t); _CRTIMP void* __cdecl __MINGW_NOTHROW _expand (void*, size_t); -/* These require msvcr70.dll or higher. */ -#if __MSVCRT_VERSION__ >= 0x0700 _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_offset_malloc(size_t, size_t, size_t); _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_offset_realloc(void*, size_t, size_t, size_t); _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_offset_recalloc(void*, size_t, size_t, size_t, size_t); @@ -102,7 +94,6 @@ _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_malloc (size_t, size_t); _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_realloc (void*, size_t, size_t); _CRTIMP void* __cdecl __MINGW_NOTHROW _aligned_recalloc(void*, size_t, size_t, size_t); _CRTIMP void __cdecl __MINGW_NOTHROW _aligned_free (void*); -#endif /* __MSVCRT_VERSION__ >= 0x0700 */ /* These require libmingwex.a. */ void * __cdecl __MINGW_NOTHROW __mingw_aligned_offset_malloc (size_t, size_t, size_t); diff --git a/include/mapi.h b/include/mapi.h index 66e2fe1..7dd285e 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -24,6 +24,7 @@ #ifndef _MAPI_H #define _MAPI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { diff --git a/include/math.h b/include/math.h index 9137369..473fd63 100644 --- a/include/math.h +++ b/include/math.h @@ -24,8 +24,6 @@ #ifndef _MATH_H_ #define _MATH_H_ #pragma GCC system_header - -/* All the headers include this file. */ #include <_mingw.h> /* @@ -263,9 +261,7 @@ _CRTIMP int __cdecl fpclass (double); #endif /* Not _NO_OLDNAMES */ /* This require msvcr70.dll or higher. */ -#if __MSVCRT_VERSION__ >= 0x0700 _CRTIMP int __cdecl _set_SSE2_enable (int); -#endif /* __MSVCRT_VERSION__ >= 0x0700 */ #endif /* __STRICT_ANSI__ */ @@ -275,20 +271,10 @@ _CRTIMP int __cdecl _set_SSE2_enable (int); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ || defined __cplusplus -#if __MINGW_GNUC_PREREQ(3, 3) #define HUGE_VALF __builtin_huge_valf() #define HUGE_VALL __builtin_huge_vall() #define INFINITY __builtin_inf() #define NAN __builtin_nan("") -#else -extern const float __INFF; -#define HUGE_VALF __INFF -extern const long double __INFL; -#define HUGE_VALL __INFL -#define INFINITY HUGE_VALF -extern const double __QNAN; -#define NAN __QNAN -#endif /* __MINGW_GNUC_PREREQ(3, 3) */ /* Use the compiler's builtin define for FLT_EVAL_METHOD to set float_t and double_t. */ diff --git a/include/mbctype.h b/include/mbctype.h index cd79368..e6bea8c 100644 --- a/include/mbctype.h +++ b/include/mbctype.h @@ -24,14 +24,12 @@ #ifndef _MBCTYPE_H #define _MBCTYPE_H #pragma GCC system_header +#include <_mingw.h> /* * Functions for testing multibyte character types and converting characters. */ -/* All the headers include this file. */ -#include <_mingw.h> - /* return values for _mbsbtype and _mbbtype in mbstring.h */ #define _MBC_SINGLE 0 #define _MBC_LEAD 1 diff --git a/include/mbstring.h b/include/mbstring.h index b8dedd3..52d4087 100644 --- a/include/mbstring.h +++ b/include/mbstring.h @@ -24,14 +24,12 @@ #ifndef _MBSTRING_H #define _MBSTRING_H #pragma GCC system_header +#include <_mingw.h> /* * Protototypes for string functions supporting multibyte characters. */ -/* All the headers include this file. */ -#include <_mingw.h> - #ifndef RC_INVOKED #define __need_size_t diff --git a/include/mciavi.h b/include/mciavi.h index 3a420d0..2a7a942 100644 --- a/include/mciavi.h +++ b/include/mciavi.h @@ -24,6 +24,7 @@ #ifndef _MCIAVI_H #define _MCIAVI_H #pragma GCC system_header +#include <_mingw.h> #define MCI_MCIAVI_PLAY_WINDOW 0x1000000 #define MCI_MCIAVI_PLAY_FULLSCREEN 0x2000000 diff --git a/include/mcx.h b/include/mcx.h index 7316313..e837b68 100644 --- a/include/mcx.h +++ b/include/mcx.h @@ -24,10 +24,12 @@ #ifndef _MCX_H #define _MCX_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define DIALOPTION_BILLING 64 #define DIALOPTION_QUIET 128 #define DIALOPTION_DIALTONE 256 @@ -92,7 +94,9 @@ typedef struct _MODEMSETTINGS { DWORD dwNegotiatedDCERate; BYTE abVariablePortion[1]; } MODEMSETTINGS,*PMODEMSETTINGS,*LPMODEMSETTINGS; + #ifdef __cplusplus } #endif + #endif /* _MCX_H */ diff --git a/include/mem.h b/include/mem.h index 9b5ca57..2883f5a 100644 --- a/include/mem.h +++ b/include/mem.h @@ -24,6 +24,7 @@ #ifndef _MEM_H #define _MEM_H #pragma GCC system_header +#include <_mingw.h> /* * mem.h maps to string.h diff --git a/include/memory.h b/include/memory.h index 46d266f..f7bd4f8 100644 --- a/include/memory.h +++ b/include/memory.h @@ -24,6 +24,7 @@ #ifndef _MEMORY_H #define _MEMORY_H #pragma GCC system_header +#include <_mingw.h> /* * memory.h maps to the standard string.h header. diff --git a/include/mgm.h b/include/mgm.h index b292e7f..37a3596 100644 --- a/include/mgm.h +++ b/include/mgm.h @@ -24,12 +24,13 @@ #ifndef _MGM_H #define _MGM_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif -#if (_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) #define MGM_JOIN_STATE_FLAG 0x00000001 #define MGM_FORWARD_STATE_FLAG 0x00000002 #define MGM_MFE_STATS_0 0x00000001 @@ -88,9 +89,10 @@ DWORD WINAPI MgmRegisterMProtocol(PROUTING_PROTOCOL_CONFIG,DWORD,DWORD,HANDLE*); DWORD WINAPI MgmReleaseInterfaceOwnership(HANDLE,DWORD,DWORD); DWORD WINAPI MgmSetMfe(HANDLE,PMIB_IPMCAST_MFE); DWORD WINAPI MgmTakeInterfaceOwnership(HANDLE,DWORD,DWORD); -#endif +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ #ifdef __cplusplus } #endif + #endif diff --git a/include/mgmtapi.h b/include/mgmtapi.h index 7c25c05..d039483 100644 --- a/include/mgmtapi.h +++ b/include/mgmtapi.h @@ -21,18 +21,15 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ - -/* - * SNMP Management API - */ - #ifndef _MGMTAPI_H #define _MGMTAPI_H #pragma GCC system_header +#include <_mingw.h> -#ifndef _SNMP_H +/* + * SNMP Management API + */ #include -#endif #ifdef __cplusplus extern "C" { @@ -68,4 +65,5 @@ BOOL WINSNMPAPI SnmpMgrTrapListen(HANDLE*); #ifdef __cplusplus } #endif + #endif diff --git a/include/mlang.h b/include/mlang.h index f67bc31..3982418 100644 --- a/include/mlang.h +++ b/include/mlang.h @@ -24,12 +24,14 @@ #ifndef _MLANG_H #define _MLANG_H #pragma GCC system_header +#include <_mingw.h> #include #ifdef __cplusplus extern "C" { #endif + #pragma pack(push,1) #define MAX_MIMECP_NAME 64 @@ -362,9 +364,10 @@ DECLARE_INTERFACE_(IMultiLanguage2,IUnknown) }; #undef INTERFACE - #pragma pack(pop) + #ifdef __cplusplus } #endif + #endif diff --git a/include/mmreg.h b/include/mmreg.h index 6178e77..b478dfb 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -24,10 +24,9 @@ #ifndef _MMREG_H #define _MMREG_H #pragma GCC system_header +#include <_mingw.h> -#ifndef _MMSYSTEM_H #include -#endif #ifdef __cplusplus extern "C" { @@ -244,4 +243,5 @@ typedef struct mpeglayer3waveformat_tag { #ifdef __cplusplus } #endif + #endif diff --git a/include/mmsystem.h b/include/mmsystem.h index 9f1422f..39d2d7e 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -24,6 +24,7 @@ #ifndef _MMSYSTEM_H #define _MMSYSTEM_H #pragma GCC system_header +#include <_mingw.h> #pragma pack(push,1) @@ -409,9 +410,6 @@ extern "C" { #define TIME_CALLBACK_FUNCTION 0 #define TIME_CALLBACK_EVENT_SET 16 #define TIME_CALLBACK_EVENT_PULSE 32 -#if (WINVER >= 0x0501) -#define TIME_KILL_SYNCHRONOUS 0x0100 -#endif #define JOYERR_NOERROR (0) #define JOYERR_PARMS (JOYERR_BASE+5) #define JOYERR_NOCANDO (JOYERR_BASE+6) @@ -1860,107 +1858,63 @@ typedef struct tagMCI_OVLY_LOAD_PARMSW { RECT rc; } MCI_OVLY_LOAD_PARMSW,*PMCI_OVLY_LOAD_PARMSW,*LPMCI_OVLY_LOAD_PARMSW; -#ifdef UNICODE -typedef WAVEOUTCAPSW WAVEOUTCAPS,*PWAVEOUTCAPS,*LPWAVEOUTCAPS; -typedef WAVEINCAPSW WAVEINCAPS,*PWAVEINCAPS,*LPWAVEINCAPS; -typedef MIDIOUTCAPSW MIDIOUTCAPS,*PMIDIOUTCAPS,*LPMIDIOUTCAPS; -typedef MIDIINCAPSW MIDIINCAPS,*PMIDIINCAPS,*LPMIDIINCAPS; -typedef AUXCAPSW AUXCAPS,*PAUXCAPS,*LPAUXCAPS; -typedef MIXERCAPSW MIXERCAPS,*PMIXERCAPS,*LPMIXERCAPS; -typedef MIXERLINEW MIXERLINE,*PMIXERLINE,*LPMIXERLINE; -typedef MIXERCONTROLW MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL; -typedef MIXERLINECONTROLSW MIXERLINECONTROLS,*PMIXERLINECONTROLS,*LPMIXERLINECONTROLS; -typedef MIXERCONTROLDETAILS_LISTTEXTW MIXERCONTROLDETAILS_LISTTEXT,*PMIXERCONTROLDETAILS_LISTTEXT,*LPMIXERCONTROLDETAILS_LISTTEXT; -typedef JOYCAPSW JOYCAPS,*PJOYCAPS,*LPJOYCAPS; -typedef MCI_OPEN_PARMSW MCI_OPEN_PARMS,*PMCI_OPEN_PARMS,*LPMCI_OPEN_PARMS; -typedef MCI_INFO_PARMSW MCI_INFO_PARMS,*LPMCI_INFO_PARMS; -typedef MCI_SYSINFO_PARMSW MCI_SYSINFO_PARMS,*PMCI_SYSINFO_PARMS,*LPMCI_SYSINFO_PARMS; -typedef MCI_SAVE_PARMSW MCI_SAVE_PARMS,*PMCI_SAVE_PARMS,*LPMCI_SAVE_PARMS; -typedef MCI_LOAD_PARMSW MCI_LOAD_PARMS,*PMCI_LOAD_PARMS,*LPMCI_LOAD_PARMS; -typedef MCI_VD_ESCAPE_PARMSW MCI_VD_ESCAPE_PARMS,*PMCI_VD_ESCAPE_PARMS,*LPMCI_VD_ESCAPE_PARMS; -typedef MCI_WAVE_OPEN_PARMSW MCI_WAVE_OPEN_PARMS,*PMCI_WAVE_OPEN_PARMS,*LPMCI_WAVE_OPEN_PARMS; -typedef MCI_ANIM_OPEN_PARMSW MCI_ANIM_OPEN_PARMS,*PMCI_ANIM_OPEN_PARMS,*LPMCI_ANIM_OPEN_PARMS; -typedef MCI_ANIM_WINDOW_PARMSW MCI_ANIM_WINDOW_PARMS,*PMCI_ANIM_WINDOW_PARMS,*LPMCI_ANIM_WINDOW_PARMS; -typedef MCI_OVLY_OPEN_PARMSW MCI_OVLY_OPEN_PARMS,*PMCI_OVLY_OPEN_PARMS,*LPMCI_OVLY_OPEN_PARMS; -typedef MCI_OVLY_WINDOW_PARMSW MCI_OVLY_WINDOW_PARMS,*PMCI_OVLY_WINDOW_PARMS,*LPMCI_OVLY_WINDOW_PARMS; -typedef MCI_OVLY_SAVE_PARMSW MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OVLY_SAVE_PARMS; -#define sndPlaySound sndPlaySoundW -#define PlaySound PlaySoundW -#define waveOutGetDevCaps waveOutGetDevCapsW -#define waveOutGetErrorText waveOutGetErrorTextW -#define waveInGetDevCaps waveInGetDevCapsW -#define waveInGetErrorText waveInGetErrorTextW -#define midiOutGetDevCaps midiOutGetDevCapsW -#define midiOutGetErrorText midiOutGetErrorTextW -#define midiInGetDevCaps midiInGetDevCapsW -#define midiInGetErrorText midiInGetErrorTextW -#define auxGetDevCaps auxGetDevCapsW -#define mixerGetDevCaps mixerGetDevCapsW -#define mixerGetLineInfo mixerGetLineInfoW -#define mixerGetLineControls mixerGetLineControlsW -#define mixerGetControlDetails mixerGetControlDetailsW -#define joyGetDevCaps joyGetDevCapsW -#define mmioInstallIOProc mmioInstallIOProcW -#define mmioStringToFOURCC mmioStringToFOURCCW -#define mmioOpen mmioOpenW -#define mmioRename mmioRenameW -#define mciSendCommand mciSendCommandW -#define mciSendString mciSendStringW -#define mciGetDeviceID mciGetDeviceIDW -#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDW -#define mciGetErrorString mciGetErrorStringW -#else -typedef WAVEOUTCAPSA WAVEOUTCAPS,*PWAVEOUTCAPS,*LPWAVEOUTCAPS; -typedef WAVEINCAPSA WAVEINCAPS,*PWAVEINCAPS,*LPWAVEINCAPS; -typedef MIDIOUTCAPSA MIDIOUTCAPS,*PMIDIOUTCAPS,*LPMIDIOUTCAPS; -typedef MIDIINCAPSA MIDIINCAPS,*PMIDIINCAPS,*LPMIDIINCAPS; -typedef AUXCAPSA AUXCAPS,*PAUXCAPS,*LPAUXCAPS; -typedef MIXERCAPSA MIXERCAPS,*PMIXERCAPS,*LPMIXERCAPS; -typedef MIXERLINEA MIXERLINE,*PMIXERLINE,*LPMIXERLINE; -typedef MIXERCONTROLA MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL; -typedef MIXERLINECONTROLSA MIXERLINECONTROLS,*PMIXERLINECONTROLS,*LPMIXERLINECONTROLS; -typedef MIXERCONTROLDETAILS_LISTTEXTA MIXERCONTROLDETAILS_LISTTEXT,*PMIXERCONTROLDETAILS_LISTTEXT,*LPMIXERCONTROLDETAILS_LISTTEXT; -typedef JOYCAPSA JOYCAPS,*PJOYCAPS,*LPJOYCAPS; -typedef MCI_OPEN_PARMSA MCI_OPEN_PARMS,*PMCI_OPEN_PARMS,*LPMCI_OPEN_PARMS; -typedef MCI_INFO_PARMSA MCI_INFO_PARMS,*LPMCI_INFO_PARMS; -typedef MCI_SYSINFO_PARMSA MCI_SYSINFO_PARMS,*PMCI_SYSINFO_PARMS,*LPMCI_SYSINFO_PARMS; -typedef MCI_SAVE_PARMSA MCI_SAVE_PARMS,*PMCI_SAVE_PARMS,*LPMCI_SAVE_PARMS; -typedef MCI_LOAD_PARMSA MCI_LOAD_PARMS,*PMCI_LOAD_PARMS,*LPMCI_LOAD_PARMS; -typedef MCI_VD_ESCAPE_PARMSA MCI_VD_ESCAPE_PARMS,*PMCI_VD_ESCAPE_PARMS,*LPMCI_VD_ESCAPE_PARMS; -typedef MCI_WAVE_OPEN_PARMSA MCI_WAVE_OPEN_PARMS,*PMCI_WAVE_OPEN_PARMS,*LPMCI_WAVE_OPEN_PARMS; -typedef MCI_ANIM_OPEN_PARMSA MCI_ANIM_OPEN_PARMS,*PMCI_ANIM_OPEN_PARMS,*LPMCI_ANIM_OPEN_PARMS; -typedef MCI_ANIM_WINDOW_PARMSA MCI_ANIM_WINDOW_PARMS,*PMCI_ANIM_WINDOW_PARMS,*LPMCI_ANIM_WINDOW_PARMS; -typedef MCI_OVLY_OPEN_PARMSA MCI_OVLY_OPEN_PARMS,*PMCI_OVLY_OPEN_PARMS,*LPMCI_OVLY_OPEN_PARMS; -typedef MCI_OVLY_WINDOW_PARMSA MCI_OVLY_WINDOW_PARMS,*PMCI_OVLY_WINDOW_PARMS,*LPMCI_OVLY_WINDOW_PARMS; -typedef MCI_OVLY_SAVE_PARMSA MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OVLY_SAVE_PARMS; -#define sndPlaySound sndPlaySoundA -#define PlaySound PlaySoundA -#define waveOutGetDevCaps waveOutGetDevCapsA -#define waveOutGetErrorText waveOutGetErrorTextA -#define waveInGetDevCaps waveInGetDevCapsA -#define waveInGetErrorText waveInGetErrorTextA -#define midiOutGetDevCaps midiOutGetDevCapsA -#define midiOutGetErrorText midiOutGetErrorTextA -#define midiInGetDevCaps midiInGetDevCapsA -#define midiInGetErrorText midiInGetErrorTextA -#define auxGetDevCaps auxGetDevCapsA -#define mixerGetDevCaps mixerGetDevCapsA -#define mixerGetLineInfo mixerGetLineInfoA -#define mixerGetLineControls mixerGetLineControlsA -#define mixerGetControlDetails mixerGetControlDetailsA -#define joyGetDevCaps joyGetDevCapsA -#define mmioInstallIOProc mmioInstallIOProcA -#define mmioStringToFOURCC mmioStringToFOURCCA -#define mmioOpen mmioOpenA -#define mmioRename mmioRenameA -#define mciSendCommand mciSendCommandA -#define mciSendString mciSendStringA -#define mciGetDeviceID mciGetDeviceIDA -#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA -#define mciGetErrorString mciGetErrorStringA +typedef __AW(WAVEOUTCAPS) WAVEOUTCAPS,*PWAVEOUTCAPS,*LPWAVEOUTCAPS; +typedef __AW(WAVEINCAPS) WAVEINCAPS,*PWAVEINCAPS,*LPWAVEINCAPS; +typedef __AW(MIDIOUTCAPS) MIDIOUTCAPS,*PMIDIOUTCAPS,*LPMIDIOUTCAPS; +typedef __AW(MIDIINCAPS) MIDIINCAPS,*PMIDIINCAPS,*LPMIDIINCAPS; +typedef __AW(AUXCAPS) AUXCAPS,*PAUXCAPS,*LPAUXCAPS; +typedef __AW(MIXERCAPS) MIXERCAPS,*PMIXERCAPS,*LPMIXERCAPS; +typedef __AW(MIXERLINE) MIXERLINE,*PMIXERLINE,*LPMIXERLINE; +typedef __AW(MIXERCONTROL) MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL; +typedef __AW(MIXERLINECONTROLS) MIXERLINECONTROLS,*PMIXERLINECONTROLS,*LPMIXERLINECONTROLS; +typedef __AW(MIXERCONTROLDETAILS_LISTTEXT) MIXERCONTROLDETAILS_LISTTEXT,*PMIXERCONTROLDETAILS_LISTTEXT,*LPMIXERCONTROLDETAILS_LISTTEXT; +typedef __AW(JOYCAPS) JOYCAPS,*PJOYCAPS,*LPJOYCAPS; +typedef __AW(MCI_OPEN_PARMS) MCI_OPEN_PARMS,*PMCI_OPEN_PARMS,*LPMCI_OPEN_PARMS; +typedef __AW(MCI_INFO_PARMS) MCI_INFO_PARMS,*LPMCI_INFO_PARMS; +typedef __AW(MCI_SYSINFO_PARMS) MCI_SYSINFO_PARMS,*PMCI_SYSINFO_PARMS,*LPMCI_SYSINFO_PARMS; +typedef __AW(MCI_SAVE_PARMS) MCI_SAVE_PARMS,*PMCI_SAVE_PARMS,*LPMCI_SAVE_PARMS; +typedef __AW(MCI_LOAD_PARMS) MCI_LOAD_PARMS,*PMCI_LOAD_PARMS,*LPMCI_LOAD_PARMS; +typedef __AW(MCI_VD_ESCAPE_PARMS) MCI_VD_ESCAPE_PARMS,*PMCI_VD_ESCAPE_PARMS,*LPMCI_VD_ESCAPE_PARMS; +typedef __AW(MCI_WAVE_OPEN_PARMS) MCI_WAVE_OPEN_PARMS,*PMCI_WAVE_OPEN_PARMS,*LPMCI_WAVE_OPEN_PARMS; +typedef __AW(MCI_ANIM_OPEN_PARMS) MCI_ANIM_OPEN_PARMS,*PMCI_ANIM_OPEN_PARMS,*LPMCI_ANIM_OPEN_PARMS; +typedef __AW(MCI_ANIM_WINDOW_PARMS) MCI_ANIM_WINDOW_PARMS,*PMCI_ANIM_WINDOW_PARMS,*LPMCI_ANIM_WINDOW_PARMS; +typedef __AW(MCI_OVLY_OPEN_PARMS) MCI_OVLY_OPEN_PARMS,*PMCI_OVLY_OPEN_PARMS,*LPMCI_OVLY_OPEN_PARMS; +typedef __AW(MCI_OVLY_WINDOW_PARMS) MCI_OVLY_WINDOW_PARMS,*PMCI_OVLY_WINDOW_PARMS,*LPMCI_OVLY_WINDOW_PARMS; +typedef __AW(MCI_OVLY_SAVE_PARMS) MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OVLY_SAVE_PARMS; +#define sndPlaySound __AW(sndPlaySound) +#define PlaySound __AW(PlaySound) +#define waveOutGetDevCaps __AW(waveOutGetDevCaps) +#define waveOutGetErrorText __AW(waveOutGetErrorText) +#define waveInGetDevCaps __AW(waveInGetDevCaps) +#define waveInGetErrorText __AW(waveInGetErrorText) +#define midiOutGetDevCaps __AW(midiOutGetDevCaps) +#define midiOutGetErrorText __AW(midiOutGetErrorText) +#define midiInGetDevCaps __AW(midiInGetDevCaps) +#define midiInGetErrorText __AW(midiInGetErrorText) +#define auxGetDevCaps __AW(auxGetDevCaps) +#define mixerGetDevCaps __AW(mixerGetDevCaps) +#define mixerGetLineInfo __AW(mixerGetLineInfo) +#define mixerGetLineControls __AW(mixerGetLineControls) +#define mixerGetControlDetails __AW(mixerGetControlDetails) +#define joyGetDevCaps __AW(joyGetDevCaps) +#define mmioInstallIOProc __AW(mmioInstallIOProc) +#define mmioStringToFOURCC __AW(mmioStringToFOURCC) +#define mmioOpen __AW(mmioOpen) +#define mmioRename __AW(mmioRename) +#define mciSendCommand __AW(mciSendCommand) +#define mciSendString __AW(mciSendString) +#define mciGetDeviceID __AW(mciGetDeviceID) +#define mciGetDeviceIDFromElementID __AW(mciGetDeviceIDFromElementID) +#define mciGetErrorString __AW(mciGetErrorString) + +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +#define TIME_KILL_SYNCHRONOUS 0x0100 #endif + #ifdef __cplusplus } #endif + #pragma pack(pop) + #endif diff --git a/include/mpegtype.h b/include/mpegtype.h index 3ba25a4..6975f73 100644 --- a/include/mpegtype.h +++ b/include/mpegtype.h @@ -24,6 +24,7 @@ #ifndef _MPEGTYPE_H #define _MPEGTYPE_H #pragma GCC system_header +#include <_mingw.h> #include @@ -47,4 +48,5 @@ typedef struct tagAM_MPEGSYSTEMTYPE { #ifdef __cplusplus } #endif + #endif diff --git a/include/mprapi.h b/include/mprapi.h index a55bee6..8bd78a7 100644 --- a/include/mprapi.h +++ b/include/mprapi.h @@ -21,14 +21,14 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ - -/* - * Routing and Remote Access Services - */ #ifndef _MPRAPI_H #define _MPRAPI_H #pragma GCC system_header +#include <_mingw.h> +/* + * Routing and Remote Access Services + */ #include #include @@ -36,7 +36,7 @@ extern "C" { #endif -#if (_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) /*--- Router Management Reference - Router Management Enumerated Types */ typedef enum _ROUTER_CONNECTION_STATE { ROUTER_IF_STATE_UNREACHABLE, @@ -252,12 +252,6 @@ typedef struct _MPR_CREDENTIALSEX_0 { DWORD dwSize; LPBYTE lpbCredentialsInfo; } MPR_CREDENTIALSEX_0,*PMPR_CREDENTIALSEX_0; -#if (_WIN32_WINNT >= 0x0502) -typedef struct _MPR_CREDENTIALSEX_1 { - DWORD dwSize; - LPBYTE lpbCredentialsInfo; -} MPR_CREDENTIALSEX_1,*PMPR_CREDENTIALSEX_1; -#endif #define MPR_MaxDeviceType RAS_MaxDeviceType #define MPR_MaxDeviceName RAS_MaxDeviceName #define MPR_MaxPadType RAS_MaxPadType @@ -390,67 +384,12 @@ typedef struct _MPR_INTERFACE_2 { #define MPR_VS_PptpFirst VS_PptpFirst #define MPR_VS_L2tpOnly VS_L2tpOnly #define MPR_VS_L2tpFirst VS_L2tpFirst -#if (_WIN32_WINNT>=0x0600) -typedef struct _MPR_INTERFACE_3 { - WCHAR wszInterfaceName[MAX_INTERFACE_NAME_LEN+1]; - HANDLE hInterface; - BOOL fEnabled; - ROUTER_INTERFACE_TYPE dwIfType; - ROUTER_CONNECTION_STATE dwConnectionState; - DWORD fUnReachabilityReasons; - DWORD dwLastError; - DWORD dwfOptions; - WCHAR szLocalPhoneNumber[RAS_MaxPhoneNumber+1]; - PWCHAR szAlternates; - DWORD ipaddr; - DWORD ipaddrDns; - DWORD ipaddrDnsAlt; - DWORD ipaddrWins; - DWORD ipaddrWinsAlt; - DWORD dwfNetProtocols; - WCHAR szDeviceType[MPR_MaxDeviceType+1]; - WCHAR szDeviceName[MPR_MaxDeviceName+1]; - WCHAR szX25PadType[MPR_MaxPadType+1]; - WCHAR szX25Address[MPR_MaxX25Address+1]; - WCHAR szX25Facilities[MPR_MaxFacilities+1]; - WCHAR szX25UserData[MPR_MaxUserData+1]; - DWORD dwChannels; - DWORD dwSubEntries; - DWORD dwDialMode; - DWORD dwDialExtraPercent; - DWORD dwDialExtraSampleSeconds; - DWORD dwHangUpExtraPercent; - DWORD dwHangUpExtraSampleSeconds; - DWORD dwIdleDisconnectSeconds; - DWORD dwType; - DWORD dwEncryptionType; - DWORD dwCustomAuthKey; - DWORD dwCustomAuthDataSize; - LPBYTE lpbCustomAuthData; - GUID guidId; - DWORD dwVpnStrategy; - ULONG AddressCount; - IN6_ADDR ipv6addrDns; - IN6_ADDR ipv6addrDnsAlt; - IN6_ADDR* ipv6addr; -} MPR_INTERFACE_3,*PMPR_INTERFACE_3; -#endif typedef struct _MPR_SERVER_0 { BOOL fLanOnlyMode; DWORD dwUpTime; DWORD dwTotalPorts; DWORD dwPortsInUse; } MPR_SERVER_0,*PMPR_SERVER_0; -#if (_WIN32_WINNT >= 0x0502) -typedef struct _MPR_SERVER_1 { - DWORD dwNumPptpPorts; - DWORD dwPptpPortFlags; - DWORD dwNumL2tpPorts; - DWORD dwL2tpPortFlags; -} MPR_SERVER_1,*PMPR_SERVER_1; -#define MPR_ENABLE_RAS_ON_DEVICE 0x00000001 -#define MPR_ENABLE_ROUTING_ON_DEVICE 0x00000002 -#endif typedef struct _MPR_TRANSPORT_0 { DWORD dwTransportId; HANDLE hTransport; @@ -472,16 +411,9 @@ DWORD WINAPI MprAdminPortReset(RAS_SERVER_HANDLE,HANDLE); BOOL WINAPI MprAdminAcceptNewConnection(RAS_CONNECTION_0*,RAS_CONNECTION_1*); BOOL WINAPI MprAdminAcceptNewConnection2(RAS_CONNECTION_0*,RAS_CONNECTION_1*,RAS_CONNECTION_2*); BOOL WINAPI MprAdminAcceptNewLink(RAS_PORT_0*,RAS_PORT_1*); -#if (_WIN32_WINNT >= 0x0600) -BOOL WINAPI MprAdminAcceptReauthentication(RAS_CONNECTION_0*,RAS_CONNECTION_1*,RAS_CONNECTION_2*,RAS_CONNECTION_3*); -#endif void WINAPI MprAdminConnectionHangupNotification(RAS_CONNECTION_0*,RAS_CONNECTION_1*); void WINAPI MprAdminConnectionHangupNotification2(RAS_CONNECTION_0*,RAS_CONNECTION_1*,RAS_CONNECTION_2*); DWORD WINAPI MprAdminGetIpAddressForUser(WCHAR*,WCHAR*,DWORD*,BOOL*); -#if (_WIN32_WINNT >= 0x0502) -DWORD WINAPI MprAdminInitializeDll(void); -DWORD WINAPI MprAdminTerminateDll(void); -#endif void WINAPI MprAdminLinkHangupNotification(RAS_PORT_0*,RAS_PORT_1*); void WINAPI MprAdminReleaseIpAddress(WCHAR*,WCHAR*,DWORD*); /*--- Remote Access Service Administration Reference - RAS Administration Functions - RAS User Administration Functions */ @@ -579,9 +511,74 @@ DWORD WINAPI MprAdminMIBGetTrapInfo(MIB_SERVER_HANDLE,DWORD,DWORD,LPVOID,DWORD,L DWORD WINAPI MprAdminMIBServerConnect(LPWSTR,MIB_SERVER_HANDLE*); void WINAPI MprAdminMIBServerDisconnect(MIB_SERVER_HANDLE); DWORD WINAPI MprAdminMIBSetTrapInfo(DWORD,DWORD,HANDLE,LPVOID,DWORD,LPVOID*,LPDWORD); -#endif /* (_WIN32_WINNT >= 0x0500) */ +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) */ + +#if (_WIN32_WINNT >= _WIN32_WINNT_WS03) +typedef struct _MPR_CREDENTIALSEX_1 { + DWORD dwSize; + LPBYTE lpbCredentialsInfo; +} MPR_CREDENTIALSEX_1,*PMPR_CREDENTIALSEX_1; +typedef struct _MPR_SERVER_1 { + DWORD dwNumPptpPorts; + DWORD dwPptpPortFlags; + DWORD dwNumL2tpPorts; + DWORD dwL2tpPortFlags; +} MPR_SERVER_1,*PMPR_SERVER_1; +#define MPR_ENABLE_RAS_ON_DEVICE 0x00000001 +#define MPR_ENABLE_ROUTING_ON_DEVICE 0x00000002 +DWORD WINAPI MprAdminInitializeDll(void); +DWORD WINAPI MprAdminTerminateDll(void); +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WS03 */ + +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) +typedef struct _MPR_INTERFACE_3 { + WCHAR wszInterfaceName[MAX_INTERFACE_NAME_LEN+1]; + HANDLE hInterface; + BOOL fEnabled; + ROUTER_INTERFACE_TYPE dwIfType; + ROUTER_CONNECTION_STATE dwConnectionState; + DWORD fUnReachabilityReasons; + DWORD dwLastError; + DWORD dwfOptions; + WCHAR szLocalPhoneNumber[RAS_MaxPhoneNumber+1]; + PWCHAR szAlternates; + DWORD ipaddr; + DWORD ipaddrDns; + DWORD ipaddrDnsAlt; + DWORD ipaddrWins; + DWORD ipaddrWinsAlt; + DWORD dwfNetProtocols; + WCHAR szDeviceType[MPR_MaxDeviceType+1]; + WCHAR szDeviceName[MPR_MaxDeviceName+1]; + WCHAR szX25PadType[MPR_MaxPadType+1]; + WCHAR szX25Address[MPR_MaxX25Address+1]; + WCHAR szX25Facilities[MPR_MaxFacilities+1]; + WCHAR szX25UserData[MPR_MaxUserData+1]; + DWORD dwChannels; + DWORD dwSubEntries; + DWORD dwDialMode; + DWORD dwDialExtraPercent; + DWORD dwDialExtraSampleSeconds; + DWORD dwHangUpExtraPercent; + DWORD dwHangUpExtraSampleSeconds; + DWORD dwIdleDisconnectSeconds; + DWORD dwType; + DWORD dwEncryptionType; + DWORD dwCustomAuthKey; + DWORD dwCustomAuthDataSize; + LPBYTE lpbCustomAuthData; + GUID guidId; + DWORD dwVpnStrategy; + ULONG AddressCount; + IN6_ADDR ipv6addrDns; + IN6_ADDR ipv6addrDnsAlt; + IN6_ADDR* ipv6addr; +} MPR_INTERFACE_3,*PMPR_INTERFACE_3; +BOOL WINAPI MprAdminAcceptReauthentication(RAS_CONNECTION_0*,RAS_CONNECTION_1*,RAS_CONNECTION_2*,RAS_CONNECTION_3*); +#endif /* _WIN32_WINNT >= _WIN32_WINNT_VISTA */ #ifdef __cplusplus } #endif + #endif -- 2.11.0