From f4cd2e311d9098fcca223f39d00c96ec5d62a7cd Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Tue, 30 Dec 2014 16:38:18 -0800 Subject: [PATCH 1/5] added missing inet_pton() for windows phone --- cocos/platform/winrt/inet_pton_winrt.cpp | 234 +++++++++++++++++++++++ cocos/platform/winrt/inet_pton_winrt.h | 32 ++++ 2 files changed, 266 insertions(+) create mode 100644 cocos/platform/winrt/inet_pton_winrt.cpp create mode 100644 cocos/platform/winrt/inet_pton_winrt.h diff --git a/cocos/platform/winrt/inet_pton_winrt.cpp b/cocos/platform/winrt/inet_pton_winrt.cpp new file mode 100644 index 0000000000..f906b52d0c --- /dev/null +++ b/cocos/platform/winrt/inet_pton_winrt.cpp @@ -0,0 +1,234 @@ +/* This is from the BIND 4.9.4 release, modified to compile by itself */ + +/* Copyright (c) 1996 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +/* Portions Copyright (c) Microsoft Open Technologies, Inc. */ + +/*modifications by Microsoft Open Technologies, Inc. to implement missing inet_pton() from Windows 8 SDK */ + +#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) + +#include +#include + +#define ERRNO ((int)GetLastError()) +#define SET_ERRNO(x) (SetLastError((DWORD)(x))) + +#include "inet_pton_winrt.h" + +#define ENABLE_IPV6 + +#define IN6ADDRSZ 16 +#define INADDRSZ 4 +#define INT16SZ 2 + +/* + * WARNING: Don't even consider trying to compile this on a system where + * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. + */ + +static int inet_pton4(const char *src, unsigned char *dst); +#ifdef ENABLE_IPV6 +static int inet_pton6(const char *src, unsigned char *dst); +#endif + +/* int + * inet_pton(af, src, dst) + * convert from presentation format (which usually means ASCII printable) + * to network format (which is usually some kind of binary format). + * return: + * 1 if the address was valid for the specified address family + * 0 if the address wasn't valid (`dst' is untouched in this case) + * -1 if some other error occurred (`dst' is untouched in this case, too) + * notice: + * On Windows we store the error in the thread errno, not + * in the winsock error code. This is to avoid losing the + * actual last winsock error. So use macro ERRNO to fetch the + * errno this function sets when returning (-1), not SOCKERRNO. + * author: + * Paul Vixie, 1996. + */ + +int inet_pton(int af, const char *src, void *dst) +{ + switch (af) { + case AF_INET: + return (inet_pton4(src, (unsigned char *)dst)); +#ifdef ENABLE_IPV6 + case AF_INET6: + return (inet_pton6(src, (unsigned char *)dst)); +#endif + default: + SET_ERRNO(EAFNOSUPPORT); + return (-1); + } + /* NOTREACHED */ +} + +/* int + * inet_pton4(src, dst) + * like inet_aton() but without all the hexadecimal and shorthand. + * return: + * 1 if `src' is a valid dotted quad, else 0. + * notice: + * does not touch `dst' unless it's returning 1. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton4(const char *src, unsigned char *dst) +{ + static const char digits[] = "0123456789"; + int saw_digit, octets, ch; + unsigned char tmp[INADDRSZ], *tp; + + saw_digit = 0; + octets = 0; + tp = tmp; + *tp = 0; + while((ch = *src++) != '\0') { + const char *pch; + + if((pch = strchr(digits, ch)) != NULL) { + unsigned int val = *tp * 10 + (unsigned int)(pch - digits); + + if(saw_digit && *tp == 0) + return (0); + if(val > 255) + return (0); + *tp = (unsigned char)val; + if(! saw_digit) { + if(++octets > 4) + return (0); + saw_digit = 1; + } + } + else if(ch == '.' && saw_digit) { + if(octets == 4) + return (0); + *++tp = 0; + saw_digit = 0; + } + else + return (0); + } + if(octets < 4) + return (0); + memcpy(dst, tmp, INADDRSZ); + return (1); +} + +#ifdef ENABLE_IPV6 +/* int + * inet_pton6(src, dst) + * convert presentation level address to network order binary form. + * return: + * 1 if `src' is a valid [RFC1884 2.2] address, else 0. + * notice: + * (1) does not touch `dst' unless it's returning 1. + * (2) :: in a full address is silently ignored. + * credit: + * inspired by Mark Andrews. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton6(const char *src, unsigned char *dst) +{ + static const char xdigits_l[] = "0123456789abcdef", + xdigits_u[] = "0123456789ABCDEF"; + unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp; + const char *xdigits, *curtok; + int ch, saw_xdigit; + size_t val; + + memset((tp = tmp), 0, IN6ADDRSZ); + endp = tp + IN6ADDRSZ; + colonp = NULL; + /* Leading :: requires some special handling. */ + if(*src == ':') + if(*++src != ':') + return (0); + curtok = src; + saw_xdigit = 0; + val = 0; + while((ch = *src++) != '\0') { + const char *pch; + + if((pch = strchr((xdigits = xdigits_l), ch)) == NULL) + pch = strchr((xdigits = xdigits_u), ch); + if(pch != NULL) { + val <<= 4; + val |= (pch - xdigits); + if(++saw_xdigit > 4) + return (0); + continue; + } + if(ch == ':') { + curtok = src; + if(!saw_xdigit) { + if(colonp) + return (0); + colonp = tp; + continue; + } + if(tp + INT16SZ > endp) + return (0); + *tp++ = (unsigned char) (val >> 8) & 0xff; + *tp++ = (unsigned char) val & 0xff; + saw_xdigit = 0; + val = 0; + continue; + } + if(ch == '.' && ((tp + INADDRSZ) <= endp) && + inet_pton4(curtok, tp) > 0) { + tp += INADDRSZ; + saw_xdigit = 0; + break; /* '\0' was seen by inet_pton4(). */ + } + return (0); + } + if(saw_xdigit) { + if(tp + INT16SZ > endp) + return (0); + *tp++ = (unsigned char) (val >> 8) & 0xff; + *tp++ = (unsigned char) val & 0xff; + } + if(colonp != NULL) { + /* + * Since some memmove()'s erroneously fail to handle + * overlapping regions, we'll do the shift by hand. + */ + const ssize_t n = tp - colonp; + ssize_t i; + + if(tp == endp) + return (0); + for(i = 1; i <= n; i++) { + *(endp - i) = *(colonp + n - i); + *(colonp + n - i) = 0; + } + tp = endp; + } + if(tp != endp) + return (0); + memcpy(dst, tmp, IN6ADDRSZ); + return (1); +} +#endif /* ENABLE_IPV6 */ + +#endif /* HAVE_INET_PTON */ diff --git a/cocos/platform/winrt/inet_pton_winrt.h b/cocos/platform/winrt/inet_pton_winrt.h new file mode 100644 index 0000000000..15a0110b99 --- /dev/null +++ b/cocos/platform/winrt/inet_pton_winrt.h @@ -0,0 +1,32 @@ +#ifndef HEADER_CURL_INET_PTON_WINIRT_H +#define HEADER_CURL_INET_PTON_WINIRT_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * Portions Copyright (c) Microsoft Open Technologies, Inc. + * + ***************************************************************************/ + +#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +int inet_pton(int af, const char *src, void *dst); +#endif + +#endif /* HEADER_CURL_INET_PTON_WINIRT_H */ + From d33fad0ac7cde8ba41163d18d12748777a769b8e Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Tue, 30 Dec 2014 16:39:02 -0800 Subject: [PATCH 2/5] fixed check for header already included --- cocos/platform/winrt/inet_ntop_winrt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/platform/winrt/inet_ntop_winrt.h b/cocos/platform/winrt/inet_ntop_winrt.h index 43ccf25fa9..9b3d42c938 100644 --- a/cocos/platform/winrt/inet_ntop_winrt.h +++ b/cocos/platform/winrt/inet_ntop_winrt.h @@ -1,5 +1,5 @@ -#ifndef HEADER_CURL_INET_NTOP_H -#define HEADER_CURL_INET_NTOP_H +#ifndef HEADER_CURL_INET_NTOP_WINRT_H +#define HEADER_CURL_INET_NTOP_WINRT_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | From 57f0ef41b4ee5f48a18a704ce423011201727df8 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Tue, 30 Dec 2014 16:39:26 -0800 Subject: [PATCH 3/5] added missing inet_pton() for windows phone --- cocos/base/CCConsole.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 96e87a9bc5..bab98e4668 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -42,6 +42,7 @@ #define bzero(a, b) memset(a, 0, b); #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include "inet_ntop_winrt.h" +#include "inet_pton_winrt.h" #include "CCWinRTUtils.h" #endif #else From bd1fef751566c86395425298647b486924df1328 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Tue, 30 Dec 2014 16:40:04 -0800 Subject: [PATCH 4/5] added missing files --- .../libcocos2d_8_1.Shared.vcxitems | 7 +++++++ .../libcocos2d_8_1.Shared.vcxitems.filters | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems index cae4aaa780..1ecd22703a 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems @@ -70,11 +70,13 @@ + + @@ -312,6 +314,7 @@ + @@ -489,11 +492,13 @@ + + @@ -702,6 +707,7 @@ + @@ -834,6 +840,7 @@ + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters index a9af557ee8..952f32bc42 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters @@ -1273,6 +1273,15 @@ cocostudio\TimelineAction + + 3d + + + 3d + + + platform\winrt + @@ -2357,6 +2366,15 @@ cocostudio\TimelineAction + + 3d + + + 3d + + + platform\winrt + @@ -2707,5 +2725,8 @@ ui\shaders + + 3d + \ No newline at end of file From f73a07c7b962b4f3b93b0dd4de61e932c8869726 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Tue, 30 Dec 2014 17:27:37 -0800 Subject: [PATCH 5/5] added missing files --- cocos/2d/libcocos2d_wp8.vcxproj | 8 ++++++++ cocos/2d/libcocos2d_wp8.vcxproj.filters | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/cocos/2d/libcocos2d_wp8.vcxproj b/cocos/2d/libcocos2d_wp8.vcxproj index 8c8a13314e..8ac8de6188 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj +++ b/cocos/2d/libcocos2d_wp8.vcxproj @@ -224,15 +224,18 @@ + + + @@ -458,6 +461,7 @@ + @@ -664,11 +668,13 @@ + + @@ -920,6 +926,7 @@ + Create @@ -1061,6 +1068,7 @@ + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj.filters b/cocos/2d/libcocos2d_wp8.vcxproj.filters index 33db59e010..b0702d9063 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj.filters +++ b/cocos/2d/libcocos2d_wp8.vcxproj.filters @@ -1326,6 +1326,15 @@ cocostudio\TimelineAction + + 3d + + + 3d + + + platform\winrt + @@ -2571,6 +2580,18 @@ cocostudio\TimelineAction + + 3d + + + 3d + + + 3d + + + platform\winrt + @@ -2663,5 +2684,8 @@ ui\shaders + + 3d + \ No newline at end of file