diff --git a/dep/lib/Win32/libeay32.dll b/dep/lib/Win32/libeay32.dll new file mode 100644 index 000000000..85538d4cf Binary files /dev/null and b/dep/lib/Win32/libeay32.dll differ diff --git a/dep/lib/Win32/libeay32.lib b/dep/lib/Win32/libeay32.lib new file mode 100644 index 000000000..fa324242d Binary files /dev/null and b/dep/lib/Win32/libeay32.lib differ diff --git a/dep/lib/Win32/libmysql.dll b/dep/lib/Win32/libmysql.dll new file mode 100644 index 000000000..d197ad11f Binary files /dev/null and b/dep/lib/Win32/libmysql.dll differ diff --git a/dep/lib/Win32/libmysql.lib b/dep/lib/Win32/libmysql.lib new file mode 100644 index 000000000..1cce3a2cd Binary files /dev/null and b/dep/lib/Win32/libmysql.lib differ diff --git a/dep/lib/Win32/license.txt b/dep/lib/Win32/license.txt new file mode 100644 index 000000000..e47d101f1 --- /dev/null +++ b/dep/lib/Win32/license.txt @@ -0,0 +1,127 @@ + + LICENSE ISSUES + ============== + + The OpenSSL toolkit stays under a dual license, i.e. both the conditions of + the OpenSSL License and the original SSLeay license apply to the toolkit. + See below for the actual license texts. Actually both licenses are BSD-style + Open Source licenses. In case of any license issues related to OpenSSL + please contact openssl-core@openssl.org. + + OpenSSL License + --------------- + +/* ==================================================================== + * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + + Original SSLeay License + ----------------------- + +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay@cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay@cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + diff --git a/dep/lib/Win32/mysqlclient.lib b/dep/lib/Win32/mysqlclient.lib new file mode 100644 index 000000000..3817683fb Binary files /dev/null and b/dep/lib/Win32/mysqlclient.lib differ diff --git a/dep/lib/Win32/news.txt b/dep/lib/Win32/news.txt new file mode 100644 index 000000000..0269f2277 --- /dev/null +++ b/dep/lib/Win32/news.txt @@ -0,0 +1,656 @@ + + NEWS + ==== + + This file gives a brief overview of the major changes between each OpenSSL + release. For more details please read the CHANGES file. + + Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e: + + o Corrected fix for CVE-2013-0169 + + Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d: + + o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version. + o Include the fips configuration module. + o Fix OCSP bad key DoS attack CVE-2013-0166 + o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169 + o Fix for TLS AESNI record handling flaw CVE-2012-2686 + + Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c: + + o Fix TLS/DTLS record length checking bug CVE-2012-2333 + o Don't attempt to use non-FIPS composite ciphers in FIPS mode. + + Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b: + + o Fix compilation error on non-x86 platforms. + o Make FIPS capable OpenSSL ciphers work in non-FIPS mode. + o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0 + + Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a: + + o Fix for ASN1 overflow bug CVE-2012-2110 + o Workarounds for some servers that hang on long client hellos. + o Fix SEGV in AES code. + + Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1: + + o TLS/DTLS heartbeat support. + o SCTP support. + o RFC 5705 TLS key material exporter. + o RFC 5764 DTLS-SRTP negotiation. + o Next Protocol Negotiation. + o PSS signatures in certificates, requests and CRLs. + o Support for password based recipient info for CMS. + o Support TLS v1.2 and TLS v1.1. + o Preliminary FIPS capability for unvalidated 2.0 FIPS module. + o SRP support. + + Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h: + + o Fix for CMS/PKCS#7 MMA CVE-2012-0884 + o Corrected fix for CVE-2011-4619 + o Various DTLS fixes. + + Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g: + + o Fix for DTLS DoS issue CVE-2012-0050 + + Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f: + + o Fix for DTLS plaintext recovery attack CVE-2011-4108 + o Clear block padding bytes of SSL 3.0 records CVE-2011-4576 + o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619 + o Check parameters are not NULL in GOST ENGINE CVE-2012-0027 + o Check for malformed RFC3779 data CVE-2011-4577 + + Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e: + + o Fix for CRL vulnerability issue CVE-2011-3207 + o Fix for ECDH crashes CVE-2011-3210 + o Protection against EC timing attacks. + o Support ECDH ciphersuites for certificates using SHA2 algorithms. + o Various DTLS fixes. + + Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d: + + o Fix for security issue CVE-2011-0014 + + Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c: + + o Fix for security issue CVE-2010-4180 + o Fix for CVE-2010-4252 + o Fix mishandling of absent EC point format extension. + o Fix various platform compilation issues. + o Corrected fix for security issue CVE-2010-3864. + + Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b: + + o Fix for security issue CVE-2010-3864. + o Fix for CVE-2010-2939 + o Fix WIN32 build system for GOST ENGINE. + + Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a: + + o Fix for security issue CVE-2010-1633. + o GOST MAC and CFB fixes. + + Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0: + + o RFC3280 path validation: sufficient to process PKITS tests. + o Integrated support for PVK files and keyblobs. + o Change default private key format to PKCS#8. + o CMS support: able to process all examples in RFC4134 + o Streaming ASN1 encode support for PKCS#7 and CMS. + o Multiple signer and signer add support for PKCS#7 and CMS. + o ASN1 printing support. + o Whirlpool hash algorithm added. + o RFC3161 time stamp support. + o New generalised public key API supporting ENGINE based algorithms. + o New generalised public key API utilities. + o New ENGINE supporting GOST algorithms. + o SSL/TLS GOST ciphersuite support. + o PKCS#7 and CMS GOST support. + o RFC4279 PSK ciphersuite support. + o Supported points format extension for ECC ciphersuites. + o ecdsa-with-SHA224/256/384/512 signature types. + o dsa-with-SHA224 and dsa-with-SHA256 signature types. + o Opaque PRF Input TLS extension support. + o Updated time routines to avoid OS limitations. + + Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r: + + o Fix for security issue CVE-2011-0014 + + Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q: + + o Fix for security issue CVE-2010-4180 + o Fix for CVE-2010-4252 + + Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p: + + o Fix for security issue CVE-2010-3864. + + Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o: + + o Fix for security issue CVE-2010-0742. + o Various DTLS fixes. + o Recognise SHA2 certificates if only SSL algorithms added. + o Fix for no-rc4 compilation. + o Chil ENGINE unload workaround. + + Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n: + + o CFB cipher definition fixes. + o Fix security issues CVE-2010-0740 and CVE-2010-0433. + + Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m: + + o Cipher definition fixes. + o Workaround for slow RAND_poll() on some WIN32 versions. + o Remove MD2 from algorithm tables. + o SPKAC handling fixes. + o Support for RFC5746 TLS renegotiation extension. + o Compression memory leak fixed. + o Compression session resumption fixed. + o Ticket and SNI coexistence fixes. + o Many fixes to DTLS handling. + + Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l: + + o Temporary work around for CVE-2009-3555: disable renegotiation. + + Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k: + + o Fix various build issues. + o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789) + + Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j: + + o Fix security issue (CVE-2008-5077) + o Merge FIPS 140-2 branch code. + + Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h: + + o CryptoAPI ENGINE support. + o Various precautionary measures. + o Fix for bugs affecting certificate request creation. + o Support for local machine keyset attribute in PKCS#12 files. + + Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g: + + o Backport of CMS functionality to 0.9.8. + o Fixes for bugs introduced with 0.9.8f. + + Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f: + + o Add gcc 4.2 support. + o Add support for AES and SSE2 assembly lanugauge optimization + for VC++ build. + o Support for RFC4507bis and server name extensions if explicitly + selected at compile time. + o DTLS improvements. + o RFC4507bis support. + o TLS Extensions support. + + Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e: + + o Various ciphersuite selection fixes. + o RFC3779 support. + + Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d: + + o Introduce limits to prevent malicious key DoS (CVE-2006-2940) + o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343) + o Changes to ciphersuite selection algorithm + + Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c: + + o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339 + o New cipher Camellia + + Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b: + + o Cipher string fixes. + o Fixes for VC++ 2005. + o Updated ECC cipher suite support. + o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free(). + o Zlib compression usage fixes. + o Built in dynamic engine compilation support on Win32. + o Fixes auto dynamic engine loading in Win32. + + Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a: + + o Fix potential SSL 2.0 rollback, CVE-2005-2969 + o Extended Windows CE support + + Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8: + + o Major work on the BIGNUM library for higher efficiency and to + make operations more streamlined and less contradictory. This + is the result of a major audit of the BIGNUM library. + o Addition of BIGNUM functions for fields GF(2^m) and NIST + curves, to support the Elliptic Crypto functions. + o Major work on Elliptic Crypto; ECDH and ECDSA added, including + the use through EVP, X509 and ENGINE. + o New ASN.1 mini-compiler that's usable through the OpenSSL + configuration file. + o Added support for ASN.1 indefinite length constructed encoding. + o New PKCS#12 'medium level' API to manipulate PKCS#12 files. + o Complete rework of shared library construction and linking + programs with shared or static libraries, through a separate + Makefile.shared. + o Rework of the passing of parameters from one Makefile to another. + o Changed ENGINE framework to load dynamic engine modules + automatically from specifically given directories. + o New structure and ASN.1 functions for CertificatePair. + o Changed the ZLIB compression method to be stateful. + o Changed the key-generation and primality testing "progress" + mechanism to take a structure that contains the ticker + function and an argument. + o New engine module: GMP (performs private key exponentiation). + o New engine module: VIA PadLOck ACE extension in VIA C3 + Nehemiah processors. + o Added support for IPv6 addresses in certificate extensions. + See RFC 1884, section 2.2. + o Added support for certificate policy mappings, policy + constraints and name constraints. + o Added support for multi-valued AVAs in the OpenSSL + configuration file. + o Added support for multiple certificates with the same subject + in the 'openssl ca' index file. + o Make it possible to create self-signed certificates using + 'openssl ca -selfsign'. + o Make it possible to generate a serial number file with + 'openssl ca -create_serial'. + o New binary search functions with extended functionality. + o New BUF functions. + o New STORE structure and library to provide an interface to all + sorts of data repositories. Supports storage of public and + private keys, certificates, CRLs, numbers and arbitrary blobs. + This library is unfortunately unfinished and unused withing + OpenSSL. + o New control functions for the error stack. + o Changed the PKCS#7 library to support one-pass S/MIME + processing. + o Added the possibility to compile without old deprecated + functionality with the OPENSSL_NO_DEPRECATED macro or the + 'no-deprecated' argument to the config and Configure scripts. + o Constification of all ASN.1 conversion functions, and other + affected functions. + o Improved platform support for PowerPC. + o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512). + o New X509_VERIFY_PARAM structure to support parametrisation + of X.509 path validation. + o Major overhaul of RC4 performance on Intel P4, IA-64 and + AMD64. + o Changed the Configure script to have some algorithms disabled + by default. Those can be explicitely enabled with the new + argument form 'enable-xxx'. + o Change the default digest in 'openssl' commands from MD5 to + SHA-1. + o Added support for DTLS. + o New BIGNUM blinding. + o Added support for the RSA-PSS encryption scheme + o Added support for the RSA X.931 padding. + o Added support for BSD sockets on NetWare. + o Added support for files larger than 2GB. + o Added initial support for Win64. + o Added alternate pkg-config files. + + Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m: + + o FIPS 1.1.1 module linking. + o Various ciphersuite selection fixes. + + Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l: + + o Introduce limits to prevent malicious key DoS (CVE-2006-2940) + o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343) + + Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k: + + o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339 + + Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j: + + o Visual C++ 2005 fixes. + o Update Windows build system for FIPS. + + Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i: + + o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build. + + Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h: + + o Fix SSL 2.0 Rollback, CVE-2005-2969 + o Allow use of fixed-length exponent on DSA signing + o Default fixed-window RSA, DSA, DH private-key operations + + Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g: + + o More compilation issues fixed. + o Adaptation to more modern Kerberos API. + o Enhanced or corrected configuration for Solaris64, Mingw and Cygwin. + o Enhanced x86_64 assembler BIGNUM module. + o More constification. + o Added processing of proxy certificates (RFC 3820). + + Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f: + + o Several compilation issues fixed. + o Many memory allocation failure checks added. + o Improved comparison of X509 Name type. + o Mandatory basic checks on certificates. + o Performance improvements. + + Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e: + + o Fix race condition in CRL checking code. + o Fixes to PKCS#7 (S/MIME) code. + + Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d: + + o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug + o Security: Fix null-pointer assignment in do_change_cipher_spec() + o Allow multiple active certificates with same subject in CA index + o Multiple X509 verification fixes + o Speed up HMAC and other operations + + Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c: + + o Security: fix various ASN1 parsing bugs. + o New -ignore_err option to OCSP utility. + o Various interop and bug fixes in S/MIME code. + o SSL/TLS protocol fix for unrequested client certificates. + + Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b: + + o Security: counter the Klima-Pokorny-Rosa extension of + Bleichbacher's attack + o Security: make RSA blinding default. + o Configuration: Irix fixes, AIX fixes, better mingw support. + o Support for new platforms: linux-ia64-ecc. + o Build: shared library support fixes. + o ASN.1: treat domainComponent correctly. + o Documentation: fixes and additions. + + Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a: + + o Security: Important security related bugfixes. + o Enhanced compatibility with MIT Kerberos. + o Can be built without the ENGINE framework. + o IA32 assembler enhancements. + o Support for new platforms: FreeBSD/IA64 and FreeBSD/Sparc64. + o Configuration: the no-err option now works properly. + o SSL/TLS: now handles manual certificate chain building. + o SSL/TLS: certain session ID malfunctions corrected. + + Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7: + + o New library section OCSP. + o Complete rewrite of ASN1 code. + o CRL checking in verify code and openssl utility. + o Extension copying in 'ca' utility. + o Flexible display options in 'ca' utility. + o Provisional support for international characters with UTF8. + o Support for external crypto devices ('engine') is no longer + a separate distribution. + o New elliptic curve library section. + o New AES (Rijndael) library section. + o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit, + Linux x86_64, Linux 64-bit on Sparc v9 + o Extended support for some platforms: VxWorks + o Enhanced support for shared libraries. + o Now only builds PIC code when shared library support is requested. + o Support for pkg-config. + o Lots of new manuals. + o Makes symbolic links to or copies of manuals to cover all described + functions. + o Change DES API to clean up the namespace (some applications link also + against libdes providing similar functions having the same name). + Provide macros for backward compatibility (will be removed in the + future). + o Unify handling of cryptographic algorithms (software and engine) + to be available via EVP routines for asymmetric and symmetric ciphers. + o NCONF: new configuration handling routines. + o Change API to use more 'const' modifiers to improve error checking + and help optimizers. + o Finally remove references to RSAref. + o Reworked parts of the BIGNUM code. + o Support for new engines: Broadcom ubsec, Accelerated Encryption + Processing, IBM 4758. + o A few new engines added in the demos area. + o Extended and corrected OID (object identifier) table. + o PRNG: query at more locations for a random device, automatic query for + EGD style random sources at several locations. + o SSL/TLS: allow optional cipher choice according to server's preference. + o SSL/TLS: allow server to explicitly set new session ids. + o SSL/TLS: support Kerberos cipher suites (RFC2712). + Only supports MIT Kerberos for now. + o SSL/TLS: allow more precise control of renegotiations and sessions. + o SSL/TLS: add callback to retrieve SSL/TLS messages. + o SSL/TLS: support AES cipher suites (RFC3268). + + Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k: + + o Security: fix various ASN1 parsing bugs. + o SSL/TLS protocol fix for unrequested client certificates. + + Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j: + + o Security: counter the Klima-Pokorny-Rosa extension of + Bleichbacher's attack + o Security: make RSA blinding default. + o Build: shared library support fixes. + + Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i: + + o Important security related bugfixes. + + Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h: + + o New configuration targets for Tandem OSS and A/UX. + o New OIDs for Microsoft attributes. + o Better handling of SSL session caching. + o Better comparison of distinguished names. + o Better handling of shared libraries in a mixed GNU/non-GNU environment. + o Support assembler code with Borland C. + o Fixes for length problems. + o Fixes for uninitialised variables. + o Fixes for memory leaks, some unusual crashes and some race conditions. + o Fixes for smaller building problems. + o Updates of manuals, FAQ and other instructive documents. + + Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g: + + o Important building fixes on Unix. + + Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f: + + o Various important bugfixes. + + Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e: + + o Important security related bugfixes. + o Various SSL/TLS library bugfixes. + + Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d: + + o Various SSL/TLS library bugfixes. + o Fix DH parameter generation for 'non-standard' generators. + + Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c: + + o Various SSL/TLS library bugfixes. + o BIGNUM library fixes. + o RSA OAEP and random number generation fixes. + o Object identifiers corrected and added. + o Add assembler BN routines for IA64. + o Add support for OS/390 Unix, UnixWare with gcc, OpenUNIX 8, + MIPS Linux; shared library support for Irix, HP-UX. + o Add crypto accelerator support for AEP, Baltimore SureWare, + Broadcom and Cryptographic Appliance's keyserver + [in 0.9.6c-engine release]. + + Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b: + + o Security fix: PRNG improvements. + o Security fix: RSA OAEP check. + o Security fix: Reinsert and fix countermeasure to Bleichbacher's + attack. + o MIPS bug fix in BIGNUM. + o Bug fix in "openssl enc". + o Bug fix in X.509 printing routine. + o Bug fix in DSA verification routine and DSA S/MIME verification. + o Bug fix to make PRNG thread-safe. + o Bug fix in RAND_file_name(). + o Bug fix in compatibility mode trust settings. + o Bug fix in blowfish EVP. + o Increase default size for BIO buffering filter. + o Compatibility fixes in some scripts. + + Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a: + + o Security fix: change behavior of OpenSSL to avoid using + environment variables when running as root. + o Security fix: check the result of RSA-CRT to reduce the + possibility of deducing the private key from an incorrectly + calculated signature. + o Security fix: prevent Bleichenbacher's DSA attack. + o Security fix: Zero the premaster secret after deriving the + master secret in DH ciphersuites. + o Reimplement SSL_peek(), which had various problems. + o Compatibility fix: the function des_encrypt() renamed to + des_encrypt1() to avoid clashes with some Unixen libc. + o Bug fixes for Win32, HP/UX and Irix. + o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and + memory checking routines. + o Bug fixes for RSA operations in threaded environments. + o Bug fixes in misc. openssl applications. + o Remove a few potential memory leaks. + o Add tighter checks of BIGNUM routines. + o Shared library support has been reworked for generality. + o More documentation. + o New function BN_rand_range(). + o Add "-rand" option to openssl s_client and s_server. + + Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6: + + o Some documentation for BIO and SSL libraries. + o Enhanced chain verification using key identifiers. + o New sign and verify options to 'dgst' application. + o Support for DER and PEM encoded messages in 'smime' application. + o New 'rsautl' application, low level RSA utility. + o MD4 now included. + o Bugfix for SSL rollback padding check. + o Support for external crypto devices [1]. + o Enhanced EVP interface. + + [1] The support for external crypto devices is currently a separate + distribution. See the file README.ENGINE. + + Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a: + + o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 + o Shared library support for HPUX and Solaris-gcc + o Support of Linux/IA64 + o Assembler support for Mingw32 + o New 'rand' application + o New way to check for existence of algorithms from scripts + + Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5: + + o S/MIME support in new 'smime' command + o Documentation for the OpenSSL command line application + o Automation of 'req' application + o Fixes to make s_client, s_server work under Windows + o Support for multiple fieldnames in SPKACs + o New SPKAC command line utilty and associated library functions + o Options to allow passwords to be obtained from various sources + o New public key PEM format and options to handle it + o Many other fixes and enhancements to command line utilities + o Usable certificate chain verification + o Certificate purpose checking + o Certificate trust settings + o Support of authority information access extension + o Extensions in certificate requests + o Simplified X509 name and attribute routines + o Initial (incomplete) support for international character sets + o New DH_METHOD, DSA_METHOD and enhanced RSA_METHOD + o Read only memory BIOs and simplified creation function + o TLS/SSL protocol bugfixes: Accept TLS 'client hello' in SSL 3.0 + record; allow fragmentation and interleaving of handshake and other + data + o TLS/SSL code now "tolerates" MS SGC + o Work around for Netscape client certificate hang bug + o RSA_NULL option that removes RSA patent code but keeps other + RSA functionality + o Memory leak detection now allows applications to add extra information + via a per-thread stack + o PRNG robustness improved + o EGD support + o BIGNUM library bug fixes + o Faster DSA parameter generation + o Enhanced support for Alpha Linux + o Experimental MacOS support + + Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4: + + o Transparent support for PKCS#8 format private keys: these are used + by several software packages and are more secure than the standard + form + o PKCS#5 v2.0 implementation + o Password callbacks have a new void * argument for application data + o Avoid various memory leaks + o New pipe-like BIO that allows using the SSL library when actual I/O + must be handled by the application (BIO pair) + + Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3: + o Lots of enhancements and cleanups to the Configuration mechanism + o RSA OEAP related fixes + o Added `openssl ca -revoke' option for revoking a certificate + o Source cleanups: const correctness, type-safe stacks and ASN.1 SETs + o Source tree cleanups: removed lots of obsolete files + o Thawte SXNet, certificate policies and CRL distribution points + extension support + o Preliminary (experimental) S/MIME support + o Support for ASN.1 UTF8String and VisibleString + o Full integration of PKCS#12 code + o Sparc assembler bignum implementation, optimized hash functions + o Option to disable selected ciphers + + Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b: + o Fixed a security hole related to session resumption + o Fixed RSA encryption routines for the p < q case + o "ALL" in cipher lists now means "everything except NULL ciphers" + o Support for Triple-DES CBCM cipher + o Support of Optimal Asymmetric Encryption Padding (OAEP) for RSA + o First support for new TLSv1 ciphers + o Added a few new BIOs (syslog BIO, reliable BIO) + o Extended support for DSA certificate/keys. + o Extended support for Certificate Signing Requests (CSR) + o Initial support for X.509v3 extensions + o Extended support for compression inside the SSL record layer + o Overhauled Win32 builds + o Cleanups and fixes to the Big Number (BN) library + o Support for ASN.1 GeneralizedTime + o Splitted ASN.1 SETs from SEQUENCEs + o ASN1 and PEM support for Netscape Certificate Sequences + o Overhauled Perl interface + o Lots of source tree cleanups. + o Lots of memory leak fixes. + o Lots of bug fixes. + + Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c: + o Integration of the popular NO_RSA/NO_DSA patches + o Initial support for compression inside the SSL record layer + o Added BIO proxy and filtering functionality + o Extended Big Number (BN) library + o Added RIPE MD160 message digest + o Addeed support for RC2/64bit cipher + o Extended ASN.1 parser routines + o Adjustations of the source tree for CVS + o Support for various new platforms + diff --git a/dep/lib/Win32/ssleay32.dll b/dep/lib/Win32/ssleay32.dll new file mode 100644 index 000000000..e72cd7ebc Binary files /dev/null and b/dep/lib/Win32/ssleay32.dll differ diff --git a/dep/lib/Win32/ssleay32.lib b/dep/lib/Win32/ssleay32.lib new file mode 100644 index 000000000..6fd59df50 Binary files /dev/null and b/dep/lib/Win32/ssleay32.lib differ diff --git a/dep/lib/x64/libeay32.dll b/dep/lib/x64/libeay32.dll new file mode 100644 index 000000000..8fe82d619 Binary files /dev/null and b/dep/lib/x64/libeay32.dll differ diff --git a/dep/lib/x64/libeay32.lib b/dep/lib/x64/libeay32.lib new file mode 100644 index 000000000..e7f7bec5d Binary files /dev/null and b/dep/lib/x64/libeay32.lib differ diff --git a/dep/lib/x64/libmysql.dll b/dep/lib/x64/libmysql.dll new file mode 100644 index 000000000..f339600e3 Binary files /dev/null and b/dep/lib/x64/libmysql.dll differ diff --git a/dep/lib/x64/libmysql.lib b/dep/lib/x64/libmysql.lib new file mode 100644 index 000000000..26820e657 Binary files /dev/null and b/dep/lib/x64/libmysql.lib differ diff --git a/dep/lib/x64/ssleay32.dll b/dep/lib/x64/ssleay32.dll new file mode 100644 index 000000000..2b5ff4cba Binary files /dev/null and b/dep/lib/x64/ssleay32.dll differ diff --git a/dep/lib/x64/ssleay32.lib b/dep/lib/x64/ssleay32.lib new file mode 100644 index 000000000..d5641c7aa Binary files /dev/null and b/dep/lib/x64/ssleay32.lib differ diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp index 3e23a7cd6..0fe470894 100644 --- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp @@ -235,7 +235,7 @@ INSTANTIATE_SINGLETON_1(AuctionBotConfig); //== AuctionBotConfig functions ============================ -AuctionBotConfig::AuctionBotConfig() : m_configFileName(_AUCTIONHOUSEBOT_CONFIG) +AuctionBotConfig::AuctionBotConfig() : m_configFileName(AUCTIONHOUSEBOT_CONFIG_LOCATION) { } diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index a64239d45..2a69fc806 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -855,7 +855,8 @@ enum Opcodes CMSG_GM_DESTROY_ONLINE_CORPSE = 0x1312, CMSG_ACTIVATETAXIEXPRESS = 0x0515, // 4.3.4 15595 SMSG_SET_FACTION_ATWAR = 0x1314, - SMSG_GAMETIMEBIAS_SET = 0x1315, + SMSG_SET_FACTION_NOT_VISIBLE = 0x0000, //TODO: Needs fixing up + SMSG_GAMETIMEBIAS_SET = 0x1315, CMSG_DEBUG_ACTIONS_START = 0x1316, CMSG_DEBUG_ACTIONS_STOP = 0x1317, CMSG_SET_FACTION_INACTIVE = 0x0E37, // 4.3.4 15595 diff --git a/src/game/WorldHandlers/Group.h b/src/game/WorldHandlers/Group.h index 3e54a4058..aa7708957 100644 --- a/src/game/WorldHandlers/Group.h +++ b/src/game/WorldHandlers/Group.h @@ -29,7 +29,7 @@ #include "ObjectGuid.h" #include "GroupReference.h" #include "GroupRefManager.h" -#include "BattleGround/BattleGround.h" +#include "BattleGround.h" #include "LootMgr.h" #include "DBCEnums.h" #include "SharedDefines.h" diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index 946cf1925..2420bda38 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -467,7 +467,7 @@ void World::LoadConfigSettings(bool reload) } else { - if (confVersion < _MANGOSDCONFVERSION) + if (confVersion < MANGOSD_CONFIG_VERSION) { sLog.outError("*****************************************************************************"); sLog.outError(" WARNING: Your mangosd.conf version indicates your conf file is out of date!"); diff --git a/src/mangosd/MaNGOSsoap.h b/src/mangosd/MaNGOSsoap.h index 7672281dd..3891dc900 100644 --- a/src/mangosd/MaNGOSsoap.h +++ b/src/mangosd/MaNGOSsoap.h @@ -22,8 +22,8 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#ifndef _MANGOSSOAP_H -#define _MANGOSSOAP_H +#ifndef MANGOS_H_MANGOSSOAP +#define MANGOS_H_MANGOSSOAP #include "Common.h" #include "World.h" @@ -65,7 +65,7 @@ class SOAPWorkingThread : public ACE_Task if (this->getq(mb) == -1) { ACE_DEBUG((LM_INFO, - ACE_TEXT("(%t) Shutting down\n"))); + ACE_TEXT("(%t) Shutting down\n"))); break; } diff --git a/src/mangosd/soapC.cpp b/src/mangosd/soapC.cpp index 32ede4c83..c1e2b0e6c 100644 --- a/src/mangosd/soapC.cpp +++ b/src/mangosd/soapC.cpp @@ -15,7 +15,7 @@ SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2010-02-18 18:41:56 GMT") SOAP_FMAC3 void SOAP_FMAC4 soap_serializeheader(struct soap* soap) { if (soap->header) - soap_serialize_SOAP_ENV__Header(soap, soap->header); + { soap_serialize_SOAP_ENV__Header(soap, soap->header); } } SOAP_FMAC3 int SOAP_FMAC4 soap_putheader(struct soap* soap) @@ -24,7 +24,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putheader(struct soap* soap) { soap->part = SOAP_IN_HEADER; if (soap_out_SOAP_ENV__Header(soap, "SOAP-ENV:Header", 0, soap->header, NULL)) - return soap->error; + { return soap->error; } soap->part = SOAP_END_HEADER; } return SOAP_OK; @@ -70,13 +70,13 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_serializefault(struct soap* soap) { soap_fault(soap); if (soap->fault) - soap_serialize_SOAP_ENV__Fault(soap, soap->fault); + { soap_serialize_SOAP_ENV__Fault(soap, soap->fault); } } SOAP_FMAC3 int SOAP_FMAC4 soap_putfault(struct soap* soap) { if (soap->fault) - return soap_put_SOAP_ENV__Fault(soap, soap->fault, "SOAP-ENV:Fault", NULL); + { return soap_put_SOAP_ENV__Fault(soap, soap->fault, "SOAP-ENV:Fault", NULL); } return SOAP_OK; } @@ -89,7 +89,7 @@ SOAP_FMAC3 const char** SOAP_FMAC4 soap_faultcode(struct soap* soap) { soap_fault(soap); if (soap->version == 2) - return (const char**)&soap->fault->SOAP_ENV__Code->SOAP_ENV__Value; + { return (const char**)&soap->fault->SOAP_ENV__Code->SOAP_ENV__Value; } return (const char**)&soap->fault->faultcode; } @@ -112,7 +112,7 @@ SOAP_FMAC3 const char** SOAP_FMAC4 soap_faultstring(struct soap* soap) { soap_fault(soap); if (soap->version == 2) - return (const char**)&soap->fault->SOAP_ENV__Reason->SOAP_ENV__Text; + { return (const char**)&soap->fault->SOAP_ENV__Reason->SOAP_ENV__Text; } return (const char**)&soap->fault->faultstring; } @@ -145,9 +145,9 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_getindependent(struct soap* soap) for (;;) if (!soap_getelement(soap, &t)) if (soap->error || soap_ignore_element(soap)) - break; + { break; } if (soap->error == SOAP_NO_TAG || soap->error == SOAP_EOF) - soap->error = SOAP_OK; + { soap->error = SOAP_OK; } return soap->error; } #endif @@ -160,9 +160,9 @@ extern "C" { SOAP_FMAC3 void* SOAP_FMAC4 soap_getelement(struct soap* soap, int* type) { if (soap_peek_element(soap)) - return NULL; + { return NULL; } if (!*soap->id || !(*type = soap_lookup_type(soap, soap->id))) - * type = soap_lookup_type(soap, soap->href); + { * type = soap_lookup_type(soap, soap->href); } switch (*type) { case SOAP_TYPE_byte: @@ -185,7 +185,7 @@ extern "C" { { const char* t = soap->type; if (!*t) - t = soap->tag; + { t = soap->tag; } if (!soap_match_tag(soap, t, "xsd:byte")) { *type = SOAP_TYPE_byte; @@ -239,7 +239,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap* soap) int t; DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Unexpected element '%s' in input (level=%u, %d)\n", soap->tag, soap->level, soap->body)); if (soap->mustUnderstand && !soap->other) - return soap->error = SOAP_MUSTUNDERSTAND; + { return soap->error = SOAP_MUSTUNDERSTAND; } if (((soap->mode & SOAP_XML_STRICT) && soap->part != SOAP_IN_HEADER) || !soap_match_tag(soap, soap->tag, "SOAP-ENV:")) { DBGLOG(TEST, SOAP_MESSAGE(fdebug, "REJECTING element '%s'\n", soap->tag)); @@ -249,17 +249,17 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap* soap) { soap->peeked = 0; if (soap->fignore) - soap->error = soap->fignore(soap, soap->tag); + { soap->error = soap->fignore(soap, soap->tag); } else - soap->error = SOAP_OK; - DBGLOG(TEST, if (!soap->error) SOAP_MESSAGE(fdebug, "IGNORING element '%s'\n", soap->tag)); + { soap->error = SOAP_OK; } + DBGLOG(TEST, if (!soap->error) SOAP_MESSAGE(fdebug, "IGNORING element '%s'\n", soap->tag)) { ; } if (!soap->error && soap->body) { soap->level++; while (!soap_ignore_element(soap)) - ; + { ; } if (soap->error == SOAP_NO_TAG) - soap->error = soap_element_end_in(soap, NULL); + { soap->error = soap_element_end_in(soap, NULL); } } } } @@ -276,7 +276,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putindependent(struct soap* soap) for (pp = soap->pht[i]; pp; pp = pp->next) if (pp->mark1 == 2 || pp->mark2 == 2) if (soap_putelement(soap, pp->ptr, "id", pp->id, pp->type)) - return soap->error; + { return soap->error; } return SOAP_OK; } #endif @@ -384,45 +384,45 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_fdelete(struct soap_clist* p) { case SOAP_TYPE_ns1__executeCommandResponse: if (p->size < 0) - delete(struct ns1__executeCommandResponse*)p->ptr; + { delete(struct ns1__executeCommandResponse*)p->ptr; } else - delete[](struct ns1__executeCommandResponse*)p->ptr; + { delete[](struct ns1__executeCommandResponse*)p->ptr; } break; case SOAP_TYPE_ns1__executeCommand: if (p->size < 0) - delete(struct ns1__executeCommand*)p->ptr; + { delete(struct ns1__executeCommand*)p->ptr; } else - delete[](struct ns1__executeCommand*)p->ptr; + { delete[](struct ns1__executeCommand*)p->ptr; } break; case SOAP_TYPE_SOAP_ENV__Header: if (p->size < 0) - delete(struct SOAP_ENV__Header*)p->ptr; + { delete(struct SOAP_ENV__Header*)p->ptr; } else - delete[](struct SOAP_ENV__Header*)p->ptr; + { delete[](struct SOAP_ENV__Header*)p->ptr; } break; case SOAP_TYPE_SOAP_ENV__Code: if (p->size < 0) - delete(struct SOAP_ENV__Code*)p->ptr; + { delete(struct SOAP_ENV__Code*)p->ptr; } else - delete[](struct SOAP_ENV__Code*)p->ptr; + { delete[](struct SOAP_ENV__Code*)p->ptr; } break; case SOAP_TYPE_SOAP_ENV__Detail: if (p->size < 0) - delete(struct SOAP_ENV__Detail*)p->ptr; + { delete(struct SOAP_ENV__Detail*)p->ptr; } else - delete[](struct SOAP_ENV__Detail*)p->ptr; + { delete[](struct SOAP_ENV__Detail*)p->ptr; } break; case SOAP_TYPE_SOAP_ENV__Reason: if (p->size < 0) - delete(struct SOAP_ENV__Reason*)p->ptr; + { delete(struct SOAP_ENV__Reason*)p->ptr; } else - delete[](struct SOAP_ENV__Reason*)p->ptr; + { delete[](struct SOAP_ENV__Reason*)p->ptr; } break; case SOAP_TYPE_SOAP_ENV__Fault: if (p->size < 0) - delete(struct SOAP_ENV__Fault*)p->ptr; + { delete(struct SOAP_ENV__Fault*)p->ptr; } else - delete[](struct SOAP_ENV__Fault*)p->ptr; + { delete[](struct SOAP_ENV__Fault*)p->ptr; } break; default: return SOAP_ERR; } @@ -448,7 +448,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap* soap, const char* a, const { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_byte); if (soap_out_byte(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -461,7 +461,7 @@ SOAP_FMAC3 char* SOAP_FMAC4 soap_get_byte(struct soap* soap, char* p, const char { if ((p = soap_in_byte(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -484,7 +484,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap* soap, const int* a, const ch { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_int); if (soap_out_int(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -497,7 +497,7 @@ SOAP_FMAC3 int* SOAP_FMAC4 soap_get_int(struct soap* soap, int* p, const char* t { if ((p = soap_in_int(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -540,7 +540,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Fault(struct soap* soap, const stru { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Fault); if (soap_out_SOAP_ENV__Fault(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -548,25 +548,25 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap* soap, const char { const char* soap_tmp_faultcode = soap_QName2s(soap, a->faultcode); if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Fault), type)) - return soap->error; + { return soap->error; } if (soap_out__QName(soap, "faultcode", -1, (char * const*)&soap_tmp_faultcode, "")) - return soap->error; + { return soap->error; } if (soap_out_string(soap, "faultstring", -1, &a->faultstring, "")) - return soap->error; + { return soap->error; } if (soap_out_string(soap, "faultactor", -1, &a->faultactor, "")) - return soap->error; + { return soap->error; } if (soap_out_PointerToSOAP_ENV__Detail(soap, "detail", -1, &a->detail, "")) - return soap->error; + { return soap->error; } if (soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Code", -1, &a->SOAP_ENV__Code, "")) - return soap->error; + { return soap->error; } if (soap_out_PointerToSOAP_ENV__Reason(soap, "SOAP-ENV:Reason", -1, &a->SOAP_ENV__Reason, "")) - return soap->error; + { return soap->error; } if (soap_out_string(soap, "SOAP-ENV:Node", -1, &a->SOAP_ENV__Node, "")) - return soap->error; + { return soap->error; } if (soap_out_string(soap, "SOAP-ENV:Role", -1, &a->SOAP_ENV__Role, "")) - return soap->error; + { return soap->error; } if (soap_out_PointerToSOAP_ENV__Detail(soap, "SOAP-ENV:Detail", -1, &a->SOAP_ENV__Detail, "")) - return soap->error; + { return soap->error; } return soap_element_end_out(soap, tag); } @@ -574,7 +574,7 @@ SOAP_FMAC3 struct SOAP_ENV__Fault* SOAP_FMAC4 soap_get_SOAP_ENV__Fault(struct so { if ((p = soap_in_SOAP_ENV__Fault(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -582,10 +582,10 @@ SOAP_FMAC3 struct SOAP_ENV__Fault* SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct soa { short soap_flag_faultcode = 1, soap_flag_faultstring = 1, soap_flag_faultactor = 1, soap_flag_detail = 1, soap_flag_SOAP_ENV__Code = 1, soap_flag_SOAP_ENV__Reason = 1, soap_flag_SOAP_ENV__Node = 1, soap_flag_SOAP_ENV__Role = 1, soap_flag_SOAP_ENV__Detail = 1; if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct SOAP_ENV__Fault*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Fault, sizeof(struct SOAP_ENV__Fault), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_SOAP_ENV__Fault(soap, a); if (soap->body && !*soap->href) { @@ -647,20 +647,20 @@ SOAP_FMAC3 struct SOAP_ENV__Fault* SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct soa continue; } if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Fault*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Fault, 0, sizeof(struct SOAP_ENV__Fault), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -680,12 +680,12 @@ SOAP_FMAC3 struct SOAP_ENV__Fault* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Fault(s DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Fault(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Fault, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct SOAP_ENV__Fault; if (size) - *size = sizeof(struct SOAP_ENV__Fault); + { *size = sizeof(struct SOAP_ENV__Fault); } } else { @@ -696,7 +696,7 @@ SOAP_FMAC3 struct SOAP_ENV__Fault* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Fault(s return NULL; } if (size) - *size = n * sizeof(struct SOAP_ENV__Fault); + { *size = n * sizeof(struct SOAP_ENV__Fault); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct SOAP_ENV__Fault*)cp->ptr; @@ -727,16 +727,16 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Reason(struct soap* soap, const str { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Reason); if (soap_out_SOAP_ENV__Reason(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Reason(struct soap* soap, const char* tag, int id, const struct SOAP_ENV__Reason* a, const char* type) { if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Reason), type)) - return soap->error; + { return soap->error; } if (soap_out_string(soap, "SOAP-ENV:Text", -1, &a->SOAP_ENV__Text, "")) - return soap->error; + { return soap->error; } return soap_element_end_out(soap, tag); } @@ -744,7 +744,7 @@ SOAP_FMAC3 struct SOAP_ENV__Reason* SOAP_FMAC4 soap_get_SOAP_ENV__Reason(struct { if ((p = soap_in_SOAP_ENV__Reason(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -752,10 +752,10 @@ SOAP_FMAC3 struct SOAP_ENV__Reason* SOAP_FMAC4 soap_in_SOAP_ENV__Reason(struct s { short soap_flag_SOAP_ENV__Text = 1; if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct SOAP_ENV__Reason*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Reason, sizeof(struct SOAP_ENV__Reason), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_SOAP_ENV__Reason(soap, a); if (soap->body && !*soap->href) { @@ -769,20 +769,20 @@ SOAP_FMAC3 struct SOAP_ENV__Reason* SOAP_FMAC4 soap_in_SOAP_ENV__Reason(struct s continue; } if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Reason*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Reason, 0, sizeof(struct SOAP_ENV__Reason), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -802,12 +802,12 @@ SOAP_FMAC3 struct SOAP_ENV__Reason* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Reason DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Reason(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Reason, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct SOAP_ENV__Reason; if (size) - *size = sizeof(struct SOAP_ENV__Reason); + { *size = sizeof(struct SOAP_ENV__Reason); } } else { @@ -818,7 +818,7 @@ SOAP_FMAC3 struct SOAP_ENV__Reason* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Reason return NULL; } if (size) - *size = n * sizeof(struct SOAP_ENV__Reason); + { *size = n * sizeof(struct SOAP_ENV__Reason); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct SOAP_ENV__Reason*)cp->ptr; @@ -851,16 +851,16 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Detail(struct soap* soap, const str { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Detail); if (soap_out_SOAP_ENV__Detail(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Detail(struct soap* soap, const char* tag, int id, const struct SOAP_ENV__Detail* a, const char* type) { if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Detail), type)) - return soap->error; + { return soap->error; } if (soap_putelement(soap, a->fault, "fault", -1, a->__type)) - return soap->error; + { return soap->error; } soap_outliteral(soap, "-any", &a->__any, NULL); return soap_element_end_out(soap, tag); } @@ -869,7 +869,7 @@ SOAP_FMAC3 struct SOAP_ENV__Detail* SOAP_FMAC4 soap_get_SOAP_ENV__Detail(struct { if ((p = soap_in_SOAP_ENV__Detail(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -877,10 +877,10 @@ SOAP_FMAC3 struct SOAP_ENV__Detail* SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct s { short soap_flag_fault = 1, soap_flag___any = 1; if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct SOAP_ENV__Detail*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_SOAP_ENV__Detail(soap, a); if (soap->body && !*soap->href) { @@ -900,20 +900,20 @@ SOAP_FMAC3 struct SOAP_ENV__Detail* SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct s continue; } if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Detail*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Detail, 0, sizeof(struct SOAP_ENV__Detail), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -933,12 +933,12 @@ SOAP_FMAC3 struct SOAP_ENV__Detail* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Detail DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Detail(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Detail, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct SOAP_ENV__Detail; if (size) - *size = sizeof(struct SOAP_ENV__Detail); + { *size = sizeof(struct SOAP_ENV__Detail); } } else { @@ -949,7 +949,7 @@ SOAP_FMAC3 struct SOAP_ENV__Detail* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Detail return NULL; } if (size) - *size = n * sizeof(struct SOAP_ENV__Detail); + { *size = n * sizeof(struct SOAP_ENV__Detail); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct SOAP_ENV__Detail*)cp->ptr; @@ -982,7 +982,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Code(struct soap* soap, const struc { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Code); if (soap_out_SOAP_ENV__Code(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -990,11 +990,11 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Code(struct soap* soap, const char* { const char* soap_tmp_SOAP_ENV__Value = soap_QName2s(soap, a->SOAP_ENV__Value); if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Code), type)) - return soap->error; + { return soap->error; } if (soap_out__QName(soap, "SOAP-ENV:Value", -1, (char * const*)&soap_tmp_SOAP_ENV__Value, "")) - return soap->error; + { return soap->error; } if (soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Subcode", -1, &a->SOAP_ENV__Subcode, "")) - return soap->error; + { return soap->error; } return soap_element_end_out(soap, tag); } @@ -1002,7 +1002,7 @@ SOAP_FMAC3 struct SOAP_ENV__Code* SOAP_FMAC4 soap_get_SOAP_ENV__Code(struct soap { if ((p = soap_in_SOAP_ENV__Code(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -1010,10 +1010,10 @@ SOAP_FMAC3 struct SOAP_ENV__Code* SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap* { short soap_flag_SOAP_ENV__Value = 1, soap_flag_SOAP_ENV__Subcode = 1; if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct SOAP_ENV__Code*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Code, sizeof(struct SOAP_ENV__Code), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_SOAP_ENV__Code(soap, a); if (soap->body && !*soap->href) { @@ -1033,20 +1033,20 @@ SOAP_FMAC3 struct SOAP_ENV__Code* SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap* continue; } if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Code*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Code, 0, sizeof(struct SOAP_ENV__Code), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1066,12 +1066,12 @@ SOAP_FMAC3 struct SOAP_ENV__Code* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Code(str DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Code(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Code, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct SOAP_ENV__Code; if (size) - *size = sizeof(struct SOAP_ENV__Code); + { *size = sizeof(struct SOAP_ENV__Code); } } else { @@ -1082,7 +1082,7 @@ SOAP_FMAC3 struct SOAP_ENV__Code* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Code(str return NULL; } if (size) - *size = n * sizeof(struct SOAP_ENV__Code); + { *size = n * sizeof(struct SOAP_ENV__Code); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct SOAP_ENV__Code*)cp->ptr; @@ -1111,14 +1111,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Header(struct soap* soap, const str { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Header); if (soap_out_SOAP_ENV__Header(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Header(struct soap* soap, const char* tag, int id, const struct SOAP_ENV__Header* a, const char* type) { if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Header), type)) - return soap->error; + { return soap->error; } return soap_element_end_out(soap, tag); } @@ -1126,17 +1126,17 @@ SOAP_FMAC3 struct SOAP_ENV__Header* SOAP_FMAC4 soap_get_SOAP_ENV__Header(struct { if ((p = soap_in_SOAP_ENV__Header(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } SOAP_FMAC3 struct SOAP_ENV__Header* SOAP_FMAC4 soap_in_SOAP_ENV__Header(struct soap* soap, const char* tag, struct SOAP_ENV__Header* a, const char* type) { if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct SOAP_ENV__Header*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Header, sizeof(struct SOAP_ENV__Header), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_SOAP_ENV__Header(soap, a); if (soap->body && !*soap->href) { @@ -1144,20 +1144,20 @@ SOAP_FMAC3 struct SOAP_ENV__Header* SOAP_FMAC4 soap_in_SOAP_ENV__Header(struct s { soap->error = SOAP_TAG_MISMATCH; if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Header*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Header, 0, sizeof(struct SOAP_ENV__Header), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1177,12 +1177,12 @@ SOAP_FMAC3 struct SOAP_ENV__Header* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Header DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Header(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Header, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct SOAP_ENV__Header; if (size) - *size = sizeof(struct SOAP_ENV__Header); + { *size = sizeof(struct SOAP_ENV__Header); } } else { @@ -1193,7 +1193,7 @@ SOAP_FMAC3 struct SOAP_ENV__Header* SOAP_FMAC4 soap_instantiate_SOAP_ENV__Header return NULL; } if (size) - *size = n * sizeof(struct SOAP_ENV__Header); + { *size = n * sizeof(struct SOAP_ENV__Header); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct SOAP_ENV__Header*)cp->ptr; @@ -1222,16 +1222,16 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommand(struct soap* soap, const { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__executeCommand); if (soap_out_ns1__executeCommand(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommand(struct soap* soap, const char* tag, int id, const struct ns1__executeCommand* a, const char* type) { if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommand), type)) - return soap->error; + { return soap->error; } if (soap_out_string(soap, "command", -1, &a->command, "")) - return soap->error; + { return soap->error; } return soap_element_end_out(soap, tag); } @@ -1239,7 +1239,7 @@ SOAP_FMAC3 struct ns1__executeCommand* SOAP_FMAC4 soap_get_ns1__executeCommand(s { if ((p = soap_in_ns1__executeCommand(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -1247,10 +1247,10 @@ SOAP_FMAC3 struct ns1__executeCommand* SOAP_FMAC4 soap_in_ns1__executeCommand(st { short soap_flag_command = 1; if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct ns1__executeCommand*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__executeCommand, sizeof(struct ns1__executeCommand), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_ns1__executeCommand(soap, a); if (soap->body && !*soap->href) { @@ -1264,20 +1264,20 @@ SOAP_FMAC3 struct ns1__executeCommand* SOAP_FMAC4 soap_in_ns1__executeCommand(st continue; } if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct ns1__executeCommand*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__executeCommand, 0, sizeof(struct ns1__executeCommand), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1297,12 +1297,12 @@ SOAP_FMAC3 struct ns1__executeCommand* SOAP_FMAC4 soap_instantiate_ns1__executeC DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__executeCommand(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_ns1__executeCommand, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct ns1__executeCommand; if (size) - *size = sizeof(struct ns1__executeCommand); + { *size = sizeof(struct ns1__executeCommand); } } else { @@ -1313,7 +1313,7 @@ SOAP_FMAC3 struct ns1__executeCommand* SOAP_FMAC4 soap_instantiate_ns1__executeC return NULL; } if (size) - *size = n * sizeof(struct ns1__executeCommand); + { *size = n * sizeof(struct ns1__executeCommand); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct ns1__executeCommand*)cp->ptr; @@ -1340,16 +1340,16 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommandResponse(struct soap* soap { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__executeCommandResponse); if (soap_out_ns1__executeCommandResponse(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommandResponse(struct soap* soap, const char* tag, int id, const struct ns1__executeCommandResponse* a, const char* type) { if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommandResponse), type)) - return soap->error; + { return soap->error; } if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) - return soap->error; + { return soap->error; } return soap_element_end_out(soap, tag); } @@ -1357,7 +1357,7 @@ SOAP_FMAC3 struct ns1__executeCommandResponse* SOAP_FMAC4 soap_get_ns1__executeC { if ((p = soap_in_ns1__executeCommandResponse(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -1365,10 +1365,10 @@ SOAP_FMAC3 struct ns1__executeCommandResponse* SOAP_FMAC4 soap_in_ns1__executeCo { short soap_flag_result = 1; if (soap_element_begin_in(soap, tag, 0, type)) - return NULL; + { return NULL; } a = (struct ns1__executeCommandResponse*)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__executeCommandResponse, sizeof(struct ns1__executeCommandResponse), 0, NULL, NULL, NULL); if (!a) - return NULL; + { return NULL; } soap_default_ns1__executeCommandResponse(soap, a); if (soap->body && !*soap->href) { @@ -1382,20 +1382,20 @@ SOAP_FMAC3 struct ns1__executeCommandResponse* SOAP_FMAC4 soap_in_ns1__executeCo continue; } if (soap->error == SOAP_TAG_MISMATCH) - soap->error = soap_ignore_element(soap); + { soap->error = soap_ignore_element(soap); } if (soap->error == SOAP_NO_TAG) - break; + { break; } if (soap->error) - return NULL; + { return NULL; } } if (soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } else { a = (struct ns1__executeCommandResponse*)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__executeCommandResponse, 0, sizeof(struct ns1__executeCommandResponse), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1415,12 +1415,12 @@ SOAP_FMAC3 struct ns1__executeCommandResponse* SOAP_FMAC4 soap_instantiate_ns1__ DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__executeCommandResponse(%d, %s, %s)\n", n, type ? type : "", arrayType ? arrayType : "")); struct soap_clist* cp = soap_link(soap, NULL, SOAP_TYPE_ns1__executeCommandResponse, n, soap_fdelete); if (!cp) - return NULL; + { return NULL; } if (n < 0) { cp->ptr = (void*)new struct ns1__executeCommandResponse; if (size) - *size = sizeof(struct ns1__executeCommandResponse); + { *size = sizeof(struct ns1__executeCommandResponse); } } else { @@ -1431,7 +1431,7 @@ SOAP_FMAC3 struct ns1__executeCommandResponse* SOAP_FMAC4 soap_instantiate_ns1__ return NULL; } if (size) - *size = n * sizeof(struct ns1__executeCommandResponse); + { *size = n * sizeof(struct ns1__executeCommandResponse); } } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); return (struct ns1__executeCommandResponse*)cp->ptr; @@ -1447,14 +1447,14 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommandResponse(struct soap* so SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap* soap, struct SOAP_ENV__Reason* const* a) { if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Reason)) - soap_serialize_SOAP_ENV__Reason(soap, *a); + { soap_serialize_SOAP_ENV__Reason(soap, *a); } } SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Reason(struct soap* soap, struct SOAP_ENV__Reason* const* a, const char* tag, const char* type) { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Reason); if (soap_out_PointerToSOAP_ENV__Reason(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -1462,7 +1462,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Reason(struct soap* soap, { id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Reason); if (id < 0) - return soap->error; + { return soap->error; } return soap_out_SOAP_ENV__Reason(soap, tag, id, *a, type); } @@ -1470,29 +1470,29 @@ SOAP_FMAC3 struct SOAP_ENV__Reason** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Reas { if ((p = soap_in_PointerToSOAP_ENV__Reason(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } SOAP_FMAC3 struct SOAP_ENV__Reason** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reason(struct soap* soap, const char* tag, struct SOAP_ENV__Reason** a, const char* type) { if (soap_element_begin_in(soap, tag, 1, NULL)) - return NULL; + { return NULL; } if (!a) if (!(a = (struct SOAP_ENV__Reason**)soap_malloc(soap, sizeof(struct SOAP_ENV__Reason*)))) - return NULL; + { return NULL; } *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); if (!(*a = soap_in_SOAP_ENV__Reason(soap, tag, *a, type))) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Reason**)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Reason, sizeof(struct SOAP_ENV__Reason), 0); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1504,14 +1504,14 @@ SOAP_FMAC3 struct SOAP_ENV__Reason** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reaso SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap* soap, struct SOAP_ENV__Detail* const* a) { if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Detail)) - soap_serialize_SOAP_ENV__Detail(soap, *a); + { soap_serialize_SOAP_ENV__Detail(soap, *a); } } SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Detail(struct soap* soap, struct SOAP_ENV__Detail* const* a, const char* tag, const char* type) { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Detail); if (soap_out_PointerToSOAP_ENV__Detail(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -1519,7 +1519,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Detail(struct soap* soap, { id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Detail); if (id < 0) - return soap->error; + { return soap->error; } return soap_out_SOAP_ENV__Detail(soap, tag, id, *a, type); } @@ -1527,29 +1527,29 @@ SOAP_FMAC3 struct SOAP_ENV__Detail** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Deta { if ((p = soap_in_PointerToSOAP_ENV__Detail(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } SOAP_FMAC3 struct SOAP_ENV__Detail** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Detail(struct soap* soap, const char* tag, struct SOAP_ENV__Detail** a, const char* type) { if (soap_element_begin_in(soap, tag, 1, NULL)) - return NULL; + { return NULL; } if (!a) if (!(a = (struct SOAP_ENV__Detail**)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail*)))) - return NULL; + { return NULL; } *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); if (!(*a = soap_in_SOAP_ENV__Detail(soap, tag, *a, type))) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Detail**)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1561,14 +1561,14 @@ SOAP_FMAC3 struct SOAP_ENV__Detail** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Detai SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap* soap, struct SOAP_ENV__Code* const* a) { if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Code)) - soap_serialize_SOAP_ENV__Code(soap, *a); + { soap_serialize_SOAP_ENV__Code(soap, *a); } } SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Code(struct soap* soap, struct SOAP_ENV__Code* const* a, const char* tag, const char* type) { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Code); if (soap_out_PointerToSOAP_ENV__Code(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -1576,7 +1576,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Code(struct soap* soap, co { id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Code); if (id < 0) - return soap->error; + { return soap->error; } return soap_out_SOAP_ENV__Code(soap, tag, id, *a, type); } @@ -1584,29 +1584,29 @@ SOAP_FMAC3 struct SOAP_ENV__Code** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Code(s { if ((p = soap_in_PointerToSOAP_ENV__Code(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } SOAP_FMAC3 struct SOAP_ENV__Code** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Code(struct soap* soap, const char* tag, struct SOAP_ENV__Code** a, const char* type) { if (soap_element_begin_in(soap, tag, 1, NULL)) - return NULL; + { return NULL; } if (!a) if (!(a = (struct SOAP_ENV__Code**)soap_malloc(soap, sizeof(struct SOAP_ENV__Code*)))) - return NULL; + { return NULL; } *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); if (!(*a = soap_in_SOAP_ENV__Code(soap, tag, *a, type))) - return NULL; + { return NULL; } } else { a = (struct SOAP_ENV__Code**)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Code, sizeof(struct SOAP_ENV__Code), 0); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1616,14 +1616,14 @@ SOAP_FMAC3 struct SOAP_ENV__Code** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Code(st SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTostring(struct soap* soap, char** const* a) { if (!soap_reference(soap, *a, SOAP_TYPE_string)) - soap_serialize_string(soap, *a); + { soap_serialize_string(soap, *a); } } SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTostring(struct soap* soap, char** const* a, const char* tag, const char* type) { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTostring); if (soap_out_PointerTostring(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -1631,7 +1631,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTostring(struct soap* soap, const char { id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_string); if (id < 0) - return soap->error; + { return soap->error; } return soap_out_string(soap, tag, id, *a, type); } @@ -1639,29 +1639,29 @@ SOAP_FMAC3 char** * SOAP_FMAC4 soap_get_PointerTostring(struct soap* soap, char* { if ((p = soap_in_PointerTostring(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } SOAP_FMAC3 char** * SOAP_FMAC4 soap_in_PointerTostring(struct soap* soap, const char* tag, char** *a, const char* type) { if (soap_element_begin_in(soap, tag, 1, NULL)) - return NULL; + { return NULL; } if (!a) if (!(a = (char***)soap_malloc(soap, sizeof(char**)))) - return NULL; + { return NULL; } *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); if (!(*a = soap_in_string(soap, tag, *a, type))) - return NULL; + { return NULL; } } else { a = (char***)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_string, sizeof(char*), 1); if (soap->body && soap_element_end_in(soap, tag)) - return NULL; + { return NULL; } } return a; } @@ -1680,7 +1680,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap* soap, char* const* a, con { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE__QName); if (soap_out__QName(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -1693,7 +1693,7 @@ SOAP_FMAC3 char** SOAP_FMAC4 soap_get__QName(struct soap* soap, char** p, const { if ((p = soap_in__QName(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } @@ -1721,7 +1721,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_put_string(struct soap* soap, char* const* a, con { register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_string); if (soap_out_string(soap, tag, id, a, type)) - return soap->error; + { return soap->error; } return soap_putindependent(soap); } @@ -1734,7 +1734,7 @@ SOAP_FMAC3 char** SOAP_FMAC4 soap_get_string(struct soap* soap, char** p, const { if ((p = soap_in_string(soap, tag, p, type))) if (soap_getindependent(soap)) - return NULL; + { return NULL; } return p; } diff --git a/src/mangosd/soapServer.cpp b/src/mangosd/soapServer.cpp index da3780c9c..c36ec28e0 100644 --- a/src/mangosd/soapServer.cpp +++ b/src/mangosd/soapServer.cpp @@ -28,7 +28,7 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap* soap) #ifndef WITH_FASTCGI if (soap->max_keep_alive > 0 && !--k) - soap->keep_alive = 0; + { soap->keep_alive = 0; } #endif if (soap_begin_recv(soap)) @@ -47,10 +47,10 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap* soap) } if (soap_envelope_begin_in(soap) - || soap_recv_header(soap) - || soap_body_begin_in(soap) - || soap_serve_request(soap) - || (soap->fserveloop && soap->fserveloop(soap))) + || soap_recv_header(soap) + || soap_body_begin_in(soap) + || soap_serve_request(soap) + || (soap->fserveloop && soap->fserveloop(soap))) { #ifdef WITH_FASTCGI soap_send_fault(soap); @@ -75,7 +75,7 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap* soap) { soap_peek_element(soap); if (!soap_match_tag(soap, soap->tag, "ns1:executeCommand")) - return soap_serve_ns1__executeCommand(soap); + { return soap_serve_ns1__executeCommand(soap); } return soap->error = SOAP_NO_METHOD; } #endif @@ -91,38 +91,38 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap* soap) soap_default_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand); soap->encodingStyle = NULL; if (!soap_get_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand, "ns1:executeCommand", NULL)) - return soap->error; + { return soap->error; } if (soap_body_end_in(soap) - || soap_envelope_end_in(soap) - || soap_end_recv(soap)) - return soap->error; + || soap_envelope_end_in(soap) + || soap_end_recv(soap)) + { return soap->error; } soap->error = ns1__executeCommand(soap, soap_tmp_ns1__executeCommand.command, &soap_tmp_string); if (soap->error) - return soap->error; + { return soap->error; } soap_serializeheader(soap); soap_serialize_ns1__executeCommandResponse(soap, &soap_tmp_ns1__executeCommandResponse); if (soap_begin_count(soap)) - return soap->error; + { return soap->error; } if (soap->mode & SOAP_IO_LENGTH) { if (soap_envelope_begin_out(soap) - || soap_putheader(soap) - || soap_body_begin_out(soap) - || soap_put_ns1__executeCommandResponse(soap, &soap_tmp_ns1__executeCommandResponse, "ns1:executeCommandResponse", "") - || soap_body_end_out(soap) - || soap_envelope_end_out(soap)) - return soap->error; - }; - if (soap_end_count(soap) - || soap_response(soap, SOAP_OK) - || soap_envelope_begin_out(soap) || soap_putheader(soap) || soap_body_begin_out(soap) || soap_put_ns1__executeCommandResponse(soap, &soap_tmp_ns1__executeCommandResponse, "ns1:executeCommandResponse", "") || soap_body_end_out(soap) - || soap_envelope_end_out(soap) - || soap_end_send(soap)) - return soap->error; + || soap_envelope_end_out(soap)) + { return soap->error; } + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) + || soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__executeCommandResponse(soap, &soap_tmp_ns1__executeCommandResponse, "ns1:executeCommandResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap) + || soap_end_send(soap)) + { return soap->error; } return soap_closesock(soap); } diff --git a/src/mangosd/soapStub.h b/src/mangosd/soapStub.h index ac64815a4..09b78147c 100644 --- a/src/mangosd/soapStub.h +++ b/src/mangosd/soapStub.h @@ -7,7 +7,7 @@ #ifndef soapStub_H #define soapStub_H -#include "stdsoap2.h" +#include /******************************************************************************\ * * diff --git a/src/shared/Common.h b/src/shared/Common.h index ff47be706..050cbcc87 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -48,7 +48,7 @@ #ifdef VERSION #undef VERSION #endif // VERSION -# include "config.h" +//# include "config.h" #undef PACKAGE #undef PACKAGE_BUGREPORT #undef PACKAGE_NAME diff --git a/win/VC120/game.vcxproj b/win/VC120/game.vcxproj index b2b40da20..ade737c0b 100644 --- a/win/VC120/game.vcxproj +++ b/win/VC120/game.vcxproj @@ -297,7 +297,7 @@ - + @@ -331,165 +331,165 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - + + + Create pchdef.h diff --git a/win/VC120/genrev.vcxproj b/win/VC120/genrev.vcxproj index 791dac66f..9600e7690 100644 --- a/win/VC120/genrev.vcxproj +++ b/win/VC120/genrev.vcxproj @@ -19,7 +19,7 @@ - {304083A8-CF14-496E-BF87-F4007D677274} + {803F488E-4C5A-4866-8D5C-1E6C03C007C2} Win32Proj Win32 genrev diff --git a/win/VC120/shared.vcxproj b/win/VC120/shared.vcxproj index 10b748694..3f1003504 100644 --- a/win/VC120/shared.vcxproj +++ b/win/VC120/shared.vcxproj @@ -116,7 +116,7 @@ - + @@ -147,6 +147,7 @@ + @@ -155,7 +156,7 @@ - + diff --git a/win/mangosdVC120.sln b/win/mangosdVC120.sln index 02f0bc755..d2953c365 100644 --- a/win/mangosdVC120.sln +++ b/win/mangosdVC120.sln @@ -1,45 +1,42 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC120\game.vcxproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}" +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ace", "VC120\ace.vcxproj", "{D70895A7-4EA1-48BE-A557-834D4357BAD3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC120\game.vcxproj", "{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}" ProjectSection(ProjectDependencies) = postProject - {90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED} + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} - {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} + {367CCE76-14A7-4871-93D6-579DA35FBEFD} = {367CCE76-14A7-4871-93D6-579DA35FBEFD} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC120\shared.vcxproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC120\shared.vcxproj", "{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}" ProjectSection(ProjectDependencies) = postProject - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} + {915B99FF-5340-4BCE-AAE7-D3737443498B} = {915B99FF-5340-4BCE-AAE7-D3737443498B} + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} {803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2} - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} - {F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC120\mangosd.vcxproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC120\mangosd.vcxproj", "{485F08B8-BAD4-47C1-8B49-17B9949B123E}" ProjectSection(ProjectDependencies) = postProject - {563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23} - {90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED} - {1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88} + {23AFA1F9-A301-4123-81D8-777D3DE349C4} = {23AFA1F9-A301-4123-81D8-777D3DE349C4} + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933} = {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC120\zlib.vcxproj", "{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC120\framework.vcxproj", "{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC120\framework.vcxproj", "{915B99FF-5340-4BCE-AAE7-D3737443498B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC120\realmd.vcxproj", "{23AFA1F9-A301-4123-81D8-777D3DE349C4}" ProjectSection(ProjectDependencies) = postProject - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8} + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC120\realmd.vcxproj", "{563E9905-3657-460C-AE63-0AC39D162E23}" - ProjectSection(ProjectDependencies) = postProject - {90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC120\g3dlite.vcxproj", "{367CCE76-14A7-4871-93D6-579DA35FBEFD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC120\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC120\genrevision.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC120\ACE_vc11.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrev", "VC120\genrev.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\dep\recastnavigation\Detour\win\VC120\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}" EndProject @@ -53,94 +50,81 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|x64 - {1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.Build.0 = Release|x64 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.Build.0 = Debug|Win32 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.ActiveCfg = Debug|x64 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.Build.0 = Debug|x64 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.ActiveCfg = Release|Win32 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64 - {90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64 - {A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.Build.0 = Debug|Win32 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.ActiveCfg = Debug|x64 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.Build.0 = Debug|x64 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.ActiveCfg = Release|Win32 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.Build.0 = Release|Win32 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.ActiveCfg = Release|x64 - {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.Build.0 = Release|x64 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64 - {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64 - {563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32 - {563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32 - {563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64 - {563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32 - {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|Win32.ActiveCfg = Debug|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|Win32.Build.0 = Debug|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|x64.ActiveCfg = Debug|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|Win32.ActiveCfg = Release|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|Win32.Build.0 = Release|Win32 + {D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|x64.ActiveCfg = Release|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|Win32.ActiveCfg = Debug|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|Win32.Build.0 = Debug|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|x64.ActiveCfg = Debug|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|Win32.ActiveCfg = Release|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|Win32.Build.0 = Release|Win32 + {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|x64.ActiveCfg = Release|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|Win32.ActiveCfg = Debug|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|Win32.Build.0 = Debug|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|x64.ActiveCfg = Debug|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|Win32.ActiveCfg = Release|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|Win32.Build.0 = Release|Win32 + {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|x64.ActiveCfg = Release|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|Win32.ActiveCfg = Debug|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|Win32.Build.0 = Debug|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|x64.ActiveCfg = Debug|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|Win32.ActiveCfg = Release|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|Win32.Build.0 = Release|Win32 + {485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|x64.ActiveCfg = Release|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.ActiveCfg = Debug|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.Build.0 = Debug|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|x64.ActiveCfg = Debug|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.ActiveCfg = Release|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.Build.0 = Release|Win32 + {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|x64.ActiveCfg = Release|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|Win32.ActiveCfg = Debug|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|Win32.Build.0 = Debug|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|x64.ActiveCfg = Debug|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|Win32.ActiveCfg = Release|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|Win32.Build.0 = Release|Win32 + {915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|x64.ActiveCfg = Release|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|Win32.Build.0 = Debug|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|x64.ActiveCfg = Debug|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|Win32.ActiveCfg = Release|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|Win32.Build.0 = Release|Win32 + {23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|x64.ActiveCfg = Release|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|Win32.ActiveCfg = Debug|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|Win32.Build.0 = Debug|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|x64.ActiveCfg = Debug|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|Win32.ActiveCfg = Release|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|Win32.Build.0 = Release|Win32 + {367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|x64.ActiveCfg = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32 @@ -149,42 +133,6 @@ Global {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.ActiveCfg = Debug|Win32 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.Build.0 = Debug|Win32 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.ActiveCfg = Release|Win32 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.Build.0 = Release|Win32 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64 - {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64 - {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64 - {F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32 - {F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32 - {F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64 - {F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64 {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|x64