I took care that those error-messages no longer supported Vista+
aren't defined anymore. At least this is behavior as I would read out
of msdn.
Is patch of for apply?
Kai
From 2f63f2631a98d1d5d87c1f01b8497beb6d2e17d8 Mon Sep 17 00:00:00 2001
From: Kai Tietz <[email protected]>
Date: Mon, 25 Aug 2014 22:10:53 +0200
Subject: =?UTF-8?q?Add=20winapifamily=20check,=20add=20new=20constants=20for?=
=?UTF-8?q?=20Windows=207=20and=20Windows=208,=0Amake=20sure=20XP=20specific?=
=?UTF-8?q?=20error-codes=20aren't=20defined=20anymore=20if=20WINVER=20indic?=
=?UTF-8?q?ates=0AVISTA=20or=20newer=20OS.?=
---
mingw-w64-headers/include/raserror.h | 193 +++++++++++++++++++++++----------
1 files changed, 134 insertions(+), 59 deletions(-)
diff --git a/mingw-w64-headers/include/raserror.h
b/mingw-w64-headers/include/raserror.h
index f94a6ae..5c64cb6 100644
--- a/mingw-w64-headers/include/raserror.h
+++ b/mingw-w64-headers/include/raserror.h
@@ -1,11 +1,10 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
#ifndef _RASERROR_H_
#define _RASERROR_H_
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
#define RASBASE 600
#define SUCCESS 0
@@ -14,28 +13,21 @@
#define ERROR_PORT_ALREADY_OPEN (RASBASE+2)
#define ERROR_BUFFER_TOO_SMALL (RASBASE+3)
#define ERROR_WRONG_INFO_SPECIFIED (RASBASE+4)
-#define ERROR_CANNOT_SET_PORT_INFO (RASBASE+5)
#define ERROR_PORT_NOT_CONNECTED (RASBASE+6)
-#define ERROR_EVENT_INVALID (RASBASE+7)
#define ERROR_DEVICE_DOES_NOT_EXIST (RASBASE+8)
#define ERROR_DEVICETYPE_DOES_NOT_EXIST (RASBASE+9)
#define ERROR_BUFFER_INVALID (RASBASE+10)
-#define ERROR_ROUTE_NOT_AVAILABLE (RASBASE+11)
#define ERROR_ROUTE_NOT_ALLOCATED (RASBASE+12)
-#define ERROR_INVALID_COMPRESSION_SPECIFIED (RASBASE+13)
-#define ERROR_OUT_OF_BUFFERS (RASBASE+14)
#define ERROR_PORT_NOT_FOUND (RASBASE+15)
#define ERROR_ASYNC_REQUEST_PENDING (RASBASE+16)
#define ERROR_ALREADY_DISCONNECTING (RASBASE+17)
#define ERROR_PORT_NOT_OPEN (RASBASE+18)
#define ERROR_PORT_DISCONNECTED (RASBASE+19)
-#define ERROR_NO_ENDPOINTS (RASBASE+20)
#define ERROR_CANNOT_OPEN_PHONEBOOK (RASBASE+21)
#define ERROR_CANNOT_LOAD_PHONEBOOK (RASBASE+22)
#define ERROR_CANNOT_FIND_PHONEBOOK_ENTRY (RASBASE+23)
#define ERROR_CANNOT_WRITE_PHONEBOOK (RASBASE+24)
#define ERROR_CORRUPT_PHONEBOOK (RASBASE+25)
-#define ERROR_CANNOT_LOAD_STRING (RASBASE+26)
#define ERROR_KEY_NOT_FOUND (RASBASE+27)
#define ERROR_DISCONNECTION (RASBASE+28)
#define ERROR_REMOTE_DISCONNECTION (RASBASE+29)
@@ -43,23 +35,14 @@
#define ERROR_USER_DISCONNECTION (RASBASE+31)
#define ERROR_INVALID_SIZE (RASBASE+32)
#define ERROR_PORT_NOT_AVAILABLE (RASBASE+33)
-#define ERROR_CANNOT_PROJECT_CLIENT (RASBASE+34)
#define ERROR_UNKNOWN (RASBASE+35)
#define ERROR_WRONG_DEVICE_ATTACHED (RASBASE+36)
-#define ERROR_BAD_STRING (RASBASE+37)
#define ERROR_REQUEST_TIMEOUT (RASBASE+38)
-#define ERROR_CANNOT_GET_LANA (RASBASE+39)
-#define ERROR_NETBIOS_ERROR (RASBASE+40)
-#define ERROR_SERVER_OUT_OF_RESOURCES (RASBASE+41)
-#define ERROR_NAME_EXISTS_ON_NET (RASBASE+42)
-#define ERROR_SERVER_GENERAL_NET_FAILURE (RASBASE+43)
-#define WARNING_MSG_ALIAS_NOT_ADDED (RASBASE+44)
#define ERROR_AUTH_INTERNAL (RASBASE+45)
#define ERROR_RESTRICTED_LOGON_HOURS (RASBASE+46)
#define ERROR_ACCT_DISABLED (RASBASE+47)
#define ERROR_PASSWD_EXPIRED (RASBASE+48)
#define ERROR_NO_DIALIN_PERMISSION (RASBASE+49)
-#define ERROR_SERVER_NOT_RESPONDING (RASBASE+50)
#define ERROR_FROM_DEVICE (RASBASE+51)
#define ERROR_UNRECOGNIZED_RESPONSE (RASBASE+52)
#define ERROR_MACRO_NOT_FOUND (RASBASE+53)
@@ -83,23 +66,11 @@
#define ERROR_READING_DEVICETYPE (RASBASE+71)
#define ERROR_READING_DEVICENAME (RASBASE+72)
#define ERROR_READING_USAGE (RASBASE+73)
-#define ERROR_READING_MAXCONNECTBPS (RASBASE+74)
-#define ERROR_READING_MAXCARRIERBPS (RASBASE+75)
#define ERROR_LINE_BUSY (RASBASE+76)
#define ERROR_VOICE_ANSWER (RASBASE+77)
#define ERROR_NO_ANSWER (RASBASE+78)
#define ERROR_NO_CARRIER (RASBASE+79)
#define ERROR_NO_DIALTONE (RASBASE+80)
-#define ERROR_IN_COMMAND (RASBASE+81)
-#define ERROR_WRITING_SECTIONNAME (RASBASE+82)
-#define ERROR_WRITING_DEVICETYPE (RASBASE+83)
-#define ERROR_WRITING_DEVICENAME (RASBASE+84)
-#define ERROR_WRITING_MAXCONNECTBPS (RASBASE+85)
-#define ERROR_WRITING_MAXCARRIERBPS (RASBASE+86)
-#define ERROR_WRITING_USAGE (RASBASE+87)
-#define ERROR_WRITING_DEFAULTOFF (RASBASE+88)
-#define ERROR_READING_DEFAULTOFF (RASBASE+89)
-#define ERROR_EMPTY_INI_FILE (RASBASE+90)
#define ERROR_AUTHENTICATION_FAILURE (RASBASE+91)
#define ERROR_PORT_OR_DEVICE (RASBASE+92)
#define ERROR_NOT_BINARY_MACRO (RASBASE+93)
@@ -115,31 +86,22 @@
#define ERROR_INTERACTIVE_MODE (RASBASE+103)
#define ERROR_BAD_CALLBACK_NUMBER (RASBASE+104)
#define ERROR_INVALID_AUTH_STATE (RASBASE+105)
-#define ERROR_WRITING_INITBPS (RASBASE+106)
#define ERROR_X25_DIAGNOSTIC (RASBASE+107)
#define ERROR_ACCT_EXPIRED (RASBASE+108)
#define ERROR_CHANGING_PASSWORD (RASBASE+109)
#define ERROR_OVERRUN (RASBASE+110)
#define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111)
-#define ERROR_BIPLEX_PORT_NOT_AVAILABLE (RASBASE+112)
#define ERROR_NO_ACTIVE_ISDN_LINES (RASBASE+113)
-#define ERROR_NO_ISDN_CHANNELS_AVAILABLE (RASBASE+114)
-#define ERROR_TOO_MANY_LINE_ERRORS (RASBASE+115)
#define ERROR_IP_CONFIGURATION (RASBASE+116)
#define ERROR_NO_IP_ADDRESSES (RASBASE+117)
#define ERROR_PPP_TIMEOUT (RASBASE+118)
-#define ERROR_PPP_REMOTE_TERMINATED (RASBASE+119)
#define ERROR_PPP_NO_PROTOCOLS_CONFIGURED (RASBASE+120)
#define ERROR_PPP_NO_RESPONSE (RASBASE+121)
#define ERROR_PPP_INVALID_PACKET (RASBASE+122)
#define ERROR_PHONE_NUMBER_TOO_LONG (RASBASE+123)
-#define ERROR_IPXCP_NO_DIALOUT_CONFIGURED (RASBASE+124)
-#define ERROR_IPXCP_NO_DIALIN_CONFIGURED (RASBASE+125)
#define ERROR_IPXCP_DIALOUT_ALREADY_ACTIVE (RASBASE+126)
-#define ERROR_ACCESSING_TCPCFGDLL (RASBASE+127)
#define ERROR_NO_IP_RAS_ADAPTER (RASBASE+128)
#define ERROR_SLIP_REQUIRES_IP (RASBASE+129)
-#define ERROR_PROJECTION_NOT_COMPLETE (RASBASE+130)
#define ERROR_PROTOCOL_NOT_CONFIGURED (RASBASE+131)
#define ERROR_PPP_NOT_CONVERGING (RASBASE+132)
#define ERROR_PPP_CP_REJECTED (RASBASE+133)
@@ -152,27 +114,13 @@
#define ERROR_TAPI_CONFIGURATION (RASBASE+140)
#define ERROR_NO_LOCAL_ENCRYPTION (RASBASE+141)
#define ERROR_NO_REMOTE_ENCRYPTION (RASBASE+142)
-#define ERROR_REMOTE_REQUIRES_ENCRYPTION (RASBASE+143)
-#define ERROR_IPXCP_NET_NUMBER_CONFLICT (RASBASE+144)
-#define ERROR_INVALID_SMM (RASBASE+145)
-#define ERROR_SMM_UNINITIALIZED (RASBASE+146)
-#define ERROR_NO_MAC_FOR_PORT (RASBASE+147)
-#define ERROR_SMM_TIMEOUT (RASBASE+148)
#define ERROR_BAD_PHONE_NUMBER (RASBASE+149)
-#define ERROR_WRONG_MODULE (RASBASE+150)
-#define ERROR_INVALID_CALLBACK_NUMBER (RASBASE+151)
#define ERROR_SCRIPT_SYNTAX (RASBASE+152)
#define ERROR_HANGUP_FAILED (RASBASE+153)
#define ERROR_BUNDLE_NOT_FOUND (RASBASE+154)
#define ERROR_CANNOT_DO_CUSTOMDIAL (RASBASE+155)
#define ERROR_DIAL_ALREADY_IN_PROGRESS (RASBASE+156)
#define ERROR_RASAUTO_CANNOT_INITIALIZE (RASBASE+157)
-#define ERROR_CONNECTION_ALREADY_SHARED (RASBASE+158)
-#define ERROR_SHARING_CHANGE_FAILED (RASBASE+159)
-#define ERROR_SHARING_ROUTER_INSTALL (RASBASE+160)
-#define ERROR_SHARE_CONNECTION_FAILED (RASBASE+161)
-#define ERROR_SHARING_PRIVATE_INSTALL (RASBASE+162)
-#define ERROR_CANNOT_SHARE_CONNECTION (RASBASE+163)
#define ERROR_NO_SMART_CARD_READER (RASBASE+164)
#define ERROR_SHARING_ADDRESS_EXISTS (RASBASE+165)
#define ERROR_NO_CERTIFICATE (RASBASE+166)
@@ -188,9 +136,7 @@
#define ERROR_DONOTDISTURB (RASBASE+176)
#define ERROR_OUTOFORDER (RASBASE+177)
#define ERROR_UNABLE_TO_AUTHENTICATE_SERVER (RASBASE+178)
-#define ERROR_SMART_CARD_REQUIRED (RASBASE+179)
#define ERROR_INVALID_FUNCTION_FOR_ENTRY (RASBASE+180)
-#define ERROR_CERT_FOR_ENCRYPTION_NOT_FOUND (RASBASE+181)
#define ERROR_SHARING_RRAS_CONFLICT (RASBASE+182)
#define ERROR_SHARING_NO_PRIVATE_LAN (RASBASE+183)
#define ERROR_NO_DIFF_USER_AT_LOGON (RASBASE+184)
@@ -215,6 +161,135 @@
#define ERROR_INVALID_PEAP_COOKIE_CONFIG (RASBASE+203)
#define ERROR_INVALID_PEAP_COOKIE_USER (RASBASE+204)
#define ERROR_INVALID_MSCHAPV2_CONFIG (RASBASE+205)
-#define RASBASEEND (RASBASE+205)
+#define ERROR_VPN_GRE_BLOCKED (RASBASE+206)
+#define ERROR_VPN_DISCONNECT (RASBASE+207)
+#define ERROR_VPN_REFUSED (RASBASE+208)
+#define ERROR_VPN_TIMEOUT (RASBASE+209)
+#define ERROR_VPN_BAD_CERT (RASBASE+210)
+#define ERROR_VPN_BAD_PSK (RASBASE+211)
+#define ERROR_SERVER_POLICY (RASBASE+212)
+#define ERROR_BROADBAND_ACTIVE (RASBASE+213)
+#define ERROR_BROADBAND_NO_NIC (RASBASE+214)
+#define ERROR_BROADBAND_TIMEOUT (RASBASE+215)
+#define ERROR_FEATURE_DEPRECATED (RASBASE+216)
+#define ERROR_CANNOT_DELETE (RASBASE+217)
+#define ERROR_PEAP_CRYPTOBINDING_INVALID (RASBASE+223)
+#define ERROR_PEAP_CRYPTOBINDING_NOTRECEIVED (RASBASE+224)
+#define ERROR_EAPTLS_CACHE_CREDENTIALS_INVALID (RASBASE+226)
+#define ERROR_IPSEC_SERVICE_STOPPED (RASBASE+227)
+#if WINVER < 0x600
+#define ERROR_CANNOT_SET_PORT_INFO (RASBASE+5)
+#define ERROR_EVENT_INVALID (RASBASE+7)
+#define ERROR_ROUTE_NOT_AVAILABLE (RASBASE+11)
+#define ERROR_INVALID_COMPRESSION_SPECIFIED (RASBASE+13)
+#define ERROR_OUT_OF_BUFFERS (RASBASE+14)
+#define ERROR_NO_ENDPOINTS (RASBASE+20)
+#define ERROR_CANNOT_LOAD_STRING (RASBASE+26)
+#define ERROR_CANNOT_PROJECT_CLIENT (RASBASE+34)
+#define ERROR_BAD_STRING (RASBASE+37)
+#define ERROR_CANNOT_GET_LANA (RASBASE+39)
+#define ERROR_NETBIOS_ERROR (RASBASE+40)
+#define ERROR_SERVER_OUT_OF_RESOURCES (RASBASE+41)
+#define ERROR_NAME_EXISTS_ON_NET (RASBASE+42)
+#define ERROR_SERVER_GENERAL_NET_FAILURE (RASBASE+43)
+#define WARNING_MSG_ALIAS_NOT_ADDED (RASBASE+44)
+#define ERROR_SERVER_NOT_RESPONDING (RASBASE+50)
+#define ERROR_READING_MAXCONNECTBPS (RASBASE+74)
+#define ERROR_READING_MAXCARRIERBPS (RASBASE+75)
+#define ERROR_IN_COMMAND (RASBASE+81)
+#define ERROR_WRITING_SECTIONNAME (RASBASE+82)
+#define ERROR_WRITING_DEVICETYPE (RASBASE+83)
+#define ERROR_WRITING_DEVICENAME (RASBASE+84)
+#define ERROR_WRITING_MAXCONNECTBPS (RASBASE+85)
+#define ERROR_WRITING_MAXCARRIERBPS (RASBASE+86)
+#define ERROR_WRITING_USAGE (RASBASE+87)
+#define ERROR_WRITING_DEFAULTOFF (RASBASE+88)
+#define ERROR_READING_DEFAULTOFF (RASBASE+89)
+#define ERROR_EMPTY_INI_FILE (RASBASE+90)
+#define ERROR_WRITING_INITBPS (RASBASE+106)
+#define ERROR_BIPLEX_PORT_NOT_AVAILABLE (RASBASE+112)
+#define ERROR_NO_ISDN_CHANNELS_AVAILABLE (RASBASE+114)
+#define ERROR_TOO_MANY_LINE_ERRORS (RASBASE+115)
+#define ERROR_PPP_REMOTE_TERMINATED (RASBASE+119)
+#define ERROR_IPXCP_NO_DIALOUT_CONFIGURED (RASBASE+124)
+#define ERROR_IPXCP_NO_DIALIN_CONFIGURED (RASBASE+125)
+#define ERROR_ACCESSING_TCPCFGDLL (RASBASE+127)
+#define ERROR_PROJECTION_NOT_COMPLETE (RASBASE+130)
+#define ERROR_REMOTE_REQUIRES_ENCRYPTION (RASBASE+143)
+#define ERROR_IPXCP_NET_NUMBER_CONFLICT (RASBASE+144)
+#define ERROR_INVALID_SMM (RASBASE+145)
+#define ERROR_SMM_UNINITIALIZED (RASBASE+146)
+#define ERROR_NO_MAC_FOR_PORT (RASBASE+147)
+#define ERROR_SMM_TIMEOUT (RASBASE+148)
+#define ERROR_WRONG_MODULE (RASBASE+150)
+#define ERROR_INVALID_CALLBACK_NUMBER (RASBASE+151)
+#define ERROR_CONNECTION_ALREADY_SHARED (RASBASE+158)
+#define ERROR_SHARING_CHANGE_FAILED (RASBASE+159)
+#define ERROR_SHARING_ROUTER_INSTALL (RASBASE+160)
+#define ERROR_SHARE_CONNECTION_FAILED (RASBASE+161)
+#define ERROR_SHARING_PRIVATE_INSTALL (RASBASE+162)
+#define ERROR_CANNOT_SHARE_CONNECTION (RASBASE+163)
+#define ERROR_SMART_CARD_REQUIRED (RASBASE+179)
+#define ERROR_CERT_FOR_ENCRYPTION_NOT_FOUND (RASBASE+181)
+#endif
+#if WINVER <= 0x600
+#define ERROR_RASQEC_RESOURCE_CREATION_FAILED (RASBASE+218)
+#define ERROR_RASQEC_NAPAGENT_NOT_ENABLED (RASBASE+219)
+#define ERROR_RASQEC_NAPAGENT_NOT_CONNECTED (RASBASE+220)
+#define ERROR_RASQEC_CONN_DOESNOTEXIST (RASBASE+221)
+#define ERROR_RASQEC_TIMEOUT (RASBASE+222)
+#endif
+#if WINVER >= 0x600
+#define ERROR_INVALID_VPNSTRATEGY (RASBASE+225)
+#define ERROR_IDLE_TIMEOUT (RASBASE+228)
+#define ERROR_LINK_FAILURE (RASBASE+229)
+#define ERROR_USER_LOGOFF (RASBASE+230)
+#define ERROR_FAST_USER_SWITCH (RASBASE+231)
+#define ERROR_HIBERNATION (RASBASE+232)
+#define ERROR_SYSTEM_SUSPENDED (RASBASE+233)
+#define ERROR_RASMAN_SERVICE_STOPPED (RASBASE+234)
+#define ERROR_INVALID_SERVER_CERT (RASBASE+235)
+#define ERROR_NOT_NAP_CAPABLE (RASBASE+236)
+#endif
+#if WINVER >= 0x601
+#define ERROR_INVALID_TUNNELID (RASBASE+237)
+#define ERROR_UPDATECONNECTION_REQUEST_IN_PROCESS (RASBASE+238)
+#define ERROR_PROTOCOL_ENGINE_DISABLED (RASBASE+239)
+#define ERROR_INTERNAL_ADDRESS_FAILURE (RASBASE+240)
+#define ERROR_FAILED_CP_REQUIRED (RASBASE+241)
+#define ERROR_TS_UNACCEPTABLE (RASBASE+242)
+#define ERROR_MOBIKE_DISABLED (RASBASE+243)
+#define ERROR_CANNOT_INITIATE_MOBIKE_UPDATE (RASBASE+244)
+#define ERROR_PEAP_SERVER_REJECTED_CLIENT_TLV (RASBASE+245)
+#define ERROR_INVALID_PREFERENCES (RASBASE+246)
+#define ERROR_EAPTLS_SCARD_CACHE_CREDENTIALS_INVALID (RASBASE+247)
+#define ERROR_SSTP_COOKIE_SET_FAILURE (RASBASE + 248)
+#define ERROR_INVALID_PEAP_COOKIE_ATTRIBUTES (RASBASE+249)
+#define ERROR_EAP_METHOD_NOT_INSTALLED (RASBASE+250)
+#define ERROR_EAP_METHOD_DOES_NOT_SUPPORT_SSO (RASBASE+251)
+#define ERROR_EAP_METHOD_OPERATION_NOT_SUPPORTED (RASBASE+252)
+#define ERROR_EAP_USER_CERT_INVALID (RASBASE+253)
+#define ERROR_EAP_USER_CERT_EXPIRED (RASBASE+254)
+#define ERROR_EAP_USER_CERT_REVOKED (RASBASE+255)
+#define ERROR_EAP_USER_CERT_OTHER_ERROR (RASBASE+256)
+#define ERROR_EAP_SERVER_CERT_INVALID (RASBASE+257)
+#define ERROR_EAP_SERVER_CERT_EXPIRED (RASBASE+258)
+#define ERROR_EAP_SERVER_CERT_REVOKED (RASBASE+259)
+#define ERROR_EAP_SERVER_CERT_OTHER_ERROR (RASBASE+260)
+#define ERROR_EAP_USER_ROOT_CERT_NOT_FOUND (RASBASE+261)
+#define ERROR_EAP_USER_ROOT_CERT_INVALID (RASBASE+262)
+#define ERROR_EAP_USER_ROOT_CERT_EXPIRED (RASBASE+263)
+#define ERROR_EAP_SERVER_ROOT_CERT_NOT_FOUND (RASBASE+264)
+#define ERROR_EAP_SERVER_ROOT_CERT_INVALID (RASBASE+265)
+#define ERROR_EAP_SERVER_ROOT_CERT_NAME_REQUIRED (RASBASE+266)
+#define ERROR_PEAP_IDENTITY_MISMATCH (RASBASE+267)
+#define ERROR_DNSNAME_NOT_RESOLVABLE (RASBASE+268)
+#define ERROR_EAPTLS_PASSWD_INVALID (RASBASE+269)
+#define ERROR_IKEV2_PSK_INTERFACE_ALREADY_EXISTS (RASBASE+270)
+#endif
+
+#define RASBASEEND (RASBASE+270)
+
+#endif
#endif
--
1.7.9
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
