Missing configure.ac for release 1.6.2.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/tags/release-1.6.2@266 119443c7-1b9e-41f8-b6fc-b9c35fce742c

.gitignore

@@ -1,124 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# Normal rules
-#
-.*
-*.o
-*.o.*
-*.a
-*.s
-*.ko
-*.so
-*.so.dbg
-*.mod.c
-*.i
-*.lst
-*.symtypes
-*.order
-modules.builtin
-*.elf
-*.bin
-*.gz
-*.bz2
-*.lzma
-*.patch
-*.gcno
-
-#
-# Top-level generic files
-#
-/tags
-/TAGS
-/linux
-/vmlinux
-/vmlinuz
-/System.map
-/Module.markers
-/Module.symvers
-
-#
-# git files that we don't want to ignore even it they are dot-files
-#
-!.gitignore
-!.mailmap
-
-#
-# Generated include files
-#
-include/config
-include/linux/version.h
-include/generated
-
-# stgit generated dirs
-patches-*
-
-# quilt's files
-patches
-series
-
-# cscope files
-cscope.*
-ncscope.*
-
-# gnu global files
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-
-# QT-Creator files
-Makefile.am.user
-pupnp.config
-pupnp.creator
-pupnp.creator.user
-pupnp.files
-pupnp.includes
-
-*.orig
-*~
-\#*#
-*.lo
-*.la
-Makefile
-Makefile.in
-aclocal.m4
-autoconfig.h
-autoconfig.h.in
-autom4te.cache/
-build-aux/
-config.log
-config.status
-configure
-libtool
-libupnp.pc
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-stamp-h1
-upnp/inc/stamp-h2
-upnp/inc/upnpconfig.h
-upnp/sample/tv_combo
-upnp/sample/tv_ctrlpt
-upnp/sample/tv_device
-upnp/unittest/unittest
-upnp/unittest/*.pp.c
-docs/doxygen
-
-
-/build/vc10/out.vc9.Win32/Debug
-/build/vc10/out.vc10.Win32
-/build/vc10/out.vc10.x64
-/pthreads
-/build/vc10/ipch
-/build/vc10/IUpnpErrFile.txt
-/build/vc10/IUpnpInfoFile.txt
-/build/vc10/*.opensdf

Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = libUPnP
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.8.0
+PROJECT_NUMBER         = 1.4.7
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -91,7 +91,7 @@ ABBREVIATE_BRIEF       =
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.
 
-ALWAYS_DETAILED_SEC    = YES
+ALWAYS_DETAILED_SEC    = NO
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
 # inherited members of a class in the documentation of that class as if those 
@@ -290,7 +290,7 @@ HIDE_IN_BODY_DOCS      = NO
 # to NO (the default) then the documentation will be excluded. 
 # Set it to YES to include the internal documentation.
 
-INTERNAL_DOCS          = YES
+INTERNAL_DOCS          = NO
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
 # file names in lower-case letters. If set to YES upper-case letters are also 
@@ -462,7 +462,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = upnp ixml threadutil
+INPUT                  = ./upnp ./ixml ./threadutil
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -995,7 +995,7 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = NO
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
@@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS SCRIPTSUPPORT EXCLUDE_GENA=0 EXCLUDE_DOM=0
+PREDEFINED             = 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

Makefile.am

@@ -1,7 +1,7 @@
 #
 # Top-level "Makefile.am" for libupnp
 #
-# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 ACLOCAL_AMFLAGS = -I m4
@@ -16,7 +16,6 @@ SUBDIRS = \
 
 
 EXTRA_DIST = \
-	Doxyfile \
 	libupnp.pc.in \
 	LICENSE \
 	THANKS \
@@ -26,23 +25,9 @@ EXTRA_DIST = \
 	build/libupnp.dsp \
 	build/libupnp.dsw \
 	build/inc/autoconfig.h \
+	build/inc/config.h \
 	build/inc/upnpconfig.h \
-	build/msvc/inttypes.h \
+	build/msvc/inttypes.h
-	build/msvc/stdint.h \
-	build/vc8/ixml.vcproj \
-	build/vc8/libupnp.sln \
-	build/vc8/libupnp.vcproj \
-	build/vc8/threadutil.vcproj \
-	build/vc8/tvcombo.vcproj \
-	build/vc8/tvctrlpt.vcproj \
-	build/vc8/tvdevice.vcproj \
-	build/vc9/ixml.vcproj \
-	build/vc9/libupnp.sln \
-	build/vc9/libupnp.vcproj \
-	build/vc9/threadutil.vcproj \
-	build/vc9/tvcombo.vcproj \
-	build/vc9/tvctrlpt.vcproj \
-	build/vc9/tvdevice.vcproj 
 
 
 # This variable must have 'exec' in its name, in order to be installed 

README

@@ -1,7 +1,7 @@
 Portable SDK for UPnP* Devices (libupnp)
 
 Copyright (c) 2000-2003 Intel Corporation - All Rights Reserved.
-Copyright (c) 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
+Copyright (c) 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
 Copyright (c) 2006 Michel Pfeiffer and others <virtual_worlds@gmx.de>
 
 See LICENSE for details.
@@ -17,7 +17,6 @@ sections:
 6.  Product Release Notes
 7.  New Features
 8.  Support and Contact Information
-9.  IXML support for scriptinglanguages
 
 
 1) Release Contents
@@ -228,18 +227,17 @@ To build the samples (note: this is the default behaviour):
 % ./configure --enable-samples
 % make
 
-will build the sample device "$(LIBUPNP)/upnp/tv_device" and
+will build the sample device "$(LIBUPNP)/upnp/upnp_tv_device" and
-sample control point "$(LIBUPNP)/upnp/tv_ctrlpt". 
+sample control point "$(LIBUPNP)/upnp/upnp_tv_ctrlpt". 
 Note : the sample device won't be built if --disable-device has been 
 configured, and the sample control point won't be build if --disable-client 
 has been configured.
 
-To run the sample device, you need to create a tvdevice directory and move
+To run the sample device, you need the "$(LIBUPNP)/upnp/sample/tvdevice/web" 
-the web directory there, giving: "$(LIBUPNP)/upnp/sample/tvdevice/web".
+sub-directory. Example :
-To run the sample invoke from the command line as follows:
 
 % cd $(LIBUPNP)/upnp/sample/tvdevice
-% ../tv_device
+% ../../upnp_tv_device
 
 
 
@@ -267,24 +265,12 @@ In order to build libupnp under Windows the pthreads-w32 package is required.
 You can download a self-extracting ZIP file from the following location:
 
 ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-2-7-0-release.exe
-or possibly newer versions if available.
 
 Execute the self-extracting archive and copy the Pre-build.2 folder to the
 top level source folder.
 Rename Pre-build.2 to pthreads. 
 Open the provided workspace build\libupnp.dsw with Visual C++ 6.0 and select
 Build->Build libupnp.dll (F7)
-In the build directory there are also VC8, VC9 and VC10 folders containing
-solution files for Visual Studio 2005/2008/2010 respectively.
-
-If you use newer versions to build libupnp, eg Visual Studio 2003 or later,
-then you need to rebuild the pthreads package so it uses the same VC runtime
-as libupnp to prevent cross boundary runtime problems
-(see http://msdn.microsoft.com/en-us/library/ms235460%28v=VS.100%29.aspx).
-Just replace the files in the Pre-build.2 folder (renamed to pthreads as
-mentioned above) with the newly build versions.
-If you also use a newer version of pthreads-win32 then you should also
-replace the header files in that directory structure (obviously).
 
 For building a static library instead of a DLL and for using the static
 pthreads-w32 library following switches need to be defined additionally:
@@ -344,54 +330,3 @@ us know.
 * Other brands, names, and trademarks are the property of their respective 
 owners.
 
-
-9.  IXML support for scriptinglanguages
--------------------------------------------
-The treestructure of XML documents created by IXML is hard to maintain when
-creating a binding for a scripting language. Even when many elements may 
-never be used on the script side, it requires copying the entire tree 
-structure once you start accessing elements several levels deep.
-Hence scriptsupport was added. To enable it compile while 
-IXML_HAVE_SCRIPTSUPPORT has been defined (enabled by default). 
-This allows control using only a list instead of a tree-like
-structure, and only nodes actually accessed need to be created instead of
-all the nodes in the tree.
-
-Here's how its supposed to work;
-* The scriptsupport allows you to add a callback when a node is freed on 
-  the C side, so appropriate action can be taken on the script side, see
-  function ixmlSetBeforeFree().
-* Instead of recreating the tree structure, an intermediate object should
-  be created only for the nodes actually accessed. The object should be
-  containing a pointer to the node and a 'valid flag' which is initially 
-  set to TRUE (the valid flag, can simply be the pointer to the node being 
-  NULL or not). Before creating the intermediate object, the custom tag 
-  'ctag' can be used to check whether one was already created.
-* the node object gets an extra 'void* ctag' field, a custom tag to make a
-  cross reference to the script side intermediate object. It can be set
-  using ixmlNode_setCTag(), and read using ixmlNode_getCTag(). Whenever
-  a new intermediate object is created, the ctag of the coirresponding
-  node should be set to point to this intermediate object.
-* The tree structure traversal is done on the C side (looking up parents, 
-  children and siblings)
-* Every intermediate object created should be kept in a list (preferably a 
-  key-value list, where the key is the pointer to the node and the value is 
-  the pointer to the intermediate object)
-* when the callback is called, the node should be looked up in the list, 
-  the flag set to false, the pointer to the C-side node be cleared and on
-  the C-side the ctag should be cleared.
-* whenever the intermediate object is accessed and its flag is set to False, 
-  an error should be thrown that the XML document has been closed.
-
-Freeing resources can be done in 2 ways, C side by simply calling the free 
-node methods, or script side by the garbage collector of the scriptengine. 
-Scriptside steps;
-* if the valid flag is set to False (XML document is closed), then the 
-  intermediate object can be destroyed, no further action
-* if the node has a parent, then the intermediate object can be destroyed 
-  after the ctag on the corresponding node has been cleared. Nothing needs
-  to be freed on the C-side.
-* if the node has no parent, then the node must be freed on the C side by 
-  calling the corresponding free node methods. This will result in a chain 
-  of callbacks closing the node and all underlying nodes.
-

THANKS

@@ -7,75 +7,36 @@ Here is a list of these people. Help us keep it complete and
 exempt of errors.
 
 - Alex (afaucher)
-- Andre Sodermans (wienerschnitzel)
-- Anoop Mohan (an00p)
-- Anthony Viallard (homer242)
-- Apostolos Syropoulos
 - Arno Willig
 - Bob Ciora
-- Carlo Parata
-- Carl Benson
-- Chandra Penke (inactiveneurons)
 - Chaos
-- Charles Nepveu (cnepveu)
-- Chris Pickel
-- Chuck Thomason (cyt4)
 - Craig Nelson
-- David Blanchet
 - David Maass
-- Dirk (dirk_vdb)
 - Emil Ljungdahl
 - Erik Johansson
 - Eric Tanguy
 - Erwan Velu
 - Eugene Christensen
-- Fabrice Fontaine (ffontaine)
+- Fabrice Fontaine
 - Fredrik Svensson
 - Glen Masgai
-- Gustavo Zacarias (gustavoz)
-- Hartmut Holzgraefe (hholzgra)
-- Iain Denniston (ectotropic)
-- Ingo Hofmann
-- Ivan Romanov (ivanromanov)
 - Jiri Zouhar
-- Jean-Francois Dockes (medoc)
 - John Dennis
-- Jonathan Casiot (no_dice)
+- Jonathan (no_dice)
-- Josh Carroll
-- Juergen Lock
 - Keith Brindley
 - Leuk_He
 - Loigu
-- Luke Kim (nereusuj)
+- Luke Kim
 - Marcelo Roberto Jimenez (mroberto)
 - Markus Strobl
-- Nektarios K. Papadopoulos (npapadop)
+- Nektarios K. Papadopoulos
-- Nicholas Kraft
-- Nick Leverton (leveret)
-- Obata Akio (obache)
 - Oskar Liljeblad
-- Michael (oxygenic)
+- Michael (Oxy)
 - Paul Vixie
-- Peng
-- Peter Hartley
-- Philipp Matthias Hahn
-- Pino Toscano (pinotree)
 - Rene Hexel
-- Robert Buckley (rbuckley)
-- Robert Gingher (robsbox)
-- Ronan Menard
-- Sebastian Brandt
-- Shaun Marko (semarko)
 - Siva Chandran
-- Stefan Sommerfeld (zerocom)
 - Stéphane Corthésy
 - Steve Bresson
-- Thijs Schreijer
 - Timothy Redaelli
 - Titus Winters
-- Tom (tomdev2)
-- Yoichi Nakayama (yoichi)
-- zephyrus (zephyrus00jp)
-- zexian chen
-- Zheng Peng (darkelf2010)
 

TODO

@@ -2,13 +2,28 @@
 To Be Done
 ==========
 
+- add FreeBSD patches
+  ( http://sf.net/tracker/index.php?func=detail&aid=1332618&group_id=7189&atid=307189 ?)
+
 - non-regression testing 
 
-- Why is NUM_HANDLE defined to 200 when we can register only:
+- replace doc++ by Doxygen for documentation generation
-  A) One client(1)
+
-  B) An IPv4 and IPv6 device (2)
+- incorporate public patches and fix reported bugs : 
-  NUM_HANDLE should be 3
+http://sourceforge.net/tracker/?group_id=7189&atid=107189 and 
+http://sourceforge.net/tracker/?group_id=7189&atid=307189
+
+- RPM packaging (a preliminary one here :
+    https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176617 )
+
+- make API clean for large files and 64 bits
+
+
+To Be Decided
+=============
+
+- IPV6 support ?
+
+
 
-- A sane way to implement the virtual directory callback initialization and checking
-against NULL pointers.
 

build/inc/autoconfig.h

@@ -2,7 +2,7 @@
 /* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 to compile debug code */
-#define DEBUG 1
+/* #undef DEBUG */
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #define HAVE_ARPA_INET_H 1
@@ -19,9 +19,15 @@
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
 
+/* Define to 1 if you have the `ftime' function. */
+#define HAVE_FTIME 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the `compat' library (-lcompat). */
+/* #undef HAVE_LIBCOMPAT */
+
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
@@ -49,12 +55,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Defines if strndup is available on your system */
-#define HAVE_STRNDUP 1
-
-/* Defines if strnlen is available on your system */
-#define HAVE_STRNLEN 1
-
 /* Define to 1 if you have the <syslog.h> header file. */
 #define HAVE_SYSLOG_H 1
 
@@ -67,6 +67,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
@@ -79,21 +82,11 @@
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
-/* Define to 1 if you have the <ws2tcpip.h> header file. */
-/* #undef HAVE_WS2TCPIP_H */
-
-/* see upnpconfig.h */
-#define IXML_HAVE_SCRIPTSUPPORT 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
 /* Define to 1 to prevent compilation of assert() */
-/* #undef NDEBUG */
+#define NDEBUG 1
 
 /* Define to 1 to prevent some debug code */
-/* #undef NO_DEBUG */
+#define NO_DEBUG 1
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 /* #undef NO_MINUS_C_MINUS_O */
@@ -108,16 +101,13 @@
 #define PACKAGE_NAME "libupnp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libupnp 1.8.0"
+#define PACKAGE_STRING "libupnp 1.4.7"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libupnp"
 
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.8.0"
+#define PACKAGE_VERSION "1.4.7"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -126,74 +116,44 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* see upnpconfig.h */
-#define UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS 1
-
-/* see upnpconfig.h */
-/* #undef UPNP_ENABLE_IPV6 */
-
-/* see upnpconfig.h */
-#define UPNP_ENABLE_NOTIFICATION_REORDERING 1
-
-/* see upnpconfig.h */
-/* #undef UPNP_ENABLE_OPEN_SSL */
-
-/* see upnpconfig.h */
-/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
-
 /* see upnpconfig.h */
 #define UPNP_HAVE_CLIENT 1
 
 /* see upnpconfig.h */
-#define UPNP_HAVE_DEBUG 1
+/* #undef UPNP_HAVE_DEBUG */
 
 /* see upnpconfig.h */
 #define UPNP_HAVE_DEVICE 1
 
-/* see upnpconfig.h */
-#define UPNP_HAVE_GENA 1
-
-/* see upnpconfig.h */
-#define UPNP_HAVE_OPTSSDP 1
-
-/* see upnpconfig.h */
-#define UPNP_HAVE_SOAP 1
-
-/* see upnpconfig.h */
-#define UPNP_HAVE_SSDP 1
-
 /* see upnpconfig.h */
 #define UPNP_HAVE_TOOLS 1
 
 /* see upnpconfig.h */
 #define UPNP_HAVE_WEBSERVER 1
 
-/* Do not use pthread_rwlock_t */
-#define UPNP_USE_RWLOCK 1
-
 /* see upnpconfig.h */
 #define UPNP_VERSION_MAJOR 1
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_MINOR 8
+#define UPNP_VERSION_MINOR 4
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_PATCH 0
+#define UPNP_VERSION_PATCH 7
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_STRING "1.8.0"
+#define UPNP_VERSION_STRING "1.4.7"
 
 /* Version number of package */
-#define VERSION "1.8.0"
+#define VERSION "1.4.7"
 
 /* File Offset size */
 #define _FILE_OFFSET_BITS 64
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#define _LARGEFILE_SOURCE 1
+/* #undef _LARGEFILE_SOURCE */
 
 /* Large files support */
-#define _LARGE_FILE_SOURCE /**/
+#define _LARGE_FILE_SOURCE 
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
@@ -204,5 +164,5 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-/* Type for storing the length of struct sockaddr */
+/* Substitute for socklen_t */
 /* #undef socklen_t */

build/inc/config.h

@@ -0,0 +1,343 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * 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. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "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 INTEL 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.
+//
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef INTERNAL_CONFIG_H
+#define INTERNAL_CONFIG_H 
+
+#include "autoconfig.h"
+
+
+/** @name Compile time configuration options
+ *  The Linux SDK for UPnP Devices contains some compile-time parameters 
+ *  that effect the behavior of the SDK.  All configuration options are 
+ *  located in {\tt src/inc/config.h}.
+ */
+ 
+//@{
+
+/** @name THREAD_IDLE_TIME
+ *  The {\tt THREAD_IDLE_TIME} constant determines when a thread will be
+ *  removed from the thread pool and returned to the operating system. When 
+ *  a thread in the thread pool has been idle for this number of milliseconds
+ *  the thread will be released from the thread pool.  The default value is
+ *  5000 milliseconds (5 seconds).
+ */
+
+//@{
+#define THREAD_IDLE_TIME 5000
+//@}
+
+/** @name JOBS_PER_THREAD
+ *  The {\tt JOBS_PER_THREAD} constant determines when a new thread will be
+ *  allocated to the thread pool inside the  SDK. The thread pool will
+ *  try and maintain this jobs/thread ratio. When the jobs/thread ratio 
+ *  becomes greater than this, then a new thread (up to the max) will be 
+ *  allocated to the thread pool.  The default ratio is 10 jobs/thread.
+ */
+
+//@{
+#define JOBS_PER_THREAD 10
+//@}
+
+/** @name MIN_THREADS
+ *  The {\tt MIN_THREADS} constant defines the minimum number of threads the
+ *  thread pool inside the SDK will create.  The thread pool will
+ *  always have this number of threads. These threads are used
+ *  for both callbacks into applications built on top of the SDK and also
+ *  for making connections to other control points and devices. This number
+ *  includes persistent threads.  The default value is two threads.
+ */
+
+//@{
+#define MIN_THREADS 2 
+//@}
+
+/** @name MAX_THREADS
+ *  The {\tt MAX_THREADS} constant defines the maximum number of threads the
+ *  thread pool inside the SDK will create.  These threads are used
+ *  for both callbacks into applications built on top of the library and also 
+ *  for making connections to other control points and devices.  It is not 
+ *  recommended that this value be below 10, since the threads are 
+ *  necessary for correct operation.  This value can be increased for greater
+ *  performance in operation at the expense of greater memory overhead.  The 
+ *  default value is 12.
+ */
+
+//@{
+#define MAX_THREADS 12 
+//@}
+
+/** @name MAX_JOBS_TOTAL
+ *  The {\tt MAX_JOBS_TOTAL} constant determines the maximum number of jobs
+ *  that can be queued. If this limit is reached further jobs will be thrown
+ *  to avoid memory exhaustion. The default value 100.
+ *  (Added by Axis.)
+ */
+
+//@{
+#define MAX_JOBS_TOTAL 100
+//@}
+
+/** @name DEFAULT_SOAP_CONTENT_LENGTH
+ * SOAP messages will read at most {\tt DEFAULT_SOAP_CONTENT_LENGTH} bytes.  
+ * This prevents devices that have a misbehaving web server to send 
+ * a large amount of data to the control point causing it to crash.  
+ * This can be adjusted dynamically with {\tt UpnpSetMaxContentLength}.
+ */
+//@{
+#define DEFAULT_SOAP_CONTENT_LENGTH 16000
+//@}
+
+/** @name NUM_SSDP_COPY
+ * This configuration parameter determines how many copies of each SSDP 
+ * advertisement and search packets will be sent. By default it will send two 
+ * copies of every packet.  
+ */
+//@{
+#define NUM_SSDP_COPY  2
+//@}
+
+/** @name SSDP_PAUSE
+ * This configuration parameter determines the pause between identical SSDP 
+ * advertisement and search packets. The pause is measured in milliseconds
+ * and defaults to 100.
+ */
+//@{
+#define SSDP_PAUSE  100
+//@}
+
+/** @name WEB_SERVER_BUF_SIZE 
+ * This configuration parameter sets the maximum buffer size for the 
+ * webserver.  The default value is 1MB.
+ */
+//@{
+#define WEB_SERVER_BUF_SIZE  (1024*1024)
+//@}
+
+/** @name AUTO_RENEW_TIME
+ * The {\tt AUTO_RENEW_TIME} is the time, in seconds, before a subscription
+ * expires that the SDK automatically resubscribes.  The default 
+ * value is 10 seconds.  Setting this value too low can result in the 
+ * subscription renewal not making it to the device in time, causing the 
+ * subscription to timeout. In order to avoid continually resubscribing
+ * the minimum subscription time is five seconds more than the auto renew
+ * time.
+ */
+
+//@{
+#define AUTO_RENEW_TIME 10
+//@}
+
+/** @name CP_MINIMUM_SUBSCRIPTION_TIME 
+ * The {\tt CP_MINIMUM_SUBSCRIPTION_TIME} is the minimum subscription time
+ * allowed for a control point using the SDK. Subscribing for less than
+ * this time automatically results in a subscription for this amount.  The 
+ * default value is 5 seconds more than the {\tt AUTO_RENEW_TIME}, or 15
+ * seconds.
+ */
+
+//@{
+#define CP_MINIMUM_SUBSCRIPTION_TIME (AUTO_RENEW_TIME + 5)
+//@}
+
+/** @name MAX_SEARCH_TIME 
+ * The {\tt MAX_SEARCH_TIME} is the maximum time
+ * allowed for an SSDP search by a control point. Searching for greater than
+ * this time automatically results in a search for this amount.  The default 
+ * value is 80 seconds.
+ */
+
+//@{
+#define MAX_SEARCH_TIME 80
+//@}
+
+/** @name MIN_SEARCH_TIME 
+ * The {\tt MIN_SEARCH_TIME} is the minimumm time
+ * allowed for an SSDP search by a control point. Searching for less than
+ * this time automatically results in a search for this amount.  The default 
+ * value is 2 seconds.
+ */
+
+//@{
+#define MIN_SEARCH_TIME 2
+//@}
+
+
+/** @name AUTO_ADVERTISEMENT_TIME
+ *  The {\tt AUTO_ADVERTISEMENT_TIME} is the time, in seconds, before an
+ *  device advertisements expires before a renewed advertisement is sent.
+ *  The default time is 30 seconds.
+ */
+
+//@{
+#define AUTO_ADVERTISEMENT_TIME 30
+//@}
+
+/** @name SSDP_PACKET_DISTRIBUTE
+ *  The {\tt SSDP_PACKET_DISTRIBUTE} enables the SSDP packets to be sent
+ *  at an interval equal to half of the expiration time of SSDP packets
+ *  minus the AUTO_ADVERTISEMENT_TIME. This is used to increase
+ *  the probability of SSDP packets reaching to control points.
+ *  It is recommended that this flag be turned on for embedded wireless 
+ *  devices.
+ */
+
+//@{
+#define SSDP_PACKET_DISTRIBUTE 1
+//@}
+
+/** @name Module Exclusion
+ *  Depending on the requirements, the user can selectively discard any of 
+ *  the major modules like SOAP, GENA, SSDP or the Internal web server. By 
+ *  default everything is included inside the SDK.  By setting any of
+ *  the values below to 0, that component will not be included in the final
+ *  SDK.
+ *  \begin{itemize}
+ *    \item {\tt EXCLUDE_SOAP[0,1]}
+ *    \item {\tt EXCLUDE_GENA[0,1]}
+ *    \item {\tt EXCLUDE_SSDP[0,1]}
+ *    \item {\tt EXCLUDE_DOM [0,1]}
+ *    \item {\tt EXCLUDE_MINISERVER[0,1]}
+ *    \item {\tt EXCLUDE_WEB_SERVER[0,1]}
+ *    \item {\tt EXCLUDE_JNI[0,1]}
+ *  \end{itemize}
+ *
+ */
+
+//@{
+#define EXCLUDE_SSDP 0
+#define EXCLUDE_SOAP 0
+#define EXCLUDE_GENA 0
+#define EXCLUDE_DOM  0
+#define EXCLUDE_MINISERVER 0
+#define EXCLUDE_WEB_SERVER 0
+#ifdef USE_JNI
+#	define EXCLUDE_JNI 0
+#else
+#	define EXCLUDE_JNI 1
+#endif
+//@}
+
+    
+/** @name DEBUG_TARGET
+ *  The user has the option to redirect the library output debug messages 
+ *  to either the screen or to a log file.  All the output messages with 
+ *  debug level 0 will go to {\tt upnp.err} and messages with debug level 
+ *  greater than zero will be redirected to {\tt upnp.out}.
+ */
+
+//@{
+#define DEBUG_TARGET		1   
+//@}
+
+
+/** @name Other debugging features
+          The UPnP SDK contains other features to aid in debugging:
+	  see <upnp/inc/upnpdebug.h>
+ */
+
+#define DEBUG_ALL		1
+#define DEBUG_SSDP		0
+#define DEBUG_SOAP		0
+#define DEBUG_GENA		0
+#define DEBUG_TPOOL		0
+#define DEBUG_MSERV		0
+#define DEBUG_DOM		0
+#define DEBUG_HTTP		0
+#define DEBUG_API		0
+
+//@} // Compile time configuration options
+
+
+/***************************************************************************
+ * Do not change, Internal purpose only!!! 
+ ***************************************************************************/ 
+
+//@{
+
+/*
+ * Set additional defines based on requested configuration 
+ */
+
+// configure --enable-client
+#if UPNP_HAVE_CLIENT
+#	define INCLUDE_CLIENT_APIS	1
+#endif
+
+// configure --enable-device
+#if UPNP_HAVE_DEVICE
+#	define INCLUDE_DEVICE_APIS	1
+#endif
+
+// configure --enable-webserver --enable-device
+#if UPNP_HAVE_WEBSERVER
+#	define INTERNAL_WEB_SERVER	1
+#endif
+
+
+
+#undef  EXCLUDE_WEB_SERVER 
+#undef  EXCLUDE_MINISERVER 
+#ifdef  INTERNAL_WEB_SERVER
+#	define EXCLUDE_WEB_SERVER 0
+#	define EXCLUDE_MINISERVER 0
+#else
+#	define EXCLUDE_WEB_SERVER 1
+#	define EXCLUDE_MINISERVER 1
+#endif
+
+#if EXCLUDE_GENA == 1 && EXCLUDE_SOAP == 1 && EXCLUDE_WEB_SERVER == 1
+#	undef  EXCLUDE_MINISERVER 
+#	define EXCLUDE_MINISERVER 1
+#	if INTERNAL_WEB_SERVER
+#		error "conflicting settings: use configure --disable-webserver"
+#	endif
+#endif
+
+#if EXCLUDE_GENA == 0 || EXCLUDE_SOAP == 0 || EXCLUDE_WEB_SERVER == 0
+#	undef  EXCLUDE_MINISERVER 
+#	define EXCLUDE_MINISERVER 0
+#	if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER
+#		error "conflicting settings : use configure --enable-webserver"
+#	endif
+#endif
+
+
+
+#ifdef INCLUDE_CLIENT_APIS
+#	define CLIENTONLY(x) x
+#else 
+#	define CLIENTONLY(x)
+#endif
+
+//@}
+#endif
+

build/inc/upnpconfig.h

@@ -1,35 +1,35 @@
 /* upnp/inc/upnpconfig.h.  Generated from upnpconfig.h.in by configure.  */
-/* -*- C -*- */
+// -*- C -*-
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
+// Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef UPNP_CONFIG_H
 #define UPNP_CONFIG_H 
@@ -40,39 +40,26 @@
  ***************************************************************************/ 
 
 /** The library version (string) e.g. "1.3.0" */
-#define UPNP_VERSION_STRING "1.8.0"
+#define UPNP_VERSION_STRING "1.4.7"
 
 /** Major version of the library */
 #define UPNP_VERSION_MAJOR 1
 
 /** Minor version of the library */
-#define UPNP_VERSION_MINOR 8
+#define UPNP_VERSION_MINOR 4
 
 /** Patch version of the library */
-#define UPNP_VERSION_PATCH 0
+#define UPNP_VERSION_PATCH 7
 
 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
-  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
+  ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH)
 
 
 
-/***************************************************************************
- * Large file support
- ***************************************************************************/
-
-/** File Offset size */
-#define _FILE_OFFSET_BITS 64
-
-/** Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#define _LARGEFILE_SOURCE 1
-
-/** Large files support */
-#define _LARGE_FILE_SOURCE /**/
-
 /***************************************************************************
  * Library optional features
- ***************************************************************************/
+ ***************************************************************************/ 
 
 /*
  * The following defines can be tested in order to know which 
@@ -82,7 +69,7 @@
 
 /** Defined to 1 if the library has been compiled with DEBUG enabled 
  *  (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */
-#define UPNP_HAVE_DEBUG 1
+/* #undef UPNP_HAVE_DEBUG */
 
 
 /** Defined to 1 if the library has been compiled with client API enabled 
@@ -100,41 +87,11 @@
 #define UPNP_HAVE_WEBSERVER 1
 
 
-/** Defined to 1 if the library has been compiled with the SSDP part enabled
- *  (i.e. configure --enable-ssdp) */
-#define UPNP_HAVE_SSDP 1
-
-
-/** Defined to 1 if the library has been compiled with optional SSDP headers
- *  support (i.e. configure --enable-optssdp) */
-#define UPNP_HAVE_OPTSSDP 1
-
-
-/** Defined to 1 if the library has been compiled with the SOAP part enabled
- *  (i.e. configure --enable-soap) */
-#define UPNP_HAVE_SOAP 1
-
-
-/** Defined to 1 if the library has been compiled with the GENA part enabled
- *  (i.e. configure --enable-gena) */
-#define UPNP_HAVE_GENA 1
-
-
 /** Defined to 1 if the library has been compiled with helper API
  *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
 #define UPNP_HAVE_TOOLS 1
 
-/** Defined to 1 if the library has been compiled with ipv6 support
- *  (i.e. configure --enable-ipv6) */
-/* #undef UPNP_ENABLE_IPV6 */
 
-/** Defined to 1 if the library has been compiled with unspecified SERVER
+#endif // UPNP_CONFIG_H
- * header (i.e. configure --enable-unspecified_server) */
-/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
 
-/** Defined to 1 if the library has been compiled with OpenSSL support
- *  (i.e. configure --enable-open_ssl) */
-/* #undef UPNP_ENABLE_OPEN_SSL */
-
-#endif /* UPNP_CONFIG_H */
 

build/libupnp.dsp

@@ -5,17 +5,17 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 CFG=libupnp - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak".
 !MESSAGE 
-!MESSAGE Sie können beim Ausf?hren von NMAKE eine Konfiguration angeben
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
 !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak" CFG="libupnp - Win32 Debug"
 !MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
 !MESSAGE 
 !MESSAGE "libupnp - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libupnp - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
@@ -389,6 +389,10 @@ SOURCE=..\upnp\src\inc\upnpapi.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\upnp\src\inc\upnpclosesocket.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\upnp\src\inc\uri.h
 # End Source File
 # Begin Source File

build/msvc/stdint.h

@@ -1,222 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006 Alexander Chemeris
-// 
-// 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. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if (_MSC_VER < 1300) && defined(__cplusplus)
-   extern "C++" {
-#endif 
-#     include <wchar.h>
-#if (_MSC_VER < 1300) && defined(__cplusplus)
-   }
-#endif
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-typedef __int8            int8_t;
-typedef __int16           int16_t;
-typedef __int32           int32_t;
-typedef __int64           int64_t;
-typedef unsigned __int8   uint8_t;
-typedef unsigned __int16  uint16_t;
-typedef unsigned __int32  uint32_t;
-typedef unsigned __int64  uint64_t;
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef __int64           intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef int               intptr_t;
-   typedef unsigned int      uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C   INT64_C
-#define UINTMAX_C  UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]

build/vc10/.gitignore

@@ -1,4 +0,0 @@
-
-*.suo
-*.user
-*.sdf

build/vc10/ixml.vcxproj

@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Lib|Win32">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Lib|x64">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|Win32">
-      <Configuration>Release Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|x64">
-      <Configuration>Release Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C2C266D-35A3-465F-A297-0E21D54E5C89}</ProjectGuid>
-    <RootNamespace>ixml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">true</EnableManagedIncrementalBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">true</EnableManagedIncrementalBuild>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;IXML_HAVE_SCRIPTSUPPORT;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <BuildLog>
-      <Path>$(IntDir)$(MSBuildProjectName).log</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;IXML_HAVE_SCRIPTSUPPORT;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>IXML_HAVE_SCRIPTSUPPORT;DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>IXML_HAVE_SCRIPTSUPPORT;WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\ixml\src\attr.c" />
-    <ClCompile Include="..\..\ixml\src\document.c" />
-    <ClCompile Include="..\..\ixml\src\element.c" />
-    <ClCompile Include="..\..\ixml\src\ixml.c" />
-    <ClCompile Include="..\..\ixml\src\ixmldebug.c" />
-    <ClCompile Include="..\..\ixml\src\ixmlmembuf.c" />
-    <ClCompile Include="..\..\ixml\src\ixmlparser.c" />
-    <ClCompile Include="..\..\ixml\src\namedNodeMap.c" />
-    <ClCompile Include="..\..\ixml\src\node.c" />
-    <ClCompile Include="..\..\ixml\src\nodeList.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\ixml\inc\ixml.h" />
-    <ClInclude Include="..\..\ixml\inc\ixmldebug.h" />
-    <ClInclude Include="..\..\ixml\src\inc\ixmlmembuf.h" />
-    <ClInclude Include="..\..\ixml\src\inc\ixmlparser.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/vc10/ixml.vcxproj.filters

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\ixml\src\attr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\document.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\element.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\ixml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\ixmldebug.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\ixmlmembuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\ixmlparser.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\namedNodeMap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\node.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ixml\src\nodeList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\ixml\inc\ixml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ixml\inc\ixmldebug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ixml\src\inc\ixmlmembuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ixml\src\inc\ixmlparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

build/vc10/libupnp.sln

@@ -1,147 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcxproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcxproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcxproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcxproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcxproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcxproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55AF07A8-18AA-45B8-A231-5082F1C6FC08}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\AUTHORS = ..\..\AUTHORS
-		..\..\bootstrap = ..\..\bootstrap
-		..\..\ChangeLog = ..\..\ChangeLog
-		..\..\configure.ac = ..\..\configure.ac
-		..\..\COPYING = ..\..\COPYING
-		..\..\Doxyfile = ..\..\Doxyfile
-		..\..\INSTALL = ..\..\INSTALL
-		..\..\libupnp.pc.in = ..\..\libupnp.pc.in
-		..\..\libupnp.spec = ..\..\libupnp.spec
-		..\..\LICENSE = ..\..\LICENSE
-		..\..\Makefile.am = ..\..\Makefile.am
-		..\..\NEWS = ..\..\NEWS
-		..\..\README = ..\..\README
-		..\..\THANKS = ..\..\THANKS
-		..\..\TODO = ..\..\TODO
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Lib|Win32 = Debug Lib|Win32
-		Debug Lib|x64 = Debug Lib|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release Lib|Win32 = Release Lib|Win32
-		Release Lib|x64 = Release Lib|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.Build.0 = Release Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.ActiveCfg = Release|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.Build.0 = Release|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.Build.0 = Debug|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.ActiveCfg = Debug|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.Build.0 = Debug|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.Build.0 = Release Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.ActiveCfg = Release|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.Build.0 = Release|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.ActiveCfg = Release|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.Build.0 = Release|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.Build.0 = Debug|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.ActiveCfg = Debug|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.Build.0 = Debug|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.Build.0 = Release Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.ActiveCfg = Release|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.Build.0 = Release|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.ActiveCfg = Release|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.Build.0 = Release|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.Build.0 = Debug|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.ActiveCfg = Debug|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.Build.0 = Debug|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.Build.0 = Release Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.ActiveCfg = Release|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.Build.0 = Release|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.ActiveCfg = Release|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.Build.0 = Release|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.Build.0 = Debug|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.ActiveCfg = Debug|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.Build.0 = Debug|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.Build.0 = Release Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.ActiveCfg = Release|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.Build.0 = Release|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.ActiveCfg = Release|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.Build.0 = Release|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.Build.0 = Debug|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.ActiveCfg = Debug|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.Build.0 = Debug|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.Build.0 = Release Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.ActiveCfg = Release|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.Build.0 = Release|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.ActiveCfg = Release|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

build/vc10/libupnp.vcxproj

@@ -1,691 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Lib|Win32">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Lib|x64">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|Win32">
-      <Configuration>Release Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|x64">
-      <Configuration>Release Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6227F51A-1498-4C4A-B213-F6FDED605125}</ProjectGuid>
-    <RootNamespace>libupnp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>IXML_HAVE_SCRIPTSUPPORT;WIN32;NDEBUG;RELEASE;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>pthreadvc2.lib;ws2_32.lib;iphlpapi.lib;ixml.lib;threadutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/libupnp.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-      <Message>Add pthreadVC2.dll to output</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\inc;$(SolutionDir)\..\msvc;$(SolutionDir)\..\..\upnp\inc;$(SolutionDir)\..\..\upnp\src\inc;$(SolutionDir)\..\..\ixml\inc;$(SolutionDir)\..\..\ixml\src\inc;$(SolutionDir)\..\..\threadutil\inc;$(SolutionDir)\..\..\pthreads;$(SolutionDir)\..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>pthreadvc2.lib;ws2_32.lib;iphlpapi.lib;ixml.lib;threadutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/libupnp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>IXML_HAVE_SCRIPTSUPPORT;DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>pthreadvc2.lib;ws2_32.lib;iphlpapi.lib;ixml.lib;threadutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(OutDir)libupnp.bsc</OutputFile>
-    </Bscmake>
-    <BuildLog>
-      <Path>$(IntDir)$(MSBuildProjectName).log</Path>
-    </BuildLog>
-    <PostBuildEvent />
-    <PostBuildEvent>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\inc;$(SolutionDir)\..\msvc;$(SolutionDir)\..\..\upnp\inc;$(SolutionDir)\..\..\upnp\src\inc;$(SolutionDir)\..\..\ixml\inc;$(SolutionDir)\..\..\ixml\src\inc;$(SolutionDir)\..\..\threadutil\inc;$(SolutionDir)\..\..\pthreads;$(SolutionDir)\..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>pthreadvc2.lib;ws2_32.lib;iphlpapi.lib;ixml.lib;threadutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(OutDir)libupnp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>IXML_HAVE_SCRIPTSUPPORT;WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(OutDir)libupnp.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\inc;$(SolutionDir)\..\msvc;$(SolutionDir)\..\..\upnp\inc;$(SolutionDir)\..\..\upnp\src\inc;$(SolutionDir)\..\..\ixml\inc;$(SolutionDir)\..\..\ixml\src\inc;$(SolutionDir)\..\..\threadutil\inc;$(SolutionDir)\..\..\pthreads;$(SolutionDir)\..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(OutDir)libupnp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>IXML_HAVE_SCRIPTSUPPORT;WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/libupnp.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\inc;$(SolutionDir)\..\msvc;$(SolutionDir)\..\..\upnp\inc;$(SolutionDir)\..\..\upnp\src\inc;$(SolutionDir)\..\..\ixml\inc;$(SolutionDir)\..\..\ixml\src\inc;$(SolutionDir)\..\..\threadutil\inc;$(SolutionDir)\..\..\pthreads;$(SolutionDir)\..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0407</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/libupnp.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\src\api\ActionComplete.c" />
-    <ClCompile Include="..\..\upnp\src\api\ActionRequest.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\client_table\client_table.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\client_table\ClientSubscription.c" />
-    <ClCompile Include="..\..\upnp\src\api\Discovery.c" />
-    <ClCompile Include="..\..\upnp\src\api\Event.c" />
-    <ClCompile Include="..\..\upnp\src\api\EventSubscribe.c" />
-    <ClCompile Include="..\..\upnp\src\api\FileInfo.c" />
-    <ClCompile Include="..\..\upnp\src\gena\gena_callback2.c" />
-    <ClCompile Include="..\..\upnp\src\gena\gena_ctrlpt.c" />
-    <ClCompile Include="..\..\upnp\src\gena\gena_device.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\httpparser.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\httpreadwrite.c" />
-    <ClCompile Include="..\..\upnp\src\uuid\md5.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\util\membuffer.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\miniserver\miniserver.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\parsetools.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\service_table\service_table.c" />
-    <ClCompile Include="..\..\upnp\src\soap\soap_common.c" />
-    <ClCompile Include="..\..\upnp\src\soap\soap_ctrlpt.c" />
-    <ClCompile Include="..\..\upnp\src\soap\soap_device.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\sock.c" />
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_ctrlpt.c" />
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_device.c" />
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_ResultData.c" />
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_server.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\statcodes.c" />
-    <ClCompile Include="..\..\upnp\src\api\StateVarComplete.c" />
-    <ClCompile Include="..\..\upnp\src\api\StateVarRequest.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\util\strintmap.c" />
-    <ClCompile Include="..\..\upnp\src\api\SubscriptionRequest.c" />
-    <ClCompile Include="..\..\upnp\src\uuid\sysdep.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\util\upnp_timeout.c" />
-    <ClCompile Include="..\..\upnp\src\api\upnpapi.c" />
-    <ClCompile Include="..\..\upnp\src\api\upnpdebug.c" />
-    <ClCompile Include="..\..\upnp\src\api\UpnpString.c" />
-    <ClCompile Include="..\..\upnp\src\api\upnptools.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\uri\uri.c" />
-    <ClCompile Include="..\..\upnp\src\urlconfig\urlconfig.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\util\util.c" />
-    <ClCompile Include="..\..\upnp\src\uuid\uuid.c" />
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\webserver.c" />
-    <ClCompile Include="..\..\upnp\src\win_dll.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\inc\ActionComplete.h" />
-    <ClInclude Include="..\..\upnp\inc\ActionRequest.h" />
-    <ClInclude Include="..\inc\autoconfig.h" />
-    <ClInclude Include="..\..\upnp\inc\Callback.h" />
-    <ClInclude Include="..\..\upnp\src\inc\client_table.h" />
-    <ClInclude Include="..\..\upnp\src\inc\config.h" />
-    <ClInclude Include="..\..\upnp\inc\Discovery.h" />
-    <ClInclude Include="..\..\upnp\inc\Event.h" />
-    <ClInclude Include="..\..\upnp\inc\EventSubscribe.h" />
-    <ClInclude Include="..\..\upnp\inc\FileInfo.h" />
-    <ClInclude Include="..\..\upnp\src\inc\gena.h" />
-    <ClInclude Include="..\..\upnp\src\inc\gena_ctrlpt.h" />
-    <ClInclude Include="..\..\upnp\src\inc\gena_device.h" />
-    <ClInclude Include="..\..\upnp\src\inc\global.h" />
-    <ClInclude Include="..\..\upnp\src\inc\gmtdate.h" />
-    <ClInclude Include="..\..\upnp\src\inc\httpparser.h" />
-    <ClInclude Include="..\..\upnp\src\inc\httpreadwrite.h" />
-    <ClInclude Include="..\msvc\inttypes.h" />
-    <ClInclude Include="..\..\upnp\src\inc\md5.h" />
-    <ClInclude Include="..\..\upnp\src\inc\membuffer.h" />
-    <ClInclude Include="..\..\upnp\src\inc\miniserver.h" />
-    <ClInclude Include="..\..\upnp\src\inc\netall.h" />
-    <ClInclude Include="..\..\upnp\src\inc\parsetools.h" />
-    <ClInclude Include="..\..\upnp\src\inc\server.h" />
-    <ClInclude Include="..\..\upnp\src\inc\service_table.h" />
-    <ClInclude Include="..\..\upnp\src\inc\soaplib.h" />
-    <ClInclude Include="..\..\upnp\src\inc\sock.h" />
-    <ClInclude Include="..\..\upnp\src\ssdp\ssdp_ResultData.h" />
-    <ClInclude Include="..\..\upnp\src\inc\ssdplib.h" />
-    <ClInclude Include="..\..\upnp\src\inc\statcodes.h" />
-    <ClInclude Include="..\..\upnp\inc\StateVarComplete.h" />
-    <ClInclude Include="..\..\upnp\inc\StateVarRequest.h" />
-    <ClInclude Include="..\..\upnp\src\inc\statuscodes.h" />
-    <ClInclude Include="..\msvc\stdint.h" />
-    <ClInclude Include="..\..\upnp\src\inc\strintmap.h" />
-    <ClInclude Include="..\..\upnp\inc\SubscriptionRequest.h" />
-    <ClInclude Include="..\..\upnp\src\inc\sysdep.h" />
-    <ClInclude Include="..\..\upnp\inc\TemplateInclude.h" />
-    <ClInclude Include="..\..\upnp\inc\TemplateSource.h" />
-    <ClInclude Include="..\..\upnp\inc\TemplateUndef.h" />
-    <ClInclude Include="..\..\upnp\src\inc\unixutil.h" />
-    <ClInclude Include="..\..\upnp\inc\upnp.h" />
-    <ClInclude Include="..\..\upnp\src\inc\upnp_timeout.h" />
-    <ClInclude Include="..\..\upnp\src\inc\upnpapi.h" />
-    <ClInclude Include="..\inc\upnpconfig.h" />
-    <ClInclude Include="..\..\upnp\inc\upnpdebug.h" />
-    <ClInclude Include="..\..\upnp\inc\UpnpGlobal.h" />
-    <ClInclude Include="..\..\upnp\inc\UpnpInet.h" />
-    <ClInclude Include="..\..\upnp\inc\UpnpIntTypes.h" />
-    <ClInclude Include="..\..\upnp\inc\UpnpStdInt.h" />
-    <ClInclude Include="..\..\upnp\inc\UpnpString.h" />
-    <ClInclude Include="..\..\upnp\inc\upnptools.h" />
-    <ClInclude Include="..\..\upnp\inc\UpnpUniStd.h" />
-    <ClInclude Include="..\..\upnp\src\inc\upnputil.h" />
-    <ClInclude Include="..\..\upnp\src\inc\uri.h" />
-    <ClInclude Include="..\..\upnp\src\inc\urlconfig.h" />
-    <ClInclude Include="..\..\upnp\src\inc\uuid.h" />
-    <ClInclude Include="..\..\upnp\src\inc\VirtualDir.h" />
-    <ClInclude Include="..\..\upnp\src\inc\webserver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ixml.vcxproj">
-      <Project>{9c2c266d-35a3-465f-a297-0e21d54e5c89}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="threadutil.vcxproj">
-      <Project>{1d3eef7a-d248-48c0-b6b5-eca229fe4b3d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/vc10/libupnp.vcxproj.filters

@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="sources">
-      <UniqueIdentifier>{47d40159-145c-4ff3-98f5-9b2c96c80092}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="headers">
-      <UniqueIdentifier>{2a8d348a-a429-4b41-9934-050df3866f50}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\src\api\ActionComplete.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\ActionRequest.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\client_table\client_table.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\client_table\ClientSubscription.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\Discovery.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\Event.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\EventSubscribe.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\FileInfo.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\gena\gena_callback2.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\gena\gena_ctrlpt.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\gena\gena_device.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\httpparser.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\httpreadwrite.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\uuid\md5.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\util\membuffer.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\miniserver\miniserver.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\parsetools.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\service_table\service_table.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\soap\soap_common.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\soap\soap_ctrlpt.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\soap\soap_device.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\sock.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_ctrlpt.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_device.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_ResultData.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\ssdp\ssdp_server.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\statcodes.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\StateVarComplete.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\StateVarRequest.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\util\strintmap.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\SubscriptionRequest.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\uuid\sysdep.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\util\upnp_timeout.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\upnpapi.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\upnpdebug.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\UpnpString.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\api\upnptools.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\uri\uri.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\urlconfig\urlconfig.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\util\util.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\uuid\uuid.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\genlib\net\http\webserver.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\src\win_dll.c">
-      <Filter>sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\inc\ActionComplete.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\ActionRequest.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\inc\autoconfig.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\Callback.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\client_table.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\config.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\Discovery.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\Event.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\EventSubscribe.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\FileInfo.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\gena.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\gena_ctrlpt.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\gena_device.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\global.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\gmtdate.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\httpparser.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\httpreadwrite.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\msvc\inttypes.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\md5.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\membuffer.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\miniserver.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\netall.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\parsetools.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\server.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\service_table.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\soaplib.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\sock.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\ssdp\ssdp_ResultData.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\ssdplib.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\statcodes.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\StateVarComplete.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\StateVarRequest.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\statuscodes.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\msvc\stdint.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\strintmap.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\SubscriptionRequest.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\sysdep.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\TemplateInclude.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\TemplateSource.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\TemplateUndef.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\unixutil.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\upnp.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\upnp_timeout.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\upnpapi.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\inc\upnpconfig.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\upnpdebug.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\UpnpGlobal.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\UpnpInet.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\UpnpIntTypes.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\UpnpStdInt.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\UpnpString.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\upnptools.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\inc\UpnpUniStd.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\upnputil.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\uri.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\urlconfig.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\uuid.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\VirtualDir.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\src\inc\webserver.h">
-      <Filter>headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

build/vc10/threadutil.vcxproj

@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Lib|Win32">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Lib|x64">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|Win32">
-      <Configuration>Release Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|x64">
-      <Configuration>Release Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}</ProjectGuid>
-    <RootNamespace>threadutil</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <BuildLog>
-      <Path>$(IntDir)$(MSBuildProjectName).log</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\threadutil\src\FreeList.c" />
-    <ClCompile Include="..\..\threadutil\src\LinkedList.c" />
-    <ClCompile Include="..\..\threadutil\src\ThreadPool.c" />
-    <ClCompile Include="..\..\threadutil\src\TimerThread.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\threadutil\inc\FreeList.h" />
-    <ClInclude Include="..\..\threadutil\inc\ithread.h" />
-    <ClInclude Include="..\..\threadutil\inc\LinkedList.h" />
-    <ClInclude Include="..\..\threadutil\inc\threadpool.h" />
-    <ClInclude Include="..\..\threadutil\inc\TimerThread.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/vc10/threadutil.vcxproj.filters

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\threadutil\src\FreeList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\threadutil\src\LinkedList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\threadutil\src\ThreadPool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\threadutil\src\TimerThread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\threadutil\inc\FreeList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\threadutil\inc\ithread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\threadutil\inc\LinkedList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\threadutil\inc\threadpool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\threadutil\inc\TimerThread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

build/vc10/tvcombo.vcxproj

@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Lib|Win32">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Lib|x64">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|Win32">
-      <Configuration>Release Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|x64">
-      <Configuration>Release Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6365804B-22C6-4D5E-91F3-0C052EB55B4F}</ProjectGuid>
-    <RootNamespace>tvcombo</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <BuildLog>
-      <Path>$(IntDir)$(MSBuildProjectName).log</Path>
-    </BuildLog>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\sample\common\sample_util.c" />
-    <ClCompile Include="..\..\upnp\sample\linux\tv_combo_main.c" />
-    <ClCompile Include="..\..\upnp\sample\common\tv_ctrlpt.c" />
-    <ClCompile Include="..\..\upnp\sample\common\tv_device.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\sample\common\sample_util.h" />
-    <ClInclude Include="..\..\upnp\sample\common\tv_ctrlpt.h" />
-    <ClInclude Include="..\..\upnp\sample\common\tv_device.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libupnp.vcxproj">
-      <Project>{6227f51a-1498-4c4a-b213-f6fded605125}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/vc10/tvcombo.vcxproj.filters

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\sample\common\sample_util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\linux\tv_combo_main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\common\tv_ctrlpt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\common\tv_device.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\sample\common\sample_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\sample\common\tv_ctrlpt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\sample\common\tv_device.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

build/vc10/tvctrlpt.vcxproj

@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Lib|Win32">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Lib|x64">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|Win32">
-      <Configuration>Release Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|x64">
-      <Configuration>Release Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}</ProjectGuid>
-    <RootNamespace>sample</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <BuildLog>
-      <Path>$(IntDir)$(MSBuildProjectName).log</Path>
-    </BuildLog>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\sample\common\sample_util.c" />
-    <ClCompile Include="..\..\upnp\sample\common\tv_ctrlpt.c" />
-    <ClCompile Include="..\..\upnp\sample\linux\tv_ctrlpt_main.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\sample\common\sample_util.h" />
-    <ClInclude Include="..\..\upnp\sample\common\tv_ctrlpt.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libupnp.vcxproj">
-      <Project>{6227f51a-1498-4c4a-b213-f6fded605125}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/vc10/tvctrlpt.vcxproj.filters

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\sample\common\sample_util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\common\tv_ctrlpt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\linux\tv_ctrlpt_main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\sample\common\sample_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\sample\common\tv_ctrlpt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

build/vc10/tvdevice.vcxproj

@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Lib|Win32">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Lib|x64">
-      <Configuration>Debug Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|Win32">
-      <Configuration>Release Lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Lib|x64">
-      <Configuration>Release Lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}</ProjectGuid>
-    <RootNamespace>tvdevice</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <BuildLog>
-      <Path>$(IntDir)$(MSBuildProjectName).log</Path>
-    </BuildLog>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(SolutionDir)..\..\pthreads\lib\pthread*.dll" "$(OutDir)"
-mkdir "$(OutDir)web"
-xcopy "$(SolutionDir)..\..\upnp\sample\web" "$(OutDir)web" /S /E /Y
-</Command>
-      <Message>Copy sample web folder and pthreadVC2.dll to output dir</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\sample\common\sample_util.c" />
-    <ClCompile Include="..\..\upnp\sample\common\tv_device.c" />
-    <ClCompile Include="..\..\upnp\sample\linux\tv_device_main.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\sample\common\sample_util.h" />
-    <ClInclude Include="..\..\upnp\sample\common\tv_device.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libupnp.vcxproj">
-      <Project>{6227f51a-1498-4c4a-b213-f6fded605125}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\upnp\sample\web\tvcombodesc.xml" />
-    <None Include="..\..\upnp\sample\web\tvcontrolSCPD.xml" />
-    <None Include="..\..\upnp\sample\web\tvdevicedesc.xml" />
-    <None Include="..\..\upnp\sample\web\tvdevicepres.html" />
-    <None Include="..\..\upnp\sample\web\tvpictureSCPD.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/vc10/tvdevice.vcxproj.filters

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="SampleDeviceXMLs">
-      <UniqueIdentifier>{3953a023-20c4-4d35-860e-ec802019076c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\upnp\sample\common\sample_util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\common\tv_device.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\upnp\sample\linux\tv_device_main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\upnp\sample\common\sample_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\upnp\sample\common\tv_device.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\upnp\sample\web\tvcombodesc.xml">
-      <Filter>SampleDeviceXMLs</Filter>
-    </None>
-    <None Include="..\..\upnp\sample\web\tvcontrolSCPD.xml">
-      <Filter>SampleDeviceXMLs</Filter>
-    </None>
-    <None Include="..\..\upnp\sample\web\tvdevicedesc.xml">
-      <Filter>SampleDeviceXMLs</Filter>
-    </None>
-    <None Include="..\..\upnp\sample\web\tvdevicepres.html">
-      <Filter>SampleDeviceXMLs</Filter>
-    </None>
-    <None Include="..\..\upnp\sample\web\tvpictureSCPD.xml">
-      <Filter>SampleDeviceXMLs</Filter>
-    </None>
-  </ItemGroup>
-</Project>

build/vc8/ixml.vcproj

@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ixml"
-	ProjectGUID="{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
-	RootNamespace="ixml"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;DEBUG;IXML_INLINE="
-				RuntimeLibrary="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\ixml\src\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\document.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\element.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmldebug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlmembuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlparser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\namedNodeMap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\node.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\nodeList.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\ixml\inc\ixml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\inc\ixmldebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc8/libupnp.sln

@@ -1,65 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcproj", "{24884928-0501-4CF2-BC8A-180AFC23B2AF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcproj", "{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcproj", "{F592B023-E1F3-4A1E-841E-662DEE497435}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF} = {24884928-0501-4CF2-BC8A-180AFC23B2AF}
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427} = {AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcproj", "{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427} = {AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF} = {24884928-0501-4CF2-BC8A-180AFC23B2AF}
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj", "{B5D74697-F615-4DCB-AA8B-935F6372F01C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF} = {24884928-0501-4CF2-BC8A-180AFC23B2AF}
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427} = {AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Debug|Win32.Build.0 = Debug|Win32
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Release|Win32.ActiveCfg = Release|Win32
-		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Release|Win32.Build.0 = Release|Win32
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Debug|Win32.Build.0 = Debug|Win32
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Release|Win32.ActiveCfg = Release|Win32
-		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Release|Win32.Build.0 = Release|Win32
-		{F592B023-E1F3-4A1E-841E-662DEE497435}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F592B023-E1F3-4A1E-841E-662DEE497435}.Debug|Win32.Build.0 = Debug|Win32
-		{F592B023-E1F3-4A1E-841E-662DEE497435}.Release|Win32.ActiveCfg = Release|Win32
-		{F592B023-E1F3-4A1E-841E-662DEE497435}.Release|Win32.Build.0 = Release|Win32
-		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Debug|Win32.Build.0 = Debug|Win32
-		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Release|Win32.ActiveCfg = Release|Win32
-		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Release|Win32.Build.0 = Release|Win32
-		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Debug|Win32.Build.0 = Debug|Win32
-		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Release|Win32.ActiveCfg = Release|Win32
-		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

build/vc8/libupnp.vcproj

@@ -1,654 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libupnp"
-	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
-	RootNamespace="libupnp"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/libupnp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/libupnp.pch"
-				AssemblerListingLocation="$(OutDir)\"
-				ObjectFile="$(OutDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib  iphlpapi.lib"
-				OutputFile="$(OutDir)\libupnp.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
-				ImportLibrary="$(OutDir)\libupnp.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)\libupnp.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/libupnp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
-				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile="$(OutDir)\libupnp.pch"
-				AssemblerListingLocation="$(OutDir)\"
-				ObjectFile="$(OutDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib"
-				OutputFile="$(OutDir)\libupnp.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)\..\ixml"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
-				ImportLibrary="$(OutDir)\libupnp.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)\libupnp.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="sources"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\upnp\src\api\ActionComplete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\ActionRequest.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\client_table\ClientSubscription.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\Discovery.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\document.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\element.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\Event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\EventSubscribe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\FileInfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\FreeList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\gena\gena_callback2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\gena\gena_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\gena\gena_device.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\http\httpparser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\http\httpreadwrite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inet_pton.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlmembuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlparser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\LinkedList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\uuid\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\util\membuffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\miniserver\miniserver.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\namedNodeMap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\node.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\nodeList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\http\parsetools.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\service_table\service_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\soap\soap_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\soap\soap_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\soap\soap_device.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\sock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_device.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_server.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\http\statcodes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\StateVarComplete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\StateVarRequest.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\util\strintmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\SubscriptionRequest.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\uuid\sysdep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\ThreadPool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\TimerThread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\util\upnp_timeout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\upnpapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\upnpdebug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\UpnpString.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\upnptools.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\uri\uri.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\urlconfig\urlconfig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\util\util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\uuid\uuid.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\genlib\net\http\webserver.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\win_dll.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="headers"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\upnp\inc\ActionComplete.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\actionrequest.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\client_table.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\discovery.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\Event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\EventSubscribe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\FileInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\gena.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\gena_ctrlpt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\gena_device.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\global.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\gmtdate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\http_client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\httpparser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\httpreadwrite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\inet_pton.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\md5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\membuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\miniserver.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\netall.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\parsetools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\server.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\service_table.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\soaplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\sock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\ssdplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\statcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\StateVarComplete.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\statevarrequest.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\statuscodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\strintmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\sysdep.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\unixutil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\upnpapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnpdebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnptools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\uri.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\urlconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\utilall.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\uuid.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\webserver.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\..\..\libupnp_win32.patch"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc8/threadutil.vcproj

@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="threadutil"
-	ProjectGUID="{24884928-0501-4CF2-BC8A-180AFC23B2AF}"
-	RootNamespace="threadutil"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="pthreadVC2.lib"
-				AdditionalLibraryDirectories="..\..\pthreads\lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;UPNP_USE_MSVCPP"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\threadutil\src\FreeList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\LinkedList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\ThreadPool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\TimerThread.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\threadutil\inc\FreeList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\ithread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\LinkedList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\ThreadPool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\TimerThread.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc8/tvcombo.vcproj

@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="tvcombo"
-	ProjectGUID="{B5D74697-F615-4DCB-AA8B-935F6372F01C}"
-	RootNamespace="tvcombo"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvcombo;..\..\upnp\sample\tvcombo\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvcombo;..\..\upnp\sample\tvcombo\linux"
-				PreprocessorDefinitions="WIN32;UPNP_USE_MSVCPP"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\linux\tv_combo_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc8/tvctrlpt.vcproj

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="tvctrlpt"
-	ProjectGUID="{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}"
-	RootNamespace="tvctrlpt"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt;..\..\upnp\sample\tvctrlpt\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt;..\..\upnp\sample\tvctrlpt\linux"
-				PreprocessorDefinitions="WIN32;UPNP_USE_MSVCPP"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib  libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\linux\tv_ctrlpt_main.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc8/tvdevice.vcproj

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="tvdevice"
-	ProjectGUID="{F592B023-E1F3-4A1E-841E-662DEE497435}"
-	RootNamespace="tvdevice"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;UPNP_USE_MSVCPP"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\linux\tv_device_main.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc9/ixml.vcproj

@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ixml"
-	ProjectGUID="{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
-	RootNamespace="ixml"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\ixml\src\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\document.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\element.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmldebug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlmembuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlparser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\namedNodeMap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\node.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\nodeList.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\ixml\inc\ixml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\inc\ixmldebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc9/libupnp.sln

@@ -1,141 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Lib|Win32 = Debug Lib|Win32
-		Debug Lib|x64 = Debug Lib|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release Lib|Win32 = Release Lib|Win32
-		Release Lib|x64 = Release Lib|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.Build.0 = Release Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.ActiveCfg = Release|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.Build.0 = Release|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.Build.0 = Debug|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.ActiveCfg = Debug|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.Build.0 = Debug|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.Build.0 = Release Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.ActiveCfg = Release|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.Build.0 = Release|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.ActiveCfg = Release|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.Build.0 = Release|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.Build.0 = Debug|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.ActiveCfg = Debug|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.Build.0 = Debug|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.Build.0 = Release Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.ActiveCfg = Release|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.Build.0 = Release|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.ActiveCfg = Release|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.Build.0 = Release|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.Build.0 = Debug|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.ActiveCfg = Debug|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.Build.0 = Debug|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.Build.0 = Release Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.ActiveCfg = Release|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.Build.0 = Release|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.ActiveCfg = Release|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.Build.0 = Release|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.Build.0 = Debug|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.ActiveCfg = Debug|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.Build.0 = Debug|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.Build.0 = Release Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.ActiveCfg = Release|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.Build.0 = Release|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.ActiveCfg = Release|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.Build.0 = Release|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.Build.0 = Debug Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.Build.0 = Debug|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.ActiveCfg = Debug|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.Build.0 = Debug|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.Build.0 = Release Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.ActiveCfg = Release|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.Build.0 = Release|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.ActiveCfg = Release|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

build/vc9/threadutil.vcproj

@@ -1,612 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="threadutil"
-	ProjectGUID="{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
-	RootNamespace="threadutil"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\threadutil\src\FreeList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\LinkedList.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\ThreadPool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\src\TimerThread.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\threadutil\inc\FreeList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\ithread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\LinkedList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\threadpool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\threadutil\inc\TimerThread.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc9/tvcombo.vcproj

@@ -1,704 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="tvcombo"
-	ProjectGUID="{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
-	RootNamespace="tvcombo"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\linux\tv_combo_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc9/tvctrlpt.vcproj

@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="tvctrlpt"
-	ProjectGUID="{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
-	RootNamespace="sample"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\linux\tv_ctrlpt_main.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/vc9/tvdevice.vcproj

@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="tvdevice"
-	ProjectGUID="{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
-	RootNamespace="tvdevice"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\linux\tv_device_main.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\upnp\sample\common\sample_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

configure.ac

@@ -4,351 +4,113 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.8.0], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.2], [mroberto@users.sourceforge.net])
-dnl ############################################################################
+###############################################################################
-dnl # *Independently* of the above libupnp package version, the libtool version
+# *Independently* of the above libupnp package version, the libtool version
-dnl # of the 3 libraries need to be updated whenever there is a change released:
+# of the 3 libraries need to be updated whenever there is a change released:
-dnl # "current:revision:age" (this is NOT the same as the package version),
+# "current:revision:age" (this is NOT the same as the package version), where:
-dnl # where:
+# 	- library code modified:		revision++
-dnl # 	- library code modified:		revision++
+# 	- interfaces changed/added/removed:	current++ and revision=0
-dnl # 	- interfaces changed/added/removed:	current++ and revision=0
+# 	- interfaces added: 			age++
-dnl # 	- interfaces added: 			age++
+# 	- interfaces removed:			age=0
-dnl # 	- interfaces removed:			age=0
+# *please update only once, before a formal release, not for each change*
-dnl # *please update only once, before a formal release, not for each change*
+#
-dnl #
+###############################################################################
-dnl ############################################################################
+# Release 1.4.1:
-dnl # Release 1.4.1:
+#AC_SUBST([LT_VERSION_IXML],       [2:2:0])
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:2:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
+#AC_SUBST([LT_VERSION_UPNP],       [2:2:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [2:2:0])
+#
-dnl #
+###############################################################################
-dnl ############################################################################
+# Release 1.4.6:
-dnl # Release 1.4.6:
+# "current:revision:age"
-dnl # "current:revision:age"
+#
-dnl #
+# - Code has changed in ixml
-dnl # - Code has changed in ixml
+#	revision: 2 -> 3
-dnl #	revision: 2 -> 3
+# - Code has changed in threadutil
-dnl # - Code has changed in threadutil
+#	revision: 2 -> 3
-dnl #	revision: 2 -> 3
+# - Interface added in threadutil
-dnl # - Interface added in threadutil
+#	current: 2 -> 3
-dnl #	current: 2 -> 3
+#	revisiion: 3 -> 0
-dnl #	revisiion: 3 -> 0
+#	age: 0 -> 1
-dnl #	age: 0 -> 1
+# - Code has changed in upnp
-dnl # - Code has changed in upnp
+#	revision: 2 -> 3
-dnl #	revision: 2 -> 3
+#
-dnl #
+#AC_SUBST([LT_VERSION_IXML],       [2:3:0])
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:3:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
+#AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
+#
-dnl #
+###############################################################################
-dnl ############################################################################
+# Release 1.6.0:
-dnl # Release 1.6.0:
+# "current:revision:age"
-dnl # "current:revision:age"
+#
-dnl #
+# - Code has changed in ixml
-dnl # - Code has changed in ixml
+#	revision: 3 -> 4
-dnl #	revision: 3 -> 4
+# - Code has changed in threadutil
-dnl # - Code has changed in threadutil
+#	revision: 0 -> 1
-dnl #	revision: 0 -> 1
+# - Code has changed in upnp
-dnl # - Code has changed in upnp
+#	revision: 3 -> 4
-dnl #	revision: 3 -> 4
+# - Interface changed in upnp
-dnl # - Interface changed in upnp
+#	current: 2 -> 3
-dnl #	current: 2 -> 3
+#	revision: 4 -> 0
-dnl #	revision: 4 -> 0
+# - Interface removed in upnp
-dnl # - Interface removed in upnp
+#	age: 0 -> 0
-dnl #	age: 0 -> 0
+#
-dnl #
+#AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
+#AC_SUBST([LT_VERSION_UPNP],       [3:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:0:0])
+#
-dnl #
+###############################################################################
-dnl ############################################################################
+# Release 1.6.1:
-dnl # Release 1.6.1:
+# "current:revision:age"
-dnl # "current:revision:age"
+#
-dnl #
+# - Code has changed in threadutil
-dnl # - Code has changed in threadutil
+#	revision: 1 -> 2
-dnl #	revision: 1 -> 2
+# - Interface added in threadutil
-dnl # - Interface added in threadutil
+#	current: 3 -> 4
-dnl #	current: 3 -> 4
+#	revision: 2 -> 0
-dnl #	revision: 2 -> 0
+# - Interface added in threadutil
-dnl # - Interface added in threadutil
+#	age: 1 -> 2
-dnl #	age: 1 -> 2
+# - Code has changed in upnp
-dnl # - Code has changed in upnp
+#	revision: 0 -> 1
-dnl #	revision: 0 -> 1
+#
-dnl #
+#AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
+#AC_SUBST([LT_VERSION_UPNP],       [3:1:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:1:0])
+#
-dnl #
+###############################################################################
-dnl ############################################################################
+# Release 1.6.2:
-dnl # Release 1.6.2:
+# "current:revision:age"
-dnl # "current:revision:age"
+#
-dnl #
+# - Code has changed in upnp
-dnl # - Code has changed in upnp
+#	revision: 1 -> 2
-dnl #	revision: 1 -> 2
+#
-dnl #
+#AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
+#AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
+#
-dnl #
+###############################################################################
-dnl ############################################################################
+AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl # Release 1.6.3:
+AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-dnl # "current:revision:age"
+AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
-dnl #
+###############################################################################
-dnl # - Code has changed in threadutil
+# Repeating the algorithm so that it is closer to the modificatin place:
-dnl #	revision: 0 -> 1
+# 	- library code modified:		revision++
-dnl #
+# 	- interfaces changed/added/removed:	current++ and revision=0
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+# 	- interfaces added: 			age++
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
+# 	- interfaces removed:			age=0
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
+# *please update only once, before a formal release, not for each change*
-dnl #
+###############################################################################
-dnl ############################################################################
-dnl # Release 1.6.4:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 1 -> 2
-dnl # - Code has changed in upnp
-dnl #	revision: 2 -> 3
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.5:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in upnp
-dnl #	revision: 3 -> 4
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:4:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.6:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 2 -> 3
-dnl # - Code has changed in upnp
-dnl #	revision: 4 -> 5
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.7:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 3 -> 4
-dnl # - Code has changed in upnp
-dnl #	revision: 5 -> 6
-dnl # - Interfaces have been changed, added and removed in upnp
-dnl #	current: 3 -> 4
-dnl #   revision: 6 -> 0
-dnl # - Interfaces removed in upnp:
-dnl #   age: -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:0:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
-dnl #
-dnl # Obs.: 1.6.7 was released with a version error, the correct nubers should
-dnl # have been:
-dnl #AC_SUBST([LT_VERSION_UPNP],       [4:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.8:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml
-dnl #	revision: 4 -> 5
-dnl # - Code has changed in threadutil
-dnl #	revision: 0 -> 1
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:5:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:1:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [4:1:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.9:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 1 -> 2
-dnl # - Code has changed in upnp
-dnl #	revision: 1 -> 2
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:5:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:2:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [4:2:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.10:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml 
-dnl #	revision: 5 -> 6
-dnl # - Code has changed in threadutil
-dnl #	revision: 2 -> 3
-dnl # - Code has changed in upnp
-dnl #	revision: 2 -> 3
-dnl # - interface has changed in upnp
-dnl #   current: 4 -> 5
-dnl #   revision: 3 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl ############################################################################
-dnl # Release 1.6.11:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 3 -> 4
-dnl # - Code has changed in upnp
-dnl #	revision: 3 -> 4
-dnl # - interface has changed in upnp
-dnl #   current: 5 -> 6
-dnl #   revision: 4 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:4:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [6:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.12:
-dnl # "current:revision:age"
-dnl #
-dnl # - interface added in threadutil
-dnl #   current: 5 -> 6
-dnl #   revision: 4 - > 0
-dnl #   age: 2 -> 3
-dnl # - interfaces removed in threadutil
-dnl #   age: 3 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [6:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.13:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl # - interface added in upnp
-dnl #   current: 6 -> 7
-dnl #   revision: 1 - > 0
-dnl #   age: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [7:0:1])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.14:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl # - interface added in upnp
-dnl #   current: 7 -> 8
-dnl #   revision: 1 - > 0
-dnl #   age: 1 -> 2
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [8:0:2])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.15:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [8:1:2])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.16:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml
-dnl #	revision: 6 -> 7
-dnl # - Code has changed in threadutil
-dnl #   revision: 0 -> 1
-dnl # - Code has changed in upnp
-dnl #	revision: 1 -> 2
-dnl # - interface changed/added/removed in upnp
-dnl #   current++(9); revision = 0
-dnl # - interface added in upnp
-dnl #   age++(3)
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:7:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:1:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [9:0:3])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.17:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #   revision: 1 -> 2
-dnl # - Code has changed in upnp
-dnl #   revision: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:7:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:2:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [9:1:3])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.18:
-dnl # "current:revision:age"
-dnl #
-dnl # -
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [::])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [::])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [::])
-dnl #
-dnl ############################################################################
-dnl # Release 1.8.0:
-dnl # "current:revision:age"
-dnl #
-dnl # - Start from a new ground.
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [10:0:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [10:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [10:0:0])
-dnl #
-dnl ############################################################################
-AC_SUBST([LT_VERSION_IXML],       [10:0:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [10:0:0])
-AC_SUBST([LT_VERSION_UPNP],       [10:0:0])
-dnl ############################################################################
-dnl # Repeating the algorithm to place it closer to the modificatin place:
-dnl # 	- library code modified:		revision++
-dnl # 	- interfaces changed/added/removed:	current++ and revision=0
-dnl # 	- interfaces added: 			age++
-dnl # 	- interfaces removed:			age=0
-dnl # *please update only once, before a formal release, not for each change*
-dnl ############################################################################
 
 
-AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_AUX_DIR(config.aux)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR(m4)
-AC_CONFIG_SRCDIR([upnp/inc/upnp.h])
+AC_CONFIG_SRCDIR(upnp/inc/upnp.h)
 
 
 AM_INIT_AUTOMAKE([1.8 -Wall foreign subdir-objects dist-bzip2])
@@ -378,7 +140,8 @@ AC_REVISION([$Revision: 1.11 $])
 upnpmaj=`echo "$PACKAGE_VERSION" | sed 's/\..*//' `
 upnpmin=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.// ; s/[^0-9].*$//' `]
 upnppatch=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.[^.]\.// ; s/[^0-9].*$//' `]
-AC_DEFINE_UNQUOTED([UPNP_VERSION_STRING], "$PACKAGE_VERSION", [see upnpconfig.h])
+AC_DEFINE_UNQUOTED([UPNP_VERSION_STRING], "$PACKAGE_VERSION",
+	[see upnpconfig.h])
 AC_DEFINE_UNQUOTED([UPNP_VERSION_MAJOR], $upnpmaj, [see upnpconfig.h])
 AC_DEFINE_UNQUOTED([UPNP_VERSION_MINOR], $upnpmin, [see upnpconfig.h])
 AC_DEFINE_UNQUOTED([UPNP_VERSION_PATCH], $upnppatch, [see upnpconfig.h])
@@ -400,6 +163,7 @@ fi
 #
 # Check for libupnp subsets
 #
+
 RT_BOOL_ARG_ENABLE([client], [yes], [control point code (client)])
 if test "x$enable_client" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_CLIENT, 1, [see upnpconfig.h])
@@ -423,76 +187,21 @@ if test "x$enable_webserver" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_WEBSERVER, 1, [see upnpconfig.h])
 fi
 
-RT_BOOL_ARG_ENABLE([ssdp], [yes], [SSDP part])
-if test "x$enable_ssdp" = xyes ; then
-        AC_DEFINE(UPNP_HAVE_SSDP, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([optssdp], [yes], [optionnal SSDP headers support)])
-if test "x$enable_optssdp" = xyes ; then
-        AC_DEFINE(UPNP_HAVE_OPTSSDP, 1, [see upnpconfig.h])
-	enable_uuid=yes
-fi
-
-RT_BOOL_ARG_ENABLE([soap], [yes], [SOAP part])
-if test "x$enable_soap" = xyes ; then
-        AC_DEFINE(UPNP_HAVE_SOAP, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([gena], [yes], [GENA part])
-if test "x$enable_gena" = xyes ; then
-        AC_DEFINE(UPNP_HAVE_GENA, 1, [see upnpconfig.h])
-	enable_uuid=yes
-fi
-
-AM_CONDITIONAL(ENABLE_UUID, test x"$enable_uuid" = xyes)
 
 RT_BOOL_ARG_ENABLE([tools], [yes], [helper APIs in upnptools.h])
 if test "x$enable_tools" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_TOOLS, 1, [see upnpconfig.h])
 fi
 
-RT_BOOL_ARG_ENABLE([ipv6], [no], [ipv6 support])
-if test "x$enable_ipv6" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_IPV6, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([unspecified_server], [no], [unspecified SERVER header])
-if test "x$enable_unspecified_server" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_UNSPECIFIED_SERVER, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([open_ssl], [no], [open-ssl support])
-if test "x$enable_open_ssl" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_OPEN_SSL, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([notification_reordering], [yes], [GENA notification reordering in gena_device.c])
-if test "x$enable_notification_reordering" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_NOTIFICATION_REORDERING, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([blocking_tcp_connections], [yes], [blocking TCP connections])
-if test "x$enable_blocking_tcp_connections" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([scriptsupport], [yes], [script support for IXML document tree, see ixml.h])
-if test "x$enable_scriptsupport" = xyes ; then
-        AC_DEFINE(IXML_HAVE_SCRIPTSUPPORT, 1, [see upnpconfig.h])
-fi
-
 
 RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
 
 
-#
 # doc installation
 # autoconf >= 2.60 already defines ${docdir}, but we will not use its 
 # default value, which is ${datarootdir}/doc/${PACKAGE_TARNAME}.
 # That would give us ${datarootdir}/doc/libupnp, and we want the package
 # version on that.
-#
 docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 AC_MSG_CHECKING([for documentation directory])
 AC_ARG_WITH(
@@ -507,9 +216,7 @@ AS_HELP_STRING(
 	[],
 	[with_documentation=no])
 
-#
 # If something has been entered after an equal sign, assume it is the directory
-#
 if test x"$with_documentation" != xyes -a x"$with_documentation" != xno; then
 	docdir="$with_documentation"
 fi
@@ -523,7 +230,6 @@ AC_MSG_RESULT($docdir)
 #
 AC_PROG_CC
 AM_PROG_CC_C_O
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -543,11 +249,8 @@ freebsd*)
 *)
 	echo "Using non-specific system compiler settings"
 	if test x"$enable_debug" = xyes; then
-		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default,
+		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
-		# but only if CFLAGS was not previously set.
+		:
-		#:
-		# Use -O0 in debug so that variables do not get optimized out
-		AX_CFLAGS_GCC_OPTION([-O0, -g])
 	else
 		# add optimise for size
 		AX_CFLAGS_GCC_OPTION([-Os])
@@ -569,26 +272,9 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
 
 
 #
-# Are we targetting Win32?
+# Checks for header files
-#
-AC_MSG_CHECKING([for Win32])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifdef WIN32
-	#error Yup
-#endif
-],[])], [ac_cv_win32="no"], [ac_cv_win32="yes"])
-if test "$ac_cv_win32" = "yes"; then
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no])
-fi
-
-
-#
-# Checks for header files (which aren't needed on Win32)
 #
 AC_HEADER_STDC
-if test "$ac_cv_win32" = "no"; then
 # libupnp code doesn't use autoconf variables yet,
 # so just abort if a header file is not found.
 AC_CHECK_HEADERS(
@@ -604,43 +290,20 @@ AC_CHECK_HEADERS(
 	sys/ioctl.h \
 	sys/socket.h \
 	sys/time.h \
+	sys/timeb.h \
 	syslog.h \
 	unistd.h \
 	],
 	[],
 	[AC_MSG_ERROR([required header file missing])])
-fi
 
 
 #
 # Checks for typedefs, structures, and compiler characteristics
 #	
 AC_C_CONST
-
+AC_TYPE_SIZE_T
-# The test for socklen_t was getting it wrong when it exists but is in ws2tcpip.h,
+TYPE_SOCKLEN_T
-# so we use a new test.
-#TYPE_SOCKLEN_T
-
-AC_CHECK_HEADERS([sys/types.h sys/socket.h ws2tcpip.h])
-AC_MSG_CHECKING(for socklen_t)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifdef HAVE_SYS_TYPES_H
-	#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-	#include <sys/socket.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-	#include <ws2tcpip.h>
-#endif
-],[ socklen_t t = 0; return t; ])
-],[ac_cv_socklen_t="yes"],[ac_cv_socklen_t="no"])
-if test "$ac_cv_socklen_t" = "yes"; then
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no, using int])
-	AC_DEFINE(socklen_t, int, [Type for storing the length of struct sockaddr])
-fi
 
 
 #
@@ -648,54 +311,15 @@ fi
 #
 AC_FUNC_VPRINTF
 AC_FUNC_FSEEKO
-AC_CHECK_FUNC(strnlen,
+AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])
-	AC_DEFINE(HAVE_STRNLEN, 1, [Defines if strnlen is available on your system]))
-AC_CHECK_FUNC(strndup,
-	AC_DEFINE(HAVE_STRNDUP, 1, [Defines if strndup is available on your system]))
-#
-# Solaris needs -lsocket -lnsl -lrt
-AC_SEARCH_LIBS([bind],           [socket])
-AC_SEARCH_LIBS([gethostbyname],  [nsl])
-AC_SEARCH_LIBS([sched_getparam], [rt])
 
 
 #
 # Checks for POSIX Threads
 #
-echo "--------------------------- pthread stuff -------------------------------------"
 ACX_PTHREAD(
 	[],
 	[AC_MSG_ERROR([POSIX threads are required to build this program])])
-#
-# Update environment variables for pthreads
-#
-CC="$PTHREAD_CC"
-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-LIBS="$PTHREAD_LIBS $LIBS"
-#
-# Determine if pthread_rwlock_t is available
-#
-echo "----------------------- pthread_rwlock_t stuff --------------------------------"
-AC_MSG_CHECKING([if pthread_rwlock_t is available])
-AC_LANG([C])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[#include <pthread.h>],
-		[pthread_rwlock_t *x;])],
-	[AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
-		AC_MSG_RESULT([yes, supported without any options])],
-	[AC_COMPILE_IFELSE(
-		[AC_LANG_PROGRAM(
-			[#define _GNU_SOURCE
-			#include <pthread.h>],
-			[pthread_rwlock_t *x;])],
-		[AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
-			CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-			AC_MSG_RESULT([yes, definition of _GNU_SOURCE required])],
-		[AC_DEFINE([UPNP_USE_RWLOCK], [0], [Do not use pthread_rwlock_t])
-			AC_MSG_RESULT([no, needs to fallback to pthread_mutex])
-			AC_MSG_ERROR([pthread_rwlock_t not available])])])
-echo "-------------------------------------------------------------------------------"
 
 
 AC_CONFIG_FILES([
@@ -706,7 +330,6 @@ AC_CONFIG_FILES([
 	upnp/Makefile
 	upnp/doc/Makefile
 	upnp/sample/Makefile
-	upnp/unittest/Makefile
 	docs/dist/Makefile
 	libupnp.pc
 	])
@@ -714,12 +337,3 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 
-#
-# Files copied for windows compilation.
-#
-echo "configure: copying \"autoconfig.h\"          to \"build/inc/autoconfig.h\""
-test -d build/inc || mkdir -p build/inc
-cp autoconfig.h build/inc/autoconfig.h
-echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\""
-cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h
-

docs/dist/Makefile.am

@@ -39,7 +39,7 @@ EXTRA_DIST = \
     ./html/upnp/UPNP_E_SOCKET_ERROR-208.html \
     ./html/upnp/UPNP_E_CANCELED-210.html \
     ./html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html \
-    ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html \
+    ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html \
     ./html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html \
     ./html/upnp/UPNP_E_INVALID_ARGUMENT-501.html \
     ./html/upnp/UPNP_E_FILE_NOT_FOUND-502.html \
@@ -295,7 +295,7 @@ if WITH_DOCUMENTATION
         ./html/upnp/UPNP_E_SOCKET_ERROR-208.html \
         ./html/upnp/UPNP_E_CANCELED-210.html \
         ./html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html \
-        ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html \
+        ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html \
         ./html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html \
         ./html/upnp/UPNP_E_INVALID_ARGUMENT-501.html \
         ./html/upnp/UPNP_E_FILE_NOT_FOUND-502.html \

ixml/Makefile.am

@@ -2,13 +2,12 @@
 #
 # "Makefile.am" for "libupnp/ixml"
 #
-# (C) Copyright 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS 		= doc
 
-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
+AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
-                          -I$(top_srcdir)/upnp/inc
 AM_CFLAGS		= 
 
 LDADD			= libixml.la
@@ -19,33 +18,21 @@ else
     AM_CPPFLAGS		+= -DNDEBUG
 endif
 
-if ENABLE_SCRIPTSUPPORT
-    AM_CPPFLAGS		+= -DIXML_HAVE_SCRIPTSUPPORT
-endif
-
 lib_LTLIBRARIES		= libixml.la
 
 libixml_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
 			  -export-symbols-regex '^ixml.*'
 
 libixml_la_SOURCES	= \
-			src/attr.c \
+			src/ixml.c src/node.c src/ixmlparser.c \
-			src/document.c \
+			src/ixmlmembuf.c src/nodeList.c \
-			src/element.c \
+			src/element.c src/attr.c src/document.c \
-			src/inc/ixmlmembuf.h \
-			src/inc/ixmlparser.h \
-			src/ixml.c \
-			src/ixmldebug.c \
-			src/ixmlparser.c \
-			src/ixmlmembuf.c \
 			src/namedNodeMap.c \
-			src/node.c \
+			src/inc/ixmlmembuf.h src/inc/ixmlparser.h
-			src/nodeList.c
 
 upnpincludedir		= $(includedir)/upnp
-upnpinclude_HEADERS	= \
+upnpinclude_HEADERS	= inc/ixml.h 
-			inc/ixml.h \
+
-			inc/ixmldebug.h
 
 check_PROGRAMS          = test_document
 TESTS                   = test/test_document.sh
@@ -60,3 +47,4 @@ dist-hook:
 clean-local:
 	@if [ -d bin ] ; then  rm -rf bin ; fi
 
+

ixml/inc/ixmldebug.h

@@ -1,72 +0,0 @@
-
-
-#ifndef IXMLDEBUG_H
-#define IXMLDEBUG_H
-
-
-#include "UpnpGlobal.h"
-#include "ixml.h"
-
-
-/*!
- * \file
- *
- * \brief Auxiliar routines to aid debugging.
- */
-
-
-/*!
- * \brief Prints the debug statement either on the standard output or log file
- * along with the information from where this debug statement is coming.
- */ 
-#ifdef DEBUG
-void IxmlPrintf(
-	/*! [in] The file name, usually __FILE__. */
-	const char *DbgFileName,
-	/*! [in] The line number, usually __LINE__ or a variable that got the
-	 * __LINE__ at the appropriate place. */
-	int DbgLineNo,
-	/*! [in] The function name. */
-	const char *FunctionName,
-	/*! [in] Printf like format specification. */
-	const char* FmtStr,
-	/*! [in] Printf like Variable number of arguments that will go in the debug
-	 * statement. */
-	...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 4, 5)))
-#endif
-;
-#else /* DEBUG */
-static UPNP_INLINE void IxmlPrintf(
-	const char *FmtStr,
-	...)
-{
-	FmtStr = FmtStr;
-}
-#endif /* DEBUG */
-
-
-/*!
- * \brief Print the node names and values of a XML tree.
- */
-#ifdef DEBUG
-void printNodes(
-	/*! [in] The root of the tree to print. */
-	IXML_Node *tmpRoot,
-	/*! [in] The depth to print. */
-	int depth);
-#else
-static UPNP_INLINE void printNodes(
-	IXML_Node *tmpRoot,
-	int depth)
-{
-	tmpRoot = tmpRoot;
-	depth = depth;
-}
-#endif
-
-
-#endif /* IXMLDEBUG_H */
-

ixml/src/attr.c

@@ -1,54 +1,60 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
-
 
 #include "ixmlparser.h"
 
-
+/*================================================================
-#include <string.h>
+*   Function: Attr_init
-
+*       Initializes an attribute node
-
+*       External function.
-void ixmlAttr_init(IN IXML_Attr *attr)
+*
+*=================================================================*/
+void
+ixmlAttr_init( IN IXML_Attr * attr )
 {
-	if (attr != NULL) {
+    if( attr != NULL ) {
-		memset(attr, 0, sizeof (IXML_Attr));
+        memset( attr, 0, sizeof( IXML_Attr ) );
-	}
+    }
 }
 
-
+/*================================================================
-void ixmlAttr_free(IN IXML_Attr *attr)
+*   Function: Attr_free
+*       Frees an attribute node.
+*       external function.
+*
+*=================================================================*/
+void
+ixmlAttr_free( IN IXML_Attr * attr )
 {
-	if (attr != NULL) {
+    if( attr != NULL ) {
-		ixmlNode_free((IXML_Node *)attr);
+        ixmlNode_free( ( IXML_Node * ) attr );
-	}
+    }
 }
-

ixml/src/inc/ixmlmembuf.h

@@ -1,174 +1,77 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- **************************************************************************/
-
-
-#ifndef IXML_MEMBUF_H
-#define IXML_MEMBUF_H
-
-
-/*!
- * \file
- */
 
+#ifndef _IXML_MEMBUF_H
+#define _IXML_MEMBUF_H
 
+#include <stdlib.h>
 #include "ixml.h"
 
+#define MINVAL( a, b ) ( (a) < (b) ? (a) : (b) )
+#define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )
 
-#include <stdlib.h> /* for size_t */
+#ifndef WIN32
+ #define	UPNP_INLINE inline
+#endif
+
+#define MEMBUF_DEF_SIZE_INC		20
 
 
-#define MINVAL(a, b) ( (a) < (b) ? (a) : (b) )
+typedef struct // ixml_membuf 
-#define MAXVAL(a, b) ( (a) > (b) ? (a) : (b) )
-
-
-#define MEMBUF_DEF_SIZE_INC 20u
-
-
-/*!
- * \brief The ixml_membuf type.
- */
-typedef struct
 {
-	char *buf;	
+	char	*buf;
-	size_t length;
+				
-	size_t capacity;
+	size_t	length;
-	size_t size_inc;
+	size_t	capacity;
+	size_t	size_inc;
+
 } ixml_membuf;
 
+//--------------------------------------------------
+//////////////// functions /////////////////////////
+//--------------------------------------------------
+/*
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+*/
 
-/*!
+void ixml_membuf_init(INOUT ixml_membuf *m);
- * \brief ixml_membuf initialization routine.
+void ixml_membuf_destroy(INOUT ixml_membuf *m);
- */
+int ixml_membuf_assign(INOUT ixml_membuf *m, IN const void *buf, 
-void ixml_membuf_init(
+					 IN size_t buf_len );
-	/*! [in,out] The memory buffer to initializa. */
+int ixml_membuf_assign_str(INOUT ixml_membuf *m, IN const char *c_str );
-	ixml_membuf *m);
+int ixml_membuf_append(INOUT ixml_membuf *m, IN const void *buf);
-
+int ixml_membuf_append_str(INOUT ixml_membuf *m, IN const char *c_str);
-
+int ixml_membuf_insert(INOUT ixml_membuf *m, IN const void* buf, 
-/*!
+					 IN size_t buf_len, int index );
- * \brief ixml_membuf clearing routine.
- *
- * The internal buffer is deleted and ixml_membuf_init() is called in the end
- * to reinitialize the buffer.
- */
-void ixml_membuf_destroy(
-	/*! [in,out] The memory buffer to clear. */
-	ixml_membuf *m);
-
-
-/*!
- * \brief Copies the contents o a buffer to the designated ixml_membuf.
- *
- * The previous contents of the ixml_membuf are destroyed.
- *
- * \return IXML_SUCCESS if successfull, or the error code returned
- * by ixml_membuf_set_size().
- *
- * \sa ixml_membuf_assign_str().
- */
-int ixml_membuf_assign(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The input buffer to copy from. */
-	const void *buf, 
-	/*! [in] The number of bytes to copy from the input buffer. */
-	size_t buf_len);
-
-/*!
- * \brief Copies a \b NULL terminated string to the ixml_buffer.
- *
- * This is a convenience function that internally uses ixml_membuf_assign().
- *
- * \return The return value of ixml_membuf_assign().
- *
- * \sa ixml_membuf_assign().
- */
-int ixml_membuf_assign_str(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The input string to copy from. */
-	const char *c_str);
-
-/*!
- * \brief Appends one byte to the designated ixml_membuffer.
- *
- * This is a convenience function that internally uses ixml_membuf_insert().
- *
- * \return The return value of ixml_membuf_insert().
- *
- * \sa ixml_membuf_insert()
- */
-int ixml_membuf_append(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The pointer to the byte to append. */
-	const void *buf);
-
-/*!
- * \brief Appends the contents of a \b NULL terminated string to the designated
- * ixml_membuf.
- *
- * This is a convenience function that internally uses ixml_membuf_insert().
- *
- * \return The return value of ixml_membuf_insert().
- *
- * \sa ixml_membuf_insert().
- */
-int ixml_membuf_append_str(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The input string to copy from. */
-	const char *c_str);
-
-/*!
- * \brief 
- *
- * \return
- * 	\li 0 if successfull.
- * 	\li IXML_INDEX_SIZE_ERR if the index parameter is out of range.
- * 	\li Or the return code of ixml_membuf_set_size()
- *
- * \sa ixml_membuf_set_size()
- */
-int ixml_membuf_insert(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The pointer to the input buffer. */
-	const void *buf, 
-	/*! [in] The buffer length. */
-	size_t buf_len,
-	/*! [in] The point of insertion relative to the beggining of the
-	 * ixml_membuf internal buffer. */
-	size_t index);
-
-
-#endif /* IXML_MEMBUF_H */
 
+#endif // _IXML_MEMBUF_H

ixml/src/inc/ixmlparser.h

@@ -1,49 +1,41 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * - Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- **************************************************************************/
+///////////////////////////////////////////////////////////////////////////
-
+ 
-
+#ifndef _IXMLPARSER_H
-#ifndef IXMLPARSER_H
+#define _IXMLPARSER_H
-#define IXMLPARSER_H
-
-
-/*!
- * \file
- */
-
 
 #include "ixml.h"
 #include "ixmlmembuf.h"
 
-
+// Parser definitions
-/* Parser definitions */
 #define QUOT        """
 #define LT          "<"
 #define GT          ">"
@@ -52,237 +44,77 @@
 #define ESC_HEX     "&#x"
 #define ESC_DEC     "&#"
 
-
 typedef struct _IXML_NamespaceURI 
 {
-	char *nsURI;
+    char                        *nsURI;
-	char *prefix;
+    char                        *prefix;
-	struct _IXML_NamespaceURI *nextNsURI;
+    struct _IXML_NamespaceURI   *nextNsURI;
 } IXML_NamespaceURI;
 
 
 typedef struct _IXML_ElementStack
 {
-	char *element;
+    char                    *element;
-	char *prefix;
+    char                    *prefix;
-	char *namespaceUri;
+    char                    *namespaceUri;
-	IXML_NamespaceURI *pNsURI;
+    IXML_NamespaceURI            *pNsURI;
-	struct _IXML_ElementStack *nextElement;
+    struct _IXML_ElementStack    *nextElement;
 } IXML_ElementStack;
 
 
 typedef enum
 {
-	eELEMENT,
+    eELEMENT,
-	eATTRIBUTE,
+    eATTRIBUTE,
-	eCONTENT,
+    eCONTENT,
 } PARSER_STATE;
 
-
 typedef struct _Parser
 {
-	/*! Data buffer. */
+    char            *dataBuffer;	//data buffer
-	char *dataBuffer;
+    char            *curPtr;		//ptr to the token parsed 
-	/*! Pointer to the token parsed. */
+    char            *savePtr;		//Saves for backup
-	char *curPtr;
+    ixml_membuf     lastElem;
-	/*! Saves for backup. */
+    ixml_membuf     tokenBuf;    
-	char *savePtr;
+
-	ixml_membuf lastElem;
+    IXML_Node           *pNeedPrefixNode;
-	ixml_membuf tokenBuf;    
+    IXML_ElementStack   *pCurElement;
-	IXML_Node *pNeedPrefixNode;
+    IXML_Node           *currentNodePtr;
-	IXML_ElementStack *pCurElement;
+    PARSER_STATE        state;
-	IXML_Node *currentNodePtr;
+
-	PARSER_STATE state;
+    BOOL                bHasTopLevel;
-	BOOL bHasTopLevel;
+
 } Parser;
 
 
-/*!
- * \brief Check to see whether name is a valid xml name.
- */
-BOOL Parser_isValidXmlName(
-	/*! [in] The string to be checked. */
-	const DOMString name);
 
+int     Parser_LoadDocument( IXML_Document **retDoc, const char * xmlFile, BOOL file);
+BOOL    Parser_isValidXmlName( const DOMString name);
+int     Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
+void    Parser_freeNodeContent( IXML_Node *IXML_Nodeptr);
 
-/*!
+void    Parser_setErrorChar( char c );
- * \brief Sets the error character.
- *
- * If 'c' is 0 (default), the parser is strict about XML encoding:
- * invalid UTF-8 sequences or "&" entities are rejected, and the parsing 
- * aborts.
- *
- * If 'c' is not 0, the parser is relaxed: invalid UTF-8 characters
- * are replaced by this character, and invalid "&" entities are left
- * untranslated. The parsing is then allowed to continue.
- */
-void Parser_setErrorChar(
-	/*! [in] The character to become the error character. */
-	char c);
 
-#ifdef IXML_HAVE_SCRIPTSUPPORT
+void    ixmlAttr_free(IXML_Attr *attrNode);
-/*!
+void    ixmlAttr_init(IXML_Attr *attrNode);
- * \brief Sets the handler to call before a node is freed.
- *
- * If \b hndlr is set to a function, it will be called before any
- * node is freed, with the node as its parameter. This allows scripting
- * languages to do their garbage collection, without maintaining their
- * own tree structure.
- */
-void Parser_setBeforeFree(
-	/*! [in] The handler callback to call before each node to be freed. */
-	IXML_BeforeFreeNode_t hndlr);
 
-/*!
+int     ixmlElement_setTagName(IXML_Element *element, const char *tagName);
- * \brief Gets the handler to call before a node is freed.
- */
-IXML_BeforeFreeNode_t Parser_getBeforeFree();
-#endif
 
+void    ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap);
+int     ixmlNamedNodeMap_addToNamedNodeMap(IXML_NamedNodeMap **nnMap, IXML_Node *add);
 
-/*!
+void    ixmlNode_init(IXML_Node *IXML_Nodeptr);
- * \brief Fees a node contents.
+BOOL    ixmlNode_compare(IXML_Node *srcIXML_Node, IXML_Node *destIXML_Node);
- */
-void Parser_freeNodeContent(
-	/*! [in] The Node to process. */
-	IXML_Node *IXML_Nodeptr);
 
-int Parser_LoadDocument(IXML_Document **retDoc, const char * xmlFile, BOOL file);
+void    ixmlNode_getElementsByTagName( IXML_Node *n, const char *tagname, IXML_NodeList **list);
+void    ixmlNode_getElementsByTagNameNS( IXML_Node *IXML_Node, const char *namespaceURI,
+                const char *localName, IXML_NodeList **list);
 
-int Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
+int     ixmlNode_setNodeProperties(IXML_Node* node, IXML_Node *src);
+int     ixmlNode_setNodeName( IXML_Node* node, const DOMString qualifiedName);
 
+void    ixmlNodeList_init(IXML_NodeList *nList);
+int     ixmlNodeList_addToNodeList(IXML_NodeList **nList, IXML_Node *add);
 
-void ixmlAttr_init(IXML_Attr *attrNode);
+#endif  // _IXMLPARSER_H
-
-/*!
- * \brief Set the given element's tagName.
- *
- * \return One of the following:
- * 	\li \b IXML_SUCCESS, if successfull.
- * 	\li \b IXML_FAILED, if element of tagname is \b NULL.
- * 	\li \b IXML_INSUFFICIENT_MEMORY, if there is no memory to allocate the
- * 		buffer for the element's tagname.
- */
-int ixmlElement_setTagName(
-	/*! [in] The element to change the tagname. */
-	IXML_Element *element,
-	/*! [in] The new tagName for the element. */
-	const char *tagName);
-
-
-/*!
- * \brief Initializes a NamedNodeMap object.
- */
-void ixmlNamedNodeMap_init(
-	/*! [in] The named node map to process. */
-	IXML_NamedNodeMap *nnMap);
-
-
-/*!
- * \brief Add a node to a NamedNodeMap.
- *
- * \return IXML_SUCCESS or failure.
- */
-int ixmlNamedNodeMap_addToNamedNodeMap(
-	/* [in] The named node map. */
-	IXML_NamedNodeMap **nnMap,
-	/* [in] The node to add. */
-	IXML_Node *add);
-
-/*!
- * \brief Add a node to nodelist.
- */
-int ixmlNodeList_addToNodeList(
-	/*! [in] The pointer to the nodelist. */
-	IXML_NodeList **nList,
-	/*! [in] The node to add. */
-	IXML_Node *add);
-
-
-/*!
- * \brief Intializes a node.
- */
-void ixmlNode_init(
-	/*! [in] The \b Node to iniatialize. */
-	IN IXML_Node *nodeptr);
-
-
-/*!
- * \brief Compare two nodes to see whether they are the same node.
- * Parent, sibling and children node are ignored.
- *
- * \return
- * 	\li TRUE, the two nodes are the same.
- * 	\li FALSE, the two nodes are not the same.
- */
-BOOL ixmlNode_compare(
-	/*! [in] The first \b Node. */
-	IXML_Node *srcNode,
-	/*! [in] The second \b Node. */
- 	IXML_Node *destNode);
-
-
-/*!
- * \brief Returns a nodeList of all descendant Elements with a given tagName,
- * in the order in which they are encountered in a traversal of this element
- * tree.
- */
-void ixmlNode_getElementsByTagName(
-	/*! [in] The \b Node tree. */
-	IXML_Node *n,
-	/*! [in] The tag name to match. */
-	const char *tagname,
-	/*! [out] The output \b NodeList. */
-	IXML_NodeList **list);
-
-
-/*!
- * \brief Returns a nodeList of all the descendant Elements with a given local
- * name and namespace URI in the order in which they are encountered in a
- * preorder traversal of this Elememt tree.		
- */
-void ixmlNode_getElementsByTagNameNS(
-	/*! [in] The \b Element tree. */
-	IXML_Node *n,
-	/*! [in] The name space to match. */
-	const char *namespaceURI,
-	/*! [in] The local name to match. */
-	const char *localName,
-	/*! [out] The output \b NodeList. */
-	IXML_NodeList **list);
-
-
-/*!
- * \brief 
- *
- * \return 
- */
-int ixmlNode_setNodeName(
-	/*! [in] The \b Node. */
-	IXML_Node *node,
-	/*! [in] . */
-	const DOMString qualifiedName);
-
-
-/*!
- * \brief 
- *
- * \return 
- */
-int ixmlNode_setNodeProperties(
-	/*! [in] . */
-	IXML_Node *destNode,
-	/*! [in] . */
-	IXML_Node *src);
-
-
-/*!
- * \brief Initializes a nodelist 
- */
-void ixmlNodeList_init(
-	/*! [in,out] The \b NodeList to initialize. */
-	IXML_NodeList *nList);
-
-
-#endif  /* IXMLPARSER_H */
 

ixml/src/ixml.c

@@ -1,468 +1,531 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * - Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- **************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
-
-/*!
- * \file
- */
-
-
-#include "ixmldebug.h"
 #include "ixmlmembuf.h"
 #include "ixmlparser.h"
 
-
+/*================================================================
-#include <stdlib.h> /* for free() */
+*   copy_with_escape
-#include <string.h>
+*
-
+*
-
+*=================================================================*/
-/*!
+static void
- * \brief Appends a string to a buffer, substituting some characters by escape
+copy_with_escape( INOUT ixml_membuf * buf,
- * sequences.
+                  IN const char *p )
- */
-static void copy_with_escape(
-	/*! [in,out] The input/output buffer. */
-	ixml_membuf *buf,
-	/*! [in] The string to copy from. */
-	const char *p)
 {
-	size_t i;
+    int i;
-	size_t plen;
+    int plen;
 
-	if (p == NULL)
+    if( p == NULL )
-		return;
+        return;
-	plen = strlen(p);
+
-	for (i = (size_t)0; i < plen; ++i) {
+    plen = strlen( p );
-		switch (p[i]) {
+
-		case '<':
+    for( i = 0; i < plen; i++ ) {
-			ixml_membuf_append_str(buf, "&lt;");
+        switch ( p[i] ) {
-			break;
+            case '<':
-		case '>':
+                ixml_membuf_append_str( buf, "&lt;" );
-			ixml_membuf_append_str(buf, "&gt;");
+                break;
-			break;
+
-		case '&':
+            case '>':
-			ixml_membuf_append_str(buf, "&amp;");
+                ixml_membuf_append_str( buf, "&gt;" );
-			break;
+                break;
-		case '\'':
+
-			ixml_membuf_append_str(buf, "&apos;");
+            case '&':
-			break;
+                ixml_membuf_append_str( buf, "&amp;" );
-		case '\"':
+                break;
-			ixml_membuf_append_str(buf, "&quot;");
+
-			break;
+            case '\'':
-		default:
+                ixml_membuf_append_str( buf, "&apos;" );
-			ixml_membuf_append(buf, &p[i]);
+                break;
-			break;
+
-		}
+            case '\"':
-	}
+                ixml_membuf_append_str( buf, "&quot;" );
+                break;
+
+            default:
+                ixml_membuf_append( buf, &p[i] );
+        }
+    }
+}
+
+/*================================================================
+*	ixmlPrintDomTreeRecursive
+*       It is a recursive function to print all the node in a tree.
+*       Internal to parser only.
+*
+*=================================================================*/
+void
+ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
+                           IN ixml_membuf * buf )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL,
+     *sibling = NULL;
+
+    if( nodeptr != NULL ) {
+        nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+        nodeValue = ixmlNode_getNodeValue( nodeptr );
+
+        switch ( ixmlNode_getNodeType( nodeptr ) ) {
+
+            case eTEXT_NODE:
+                copy_with_escape( buf, nodeValue );
+                break;
+
+            case eCDATA_SECTION_NODE:
+                ixml_membuf_append_str( buf, "<![CDATA[" );
+                ixml_membuf_append_str( buf, nodeValue );
+                ixml_membuf_append_str( buf, "]]>" );
+                break;
+
+            case ePROCESSING_INSTRUCTION_NODE:
+                ixml_membuf_append_str( buf, "<?" );
+                ixml_membuf_append_str( buf, nodeName );
+                ixml_membuf_append_str( buf, " " );
+                copy_with_escape( buf, nodeValue );
+                ixml_membuf_append_str( buf, "?>\n" );
+                break;
+
+            case eDOCUMENT_NODE:
+                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
+                                           ( nodeptr ), buf );
+                break;
+
+            case eATTRIBUTE_NODE:
+                ixml_membuf_append_str( buf, nodeName );
+                ixml_membuf_append_str( buf, "=\"" );
+                copy_with_escape( buf, nodeValue );
+                ixml_membuf_append_str( buf, "\"" );
+
+                if( nodeptr->nextSibling != NULL ) {
+                    ixml_membuf_append_str( buf, " " );
+                    ixmlPrintDomTreeRecursive( nodeptr->nextSibling, buf );
+                }
+                break;
+
+            case eELEMENT_NODE:
+                ixml_membuf_append_str( buf, "<" );
+                ixml_membuf_append_str( buf, nodeName );
+
+                if( nodeptr->firstAttr != NULL ) {
+                    ixml_membuf_append_str( buf, " " );
+                    ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+                }
+
+                child = ixmlNode_getFirstChild( nodeptr );
+                if( ( child != NULL )
+                    && ( ixmlNode_getNodeType( child ) ==
+                         eELEMENT_NODE ) ) {
+                    ixml_membuf_append_str( buf, ">\r\n" );
+                } else {
+                    ixml_membuf_append_str( buf, ">" );
+                }
+
+                //  output the children
+                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
+                                           ( nodeptr ), buf );
+
+                // Done with children.  Output the end tag.
+                ixml_membuf_append_str( buf, "</" );
+                ixml_membuf_append_str( buf, nodeName );
+
+                sibling = ixmlNode_getNextSibling( nodeptr );
+                if( sibling != NULL
+                    && ixmlNode_getNodeType( sibling ) == eTEXT_NODE ) {
+                    ixml_membuf_append_str( buf, ">" );
+                } else {
+                    ixml_membuf_append_str( buf, ">\r\n" );
+                }
+                ixmlPrintDomTreeRecursive( ixmlNode_getNextSibling
+                                           ( nodeptr ), buf );
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+/*================================================================
+*   ixmlPrintDomTree
+*       Print a DOM tree.
+*       Element, and Attribute nodes are handled differently.
+*       We don't want to print the Element and Attribute nodes' sibling.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlPrintDomTree( IN IXML_Node * nodeptr,
+                  IN ixml_membuf * buf )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL;
+
+    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+        return;
+    }
+
+    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+    nodeValue = ixmlNode_getNodeValue( nodeptr );
+
+    switch ( ixmlNode_getNodeType( nodeptr ) ) {
+
+        case eTEXT_NODE:
+        case eCDATA_SECTION_NODE:
+        case ePROCESSING_INSTRUCTION_NODE:
+        case eDOCUMENT_NODE:
+            ixmlPrintDomTreeRecursive( nodeptr, buf );
+            break;
+
+        case eATTRIBUTE_NODE:
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, "=\"" );
+            copy_with_escape( buf, nodeValue );
+            ixml_membuf_append_str( buf, "\"" );
+            break;
+
+        case eELEMENT_NODE:
+            ixml_membuf_append_str( buf, "<" );
+            ixml_membuf_append_str( buf, nodeName );
+
+            if( nodeptr->firstAttr != NULL ) {
+                ixml_membuf_append_str( buf, " " );
+                ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+            }
+
+            child = ixmlNode_getFirstChild( nodeptr );
+            if( ( child != NULL )
+                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
+                ixml_membuf_append_str( buf, ">\r\n" );
+            } else {
+                ixml_membuf_append_str( buf, ">" );
+            }
+
+            //  output the children
+            ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild( nodeptr ),
+                                       buf );
+
+            // Done with children.  Output the end tag.
+            ixml_membuf_append_str( buf, "</" );
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, ">\r\n" );
+            break;
+
+        default:
+            break;
+    }
+}
+
+/*================================================================
+*   ixmlDomTreetoString
+*       Converts a DOM tree into a text string
+*       Element, and Attribute nodes are handled differently.
+*       We don't want to print the Element and Attribute nodes' sibling.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlDomTreetoString( IN IXML_Node * nodeptr,
+                     IN ixml_membuf * buf )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL;
+
+    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+        return;
+    }
+
+    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+    nodeValue = ixmlNode_getNodeValue( nodeptr );
+
+    switch ( ixmlNode_getNodeType( nodeptr ) ) {
+
+        case eTEXT_NODE:
+        case eCDATA_SECTION_NODE:
+        case ePROCESSING_INSTRUCTION_NODE:
+        case eDOCUMENT_NODE:
+            ixmlPrintDomTreeRecursive( nodeptr, buf );
+            break;
+
+        case eATTRIBUTE_NODE:
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, "=\"" );
+            copy_with_escape( buf, nodeValue );
+            ixml_membuf_append_str( buf, "\"" );
+            break;
+
+        case eELEMENT_NODE:
+            ixml_membuf_append_str( buf, "<" );
+            ixml_membuf_append_str( buf, nodeName );
+
+            if( nodeptr->firstAttr != NULL ) {
+                ixml_membuf_append_str( buf, " " );
+                ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+            }
+
+            child = ixmlNode_getFirstChild( nodeptr );
+            if( ( child != NULL )
+                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
+                ixml_membuf_append_str( buf, ">" );
+            } else {
+                ixml_membuf_append_str( buf, ">" );
+            }
+
+            //  output the children
+            ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild( nodeptr ),
+                                       buf );
+
+            // Done with children.  Output the end tag.
+            ixml_membuf_append_str( buf, "</" );
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, ">" );
+            break;
+
+        default:
+            break;
+    }
+}
+
+/*================================================================
+*   ixmlLoadDocumentEx
+*       Parses the given file, and returns the DOM tree from it.
+*       External function.
+*
+*=================================================================*/
+int
+ixmlLoadDocumentEx( IN const char *xmlFile,
+                    IXML_Document ** doc )
+{
+
+    if( ( xmlFile == NULL ) || ( doc == NULL ) ) {
+        return IXML_INVALID_PARAMETER;
+    }
+
+    return Parser_LoadDocument( doc, xmlFile, TRUE );
+}
+
+/*================================================================
+*   ixmlLoadDocument
+*       Parses the given file, and returns the DOM tree from it.
+*       External function.
+*
+*=================================================================*/
+IXML_Document *
+ixmlLoadDocument( IN const char *xmlFile )
+{
+
+    IXML_Document *doc = NULL;
+
+    ixmlLoadDocumentEx( xmlFile, &doc );
+    return doc;
+}
+
+/*================================================================
+*   ixmlPrintDocument
+*       Prints entire document, prepending XML prolog first.
+*       Puts lots of white spaces.
+*       External function.
+*
+*=================================================================*/
+
+DOMString
+ixmlPrintDocument(IXML_Document *doc)
+{
+    IXML_Node* rootNode = ( IXML_Node * )doc;
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( rootNode == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
+    ixmlPrintDomTree( rootNode, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlPrintNode
+*       Print DOM tree under node. Puts lots of white spaces
+*       External function.
+*
+*=================================================================*/
+DOMString
+ixmlPrintNode( IN IXML_Node * node )
+{
+
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( node == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixmlPrintDomTree( node, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlDocumenttoString
+*       converts DOM tree under node to text string,
+*       prepending XML prolog first.
+*       External function.
+*
+*=================================================================*/
+
+DOMString
+ixmlDocumenttoString(IXML_Document *doc)
+{
+    IXML_Node* rootNode = ( IXML_Node * )doc;
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( rootNode == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
+    ixmlDomTreetoString( rootNode, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlNodetoString
+*       converts DOM tree under node to text string
+*       External function.
+*
+*=================================================================*/
+DOMString
+ixmlNodetoString( IN IXML_Node * node )
+{
+
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( node == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixmlDomTreetoString( node, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlRelaxParser
+*       Makes the XML parser more tolerant to malformed text.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlRelaxParser(char errorChar)
+{
+    Parser_setErrorChar( errorChar );
 }
 
 
-/*!
+/*================================================================
- * \brief Recursive function to print all the node in a tree.
+*   ixmlParseBufferEx
- * Internal to parser only.
+*       Parse xml file stored in buffer.
- */
+*       External function.
-static void ixmlPrintDomTreeRecursive(
+*
-	/*! [in] \todo documentation. */
+*=================================================================*/
-	IXML_Node *nodeptr,
+int
-	/*! [in] \todo documentation. */
+ixmlParseBufferEx( IN const char *buffer,
-	ixml_membuf *buf)
+                   IXML_Document ** retDoc )
 {
-	const char *nodeName = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL,
-	*sibling = NULL;
 
-	if (nodeptr != NULL) {
+    if( ( buffer == NULL ) || ( retDoc == NULL ) ) {
-		nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
+        return IXML_INVALID_PARAMETER;
-		nodeValue = ixmlNode_getNodeValue(nodeptr);
+    }
-		
-		switch (ixmlNode_getNodeType(nodeptr)) {
-		case eTEXT_NODE:
-			copy_with_escape(buf, nodeValue);
-			break;
 
-		case eCDATA_SECTION_NODE:
+    if( buffer[0] == '\0' ) {
-			ixml_membuf_append_str(buf, "<![CDATA[");
+        return IXML_INVALID_PARAMETER;
-			ixml_membuf_append_str(buf, nodeValue);
+    }
-			ixml_membuf_append_str(buf, "]]>");
-			break;
 
-		case ePROCESSING_INSTRUCTION_NODE:
+    return Parser_LoadDocument( retDoc, buffer, FALSE );
-			ixml_membuf_append_str(buf, "<?");
-			ixml_membuf_append_str(buf, nodeName);
-			ixml_membuf_append_str(buf, " ");
-			copy_with_escape(buf, nodeValue);
-			ixml_membuf_append_str(buf, "?>\n");
-			break;
-
-		case eDOCUMENT_NODE:
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getFirstChild(nodeptr), buf);
-			break;
-
-		case eATTRIBUTE_NODE:
-			ixml_membuf_append_str(buf, nodeName);
-			ixml_membuf_append_str(buf, "=\"");
-			copy_with_escape(buf, nodeValue);
-			ixml_membuf_append_str(buf, "\"");
-			if (nodeptr->nextSibling != NULL) {
-				ixml_membuf_append_str(buf, " ");
-				ixmlPrintDomTreeRecursive(nodeptr->nextSibling, buf);
-			}
-			break;
-
-		case eELEMENT_NODE:
-			ixml_membuf_append_str(buf, "<");
-			ixml_membuf_append_str(buf, nodeName);
-			if (nodeptr->firstAttr != NULL) {
-				ixml_membuf_append_str(buf, " ");
-				ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
-			}
-			child = ixmlNode_getFirstChild(nodeptr);
-			if (child != NULL &&
-			    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-				ixml_membuf_append_str(buf, ">\r\n");
-			} else {
-				ixml_membuf_append_str(buf, ">");
-			}
-			/* output the children */
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getFirstChild(nodeptr), buf);
-
-			/* Done with children.  Output the end tag. */
-			ixml_membuf_append_str(buf, "</");
-			ixml_membuf_append_str(buf, nodeName);
-
-			sibling = ixmlNode_getNextSibling(nodeptr);
-			if (sibling != NULL &&
-			    ixmlNode_getNodeType(sibling) == eTEXT_NODE) {
-				ixml_membuf_append_str( buf, ">" );
-			} else {
-				ixml_membuf_append_str( buf, ">\r\n" );
-			}
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getNextSibling(nodeptr), buf);
-			break;
-
-		default:
-			IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTreeRecursive",
-				"Warning, unknown node type %d\n",
-				(int)ixmlNode_getNodeType(nodeptr));
-			break;
-		}
-	}
 }
 
-
+/*================================================================
-/*!
+*   ixmlParseBuffer
- * \brief Print a DOM tree.
+*       Parse xml file stored in buffer.
- *
+*       External function.
- * Element, and Attribute nodes are handled differently. We don't want to print
+*
- * the Element and Attribute nodes' sibling.
+*=================================================================*/
- */
+IXML_Document *
-static void ixmlPrintDomTree(
+ixmlParseBuffer( IN const char *buffer )
-	/*! [in] \todo documentation. */
-	IXML_Node *nodeptr,
-	/*! [in] \todo documentation. */
-	ixml_membuf *buf)
 {
-	const char *nodeName = NULL;
+    IXML_Document *doc = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL;
 
-	if (nodeptr == NULL || buf == NULL) {
+    ixmlParseBufferEx( buffer, &doc );
-		return;
+    return doc;
-	}
-
-	nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
-	nodeValue = ixmlNode_getNodeValue(nodeptr);
-	switch (ixmlNode_getNodeType(nodeptr)) {
-	case eTEXT_NODE:
-	case eCDATA_SECTION_NODE:
-	case ePROCESSING_INSTRUCTION_NODE:
-	case eDOCUMENT_NODE:
-		ixmlPrintDomTreeRecursive(nodeptr, buf);
-		break;
-
-	case eATTRIBUTE_NODE:
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, "=\"");
-		copy_with_escape(buf, nodeValue);
-		ixml_membuf_append_str(buf, "\"");
-		break;
-
-	case eELEMENT_NODE:
-		ixml_membuf_append_str(buf, "<");
-		ixml_membuf_append_str(buf, nodeName);
-		if (nodeptr->firstAttr != NULL) {
-			ixml_membuf_append_str(buf, " ");
-			ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
-		}
-		child = ixmlNode_getFirstChild(nodeptr);
-		if (child != NULL &&
-		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-			ixml_membuf_append_str(buf, ">\r\n");
-		} else {
-			ixml_membuf_append_str(buf, ">");
-		}
-
-		/* output the children */
-		ixmlPrintDomTreeRecursive(
-			ixmlNode_getFirstChild(nodeptr), buf);
-
-		/* Done with children. Output the end tag. */
-		ixml_membuf_append_str(buf, "</");
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, ">\r\n");
-		break;
-
-	default:
-		IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTree",
-			"Warning, unknown node type %d\n",
-			(int)ixmlNode_getNodeType(nodeptr));
-		break;
-	}
 }
 
-
+/*================================================================
-/*!
+*   ixmlCloneDOMString
- * \brief Converts a DOM tree into a text string.
+*       Clones a DOM String.
- *
+*       External function.
- * Element, and Attribute nodes are handled differently. We don't want to print
+*
- * the Element and Attribute nodes' sibling.
+*=================================================================*/
- */
+DOMString
-static void ixmlDomTreetoString(
+ixmlCloneDOMString( IN const DOMString src )
-	/*! [in] \todo documentation. */
-	IXML_Node *nodeptr,
-	/*! [in] \todo documentation. */
-	ixml_membuf *buf)
 {
-	const char *nodeName = NULL;
+    if( src == NULL ) {
-	const char *nodeValue = NULL;
+        return NULL;
-	IXML_Node *child = NULL;
+    }
 
-	if (nodeptr == NULL || buf == NULL) {
+    return ( strdup( src ) );
-		return;
-	}
-
-	nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
-	nodeValue = ixmlNode_getNodeValue(nodeptr);
-
-	switch (ixmlNode_getNodeType(nodeptr)) {
-	case eTEXT_NODE:
-	case eCDATA_SECTION_NODE:
-	case ePROCESSING_INSTRUCTION_NODE:
-	case eDOCUMENT_NODE:
-		ixmlPrintDomTreeRecursive(nodeptr, buf);
-		break;
-
-	case eATTRIBUTE_NODE:
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, "=\"");
-		copy_with_escape(buf, nodeValue );
-		ixml_membuf_append_str(buf, "\"");
-		break;
-
-	case eELEMENT_NODE:
-		ixml_membuf_append_str(buf, "<");
-		ixml_membuf_append_str(buf, nodeName);
-		if (nodeptr->firstAttr != NULL) {
-			ixml_membuf_append_str(buf, " ");
-			ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
-		}
-		child = ixmlNode_getFirstChild(nodeptr);
-		if (child != NULL &&
-		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-			ixml_membuf_append_str(buf, ">");
-		} else {
-			ixml_membuf_append_str(buf, ">");
-		}
-
-		/* output the children */
-		ixmlPrintDomTreeRecursive(ixmlNode_getFirstChild(nodeptr), buf);
-
-		/* Done with children. Output the end tag. */
-		ixml_membuf_append_str(buf, "</");
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, ">");
-		break;
-
-	default:
-		IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTreeRecursive",
-			"Warning, unknown node type %d\n",
-			(int)ixmlNode_getNodeType(nodeptr));
-		break;
-	}
 }
 
-
+/*================================================================
-int ixmlLoadDocumentEx(const char *xmlFile, IXML_Document **doc)
+*   ixmlFreeDOMString
+*       Frees a DOM String.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlFreeDOMString( IN DOMString buf )
 {
-	if (xmlFile == NULL || doc == NULL) {
+    if( buf != NULL ) {
-		return IXML_INVALID_PARAMETER;
+        free( buf );
-	}
+    }
-
-	return Parser_LoadDocument(doc, xmlFile, TRUE);
 }
-
-
-IXML_Document *ixmlLoadDocument(const char *xmlFile)
-{
-	IXML_Document *doc = NULL;
-
-	ixmlLoadDocumentEx(xmlFile, &doc);
-
-	return doc;
-}
-
-
-DOMString ixmlPrintDocument(IXML_Document *doc)
-{
-	IXML_Node* rootNode = (IXML_Node *)doc;
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if(rootNode == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixml_membuf_append_str(buf, "<?xml version=\"1.0\"?>\r\n");
-	ixmlPrintDomTree(rootNode, buf);
-
-	return buf->buf;
-}
-
-
-DOMString ixmlPrintNode(IXML_Node *node)
-{
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if (node == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixmlPrintDomTree(node, buf);
-
-	return buf->buf;
-}
-
-
-DOMString ixmlDocumenttoString(IXML_Document *doc)
-{
-	IXML_Node* rootNode = (IXML_Node *)doc;
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if(rootNode == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixml_membuf_append_str(buf, "<?xml version=\"1.0\"?>\r\n");
-	ixmlDomTreetoString(rootNode, buf);
-
-	return buf->buf;
-}
-
-
-DOMString ixmlNodetoString(IXML_Node *node)
-{
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if (node == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixmlDomTreetoString(node, buf);
-
-	return buf->buf;
-}
-
-
-void ixmlRelaxParser(char errorChar)
-{
-	Parser_setErrorChar(errorChar);
-}
-
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-void ixmlSetBeforeFree(IXML_BeforeFreeNode_t hndlr)
-{
-	Parser_setBeforeFree(hndlr);
-}
-#endif
-
-
-int ixmlParseBufferEx(const char *buffer, IXML_Document **retDoc)
-{
-	if (buffer == NULL || retDoc == NULL) {
-		return IXML_INVALID_PARAMETER;
-	}
-
-	if (buffer[0] == '\0') {
-		return IXML_INVALID_PARAMETER;
-	}
-
-	return Parser_LoadDocument(retDoc, buffer, FALSE);
-}
-
-
-IXML_Document *ixmlParseBuffer(const char *buffer)
-{
-	IXML_Document *doc = NULL;
-
-	ixmlParseBufferEx(buffer, &doc);
-
-	return doc;
-}
-
-
-DOMString ixmlCloneDOMString(const DOMString src)
-{
-	if (src == NULL) {
-		return NULL;
-	}
-
-	return strdup(src);
-}
-
-
-void ixmlFreeDOMString(DOMString buf)
-{
-	if (buf != NULL) {
-		free(buf);
-	}
-}
-

ixml/src/ixmldebug.c

@@ -1,70 +0,0 @@
-
-
-/*!
- * \file
- */
-
-
-#include "autoconfig.h"
-
-
-#include "ixmldebug.h"
-
-
-#include <stdarg.h>
-#include <stdio.h>
-
-
-#ifdef DEBUG
-void IxmlPrintf(
-	const char *DbgFileName,
-	int DbgLineNo,
-	const char *FunctionName,
-	const char *FmtStr,
-	...)
-{
-	va_list ArgList;
-	
-	FILE *fp = stdout;
-	fprintf(fp, "(%s::%s), line %d", DbgFileName, FunctionName, DbgLineNo);
-	if (FmtStr) {
-		fprintf(fp, ": ");
-		va_start(ArgList, FmtStr);
-		vfprintf(fp, FmtStr, ArgList);
-		fflush(fp);
-		va_end(ArgList);
-	} else {
-		fprintf(fp, "\n");
-	}
-}
-
-
-void printNodes(IXML_Node *tmpRoot, int depth)
-{
-    unsigned long i;
-    IXML_NodeList *NodeList1;
-    IXML_Node *ChildNode1;
-    unsigned short NodeType;
-    const DOMString NodeValue;
-    const DOMString NodeName;
-    NodeList1 = ixmlNode_getChildNodes(tmpRoot);
-    for (i = 0; i < 100; ++i) {
-        ChildNode1 = ixmlNodeList_item(NodeList1, i);
-        if (ChildNode1 == NULL) {
-            break;
-        }
-    
-        printNodes(ChildNode1, depth+1);
-        NodeType = ixmlNode_getNodeType(ChildNode1);
-        NodeValue = ixmlNode_getNodeValue(ChildNode1);
-        NodeName = ixmlNode_getNodeName(ChildNode1);
-	IxmlPrintf(__FILE__, __LINE__, "printNodes",
-            "DEPTH-%2d-IXML_Node Type %d, "
-            "IXML_Node Name: %s, IXML_Node Value: %s\n",
-            depth, NodeType, NodeName, NodeValue);
-    }
-}
-
-
-#endif
-

ixml/src/ixmlmembuf.c

@@ -1,219 +1,236 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- **************************************************************************/
-
-
-/*!
- * \file
- */
-
-
-#include "ixmlmembuf.h"
-#include "ixml.h"
-
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include "ixmlmembuf.h"
+#include "ixml.h"
 
-
+/*================================================================
-/*!
+*   ixml_membuf_set_size
- * \brief Increases or decreases buffer capacity so that at least 'new_length'
+*
- * bytes can be stored.
+*   Increases or decreases buffer cap so that at least
- *
+*   'new_length' bytes can be stored
- * On error, m's fields do not change.
+*
- *
+*   On error, m's fields do not change.
- * \return
+*
- * 	\li UPNP_E_SUCCESS
+*   returns:
- * 	\li UPNP_E_OUTOF_MEMORY
+*       UPNP_E_SUCCESS
- */
+*       UPNP_E_OUTOF_MEMORY
-static int ixml_membuf_set_size(
+*
-	/*! [in,out] The memory buffer. */
+*=================================================================*/
-	INOUT ixml_membuf *m,
+static int
-	/*! [in] The new lenght. */
+ixml_membuf_set_size( INOUT ixml_membuf * m,
-	IN size_t new_length)
+                      IN size_t new_length )
 {
-	size_t diff;
+    size_t diff;
-	size_t alloc_len;
+    size_t alloc_len;
-	char *temp_buf;
+    char *temp_buf;
 
-	if (new_length >= m->length) {
+    if( new_length >= m->length )   // increase length
-		/* increase length */
+    {
-		/* need more mem? */
+        // need more mem?
-		if (new_length <= m->capacity) {
+        if( new_length <= m->capacity ) {
-			/* have enough mem; done */
+            return 0;           // have enough mem; done
-			return 0;
+        }
-		}
 
-		diff = new_length - m->length;
+        diff = new_length - m->length;
-		alloc_len = MAXVAL(m->size_inc, diff) + m->capacity;
+        alloc_len = MAXVAL( m->size_inc, diff ) + m->capacity;
-	} else {
+    } else                      // decrease length
-		/* decrease length */
+    {
-		assert(new_length <= m->length);
+        assert( new_length <= m->length );
 
-		/* if diff is 0..m->size_inc, don't free */
+        // if diff is 0..m->size_inc, don't free
-		if ((m->capacity - new_length) <= m->size_inc) {
+        if( ( m->capacity - new_length ) <= m->size_inc ) {
-			return 0;
+            return 0;
-		}
+        }
-		alloc_len = new_length + m->size_inc;
-	}
 
-	assert(alloc_len >= new_length);
+        alloc_len = new_length + m->size_inc;
+    }
 
-	temp_buf = realloc(m->buf, alloc_len + (size_t)1);
+    assert( alloc_len >= new_length );
-	if (temp_buf == NULL) {
-		/* try smaller size */
-		alloc_len = new_length;
-		temp_buf = realloc(m->buf, alloc_len + (size_t)1);
-		if (temp_buf == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-	}
-	/* save */
-	m->buf = temp_buf;
-	m->capacity = alloc_len;
 
-	return 0;
+    temp_buf = realloc( m->buf, alloc_len + 1 );
+    if( temp_buf == NULL ) {
+        // try smaller size
+        alloc_len = new_length;
+        temp_buf = realloc( m->buf, alloc_len + 1 );
+
+        if( temp_buf == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+    }
+    // save
+    m->buf = temp_buf;
+    m->capacity = alloc_len;
+    return 0;
 }
 
-
+/*================================================================
-void ixml_membuf_init(ixml_membuf *m)
+*   membuffer_init
+*
+*
+*=================================================================*/
+void
+ixml_membuf_init( INOUT ixml_membuf * m )
 {
-	assert(m != NULL);
+    assert( m != NULL );
 
-	m->size_inc = MEMBUF_DEF_SIZE_INC;
+    m->size_inc = MEMBUF_DEF_SIZE_INC;
-	m->buf = NULL;
+    m->buf = NULL;
-	m->length = (size_t)0;
+    m->length = 0;
-	m->capacity = (size_t)0;
+    m->capacity = 0;
 }
 
-
+/*================================================================
-void ixml_membuf_destroy(ixml_membuf *m)
+*   membuffer_destroy
+*
+*
+*=================================================================*/
+void
+ixml_membuf_destroy( INOUT ixml_membuf * m )
 {
-	if (m == NULL) {
+    if( m == NULL ) {
-		return;
+        return;
-	}
+    }
 
-	free(m->buf);
+    free( m->buf );
-	ixml_membuf_init(m);
+    ixml_membuf_init( m );
 }
 
-
+/*================================================================
-int ixml_membuf_assign(
+*   ixml_membuf_assign
-	ixml_membuf *m,
+*
-	const void *buf,
+*
-	size_t buf_len)
+*=================================================================*/
+int
+ixml_membuf_assign( INOUT ixml_membuf * m,
+                    IN const void *buf,
+                    IN size_t buf_len )
 {
-	int return_code;
+    int return_code;
 
-	assert(m != NULL);
+    assert( m != NULL );
 
-	/* set value to null */
+    // set value to null
-	if (buf == NULL) {
+    if( buf == NULL ) {
-		ixml_membuf_destroy(m);
+        ixml_membuf_destroy( m );
-		return IXML_SUCCESS;
+        return IXML_SUCCESS;
-	}
+    }
-	/* alloc mem */
+    // alloc mem
-	return_code = ixml_membuf_set_size(m, buf_len);
+    return_code = ixml_membuf_set_size( m, buf_len );
-	if (return_code != 0) {
+    if( return_code != 0 ) {
-		return return_code;
+        return return_code;
-	}
+    }
+    // copy
+    memcpy( m->buf, buf, buf_len );
+    m->buf[buf_len] = 0;        // null-terminate
 
-	/* copy */
+    m->length = buf_len;
-	memcpy(m->buf, buf, buf_len);
 
-	/* null-terminate */
+    return IXML_SUCCESS;
-	m->buf[buf_len] = 0;
-	m->length = buf_len;
 
-	return IXML_SUCCESS;
 }
 
-
+/*================================================================
-int ixml_membuf_assign_str(
+*   ixml_membuf_assign_str
-	ixml_membuf *m,
+*
-	const char *c_str)
+*
+*=================================================================*/
+int
+ixml_membuf_assign_str( INOUT ixml_membuf * m,
+                        IN const char *c_str )
 {
-	return ixml_membuf_assign(m, c_str, strlen(c_str));
+    return ixml_membuf_assign( m, c_str, strlen( c_str ) );
 }
 
-
+/*================================================================
-int ixml_membuf_append(
+*   ixml_membuf_append
-	INOUT ixml_membuf *m,
+*
-	IN const void *buf)
+*
+*=================================================================*/
+int
+ixml_membuf_append( INOUT ixml_membuf * m,
+                    IN const void *buf )
 {
-	assert(m != NULL);
+    assert( m != NULL );
 
-	return ixml_membuf_insert(m, buf, (size_t)1, m->length);
+    return ixml_membuf_insert( m, buf, 1, m->length );
 }
 
-
+/*================================================================
-int ixml_membuf_append_str(
+*   ixml_membuf_append_str
-	INOUT ixml_membuf *m,
+*
-	IN const char *c_str)
+*
+*=================================================================*/
+int
+ixml_membuf_append_str( INOUT ixml_membuf * m,
+                        IN const char *c_str )
 {
-	return ixml_membuf_insert(m, c_str, strlen(c_str), m->length);
+    return ixml_membuf_insert( m, c_str, strlen( c_str ), m->length );
 }
 
-
+/*================================================================
-int ixml_membuf_insert(
+*   ixml_membuf_insert
-	INOUT ixml_membuf *m,
+*
-	IN const void *buf,
+*
-	IN size_t buf_len,
+*=================================================================*/
-	size_t index)
+int
+ixml_membuf_insert( INOUT ixml_membuf * m,
+                    IN const void *buf,
+                    IN size_t buf_len,
+                    int index )
 {
-	int return_code = 0;
+    int return_code;
 
-	assert(m != NULL);
+    assert( m != NULL );
 
-	if (index > m->length) {
+    if( index < 0 || index > ( int )m->length )
-		return IXML_INDEX_SIZE_ERR;
+        return IXML_INDEX_SIZE_ERR;
-	}
 
-	if (buf == NULL || buf_len == (size_t)0) {
+    if( buf == NULL || buf_len == 0 ) {
-		return 0;
+        return 0;
-	}
+    }
-	/* alloc mem */
+    // alloc mem
-	return_code = ixml_membuf_set_size(m, m->length + buf_len);
+    return_code = ixml_membuf_set_size( m, m->length + buf_len );
-	if (return_code != 0) {
+    if( return_code != 0 ) {
-		return return_code;
+        return return_code;
-	}
+    }
-	/* insert data */
+    // insert data
-	/* move data to right of insertion point */
+    // move data to right of insertion point
-	memmove(m->buf + index + buf_len, m->buf + index, m->length - index);
+    memmove( m->buf + index + buf_len, m->buf + index, m->length - index );
-	memcpy(m->buf + index, buf, buf_len);
+    memcpy( m->buf + index, buf, buf_len );
-	m->length += buf_len;
+    m->length += buf_len;
-	/* Null terminate */
+    m->buf[m->length] = 0;      // null-terminate
-	m->buf[m->length] = 0;
 
-	return 0;
+    return 0;
 }
-

ixml/src/namedNodeMap.c

@@ -1,196 +1,242 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- **************************************************************************/
-
-
-/*!
- * \file
- */
-
 
 #include "ixmlparser.h"
 
-
+/*================================================================
-#include <assert.h>
+*   NamedNodeMap_getItemNumber
-#include <stdlib.h> /* for free(), malloc() */
+*       return the item number of a item in NamedNodeMap.
-#include <string.h>
+*       Internal to parser only.
-
+*   Parameters:
-
+*       name: the name of the item to find
-/*!
+*   
- * \brief Return the item number of a item in NamedNodeMap.
+*=================================================================*/
- */
+unsigned long
-static unsigned long ixmlNamedNodeMap_getItemNumber(
+ixmlNamedNodeMap_getItemNumber( IN IXML_NamedNodeMap * nnMap,
-	/*! [in] The named node map to process. */
+                                IN const char *name )
-	IN IXML_NamedNodeMap *nnMap,
-	/*! [in] The name of the item to find. */
-	IN const char *name)
 {
-	IXML_Node *tempNode;
+    IXML_Node *tempNode;
-	unsigned long returnItemNo = 0lu;
+    unsigned long returnItemNo = 0;
 
-	assert(nnMap != NULL && name != NULL);
+    assert( nnMap != NULL && name != NULL );
-	if (nnMap == NULL || name == NULL) {
+    if( ( nnMap == NULL ) || ( name == NULL ) ) {
-		return (unsigned long)IXML_INVALID_ITEM_NUMBER;
+        return IXML_INVALID_ITEM_NUMBER;
-	}
+    }
 
-	tempNode = nnMap->nodeItem;
+    tempNode = nnMap->nodeItem;
-	while (tempNode != NULL) {
+    while( tempNode != NULL ) {
-		if (strcmp(name, tempNode->nodeName) == 0) {
+        if( strcmp( name, tempNode->nodeName ) == 0 ) {
-			return returnItemNo;
+            return returnItemNo;
-		}
+        }
-		tempNode = tempNode->nextSibling;
-		returnItemNo++;
-	}
 
-	return (unsigned long)IXML_INVALID_ITEM_NUMBER;
+        tempNode = tempNode->nextSibling;
+        returnItemNo++;
+    }
+
+    return IXML_INVALID_ITEM_NUMBER;
 }
 
-
+/*================================================================
-void ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap)
+*   NamedNodeMap_init
+*       Initializes a NamedNodeMap object.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNamedNodeMap_init( IN IXML_NamedNodeMap * nnMap )
 {
-	assert(nnMap != NULL);
+    assert( nnMap != NULL );
-
+    memset( nnMap, 0, sizeof( IXML_NamedNodeMap ) );
-	memset(nnMap, 0, sizeof (IXML_NamedNodeMap));
 }
 
-
+/*================================================================
-IXML_Node *ixmlNamedNodeMap_getNamedItem(
+*   NamedNodeMap_getNamedItem
-	IXML_NamedNodeMap *nnMap,
+*       Retrieves a node specified by name.
-	const DOMString name)
+*       External function.
+*
+*   Parameter:
+*       name: type nodeName of a node to retrieve.
+*
+*   Return Value:
+*       A Node with the specified nodeName, or null if it
+*       does not identify any node in this map.
+*
+*=================================================================*/
+IXML_Node *
+ixmlNamedNodeMap_getNamedItem( IN IXML_NamedNodeMap * nnMap,
+                               IN const char *name )
 {
-	unsigned long index;
+    long index;
 
-	if (nnMap == NULL || name == NULL) {
+    if( ( nnMap == NULL ) || ( name == NULL ) ) {
-		return NULL;
+        return NULL;
-	}
+    }
 
-	index = ixmlNamedNodeMap_getItemNumber(nnMap, name);
+    index = ixmlNamedNodeMap_getItemNumber( nnMap, name );
-	if (index == (unsigned long)IXML_INVALID_ITEM_NUMBER) {
+    if( index == IXML_INVALID_ITEM_NUMBER ) {
-		return NULL;
+        return NULL;
-	} else {
+    } else {
-		return ixmlNamedNodeMap_item(nnMap, index);
+        return ( ixmlNamedNodeMap_item( nnMap, ( unsigned long )index ) );
-	}
+    }
 }
 
-
+/*================================================================
-IXML_Node *ixmlNamedNodeMap_item(
+*   NamedNodeMap_item
-	IN IXML_NamedNodeMap *nnMap,
+*       Returns the indexth item in the map. If index is greater than or
-	IN unsigned long index )
+*       equal to the number of nodes in this map, this returns null.
+*       External function.
+*
+*   Parameter:
+*       index: index into this map.
+*
+*   Return Value:
+*       The node at the indexth position in the map, or null if that is
+*       not a valid index.
+*
+*=================================================================*/
+IXML_Node *
+ixmlNamedNodeMap_item( IN IXML_NamedNodeMap * nnMap,
+                       IN unsigned long index )
 {
-	IXML_Node *tempNode;
+    IXML_Node *tempNode;
-	unsigned int i;
+    unsigned int i;
 
-	if (nnMap == NULL) {
+    if( nnMap == NULL ) {
-		return NULL;
+        return NULL;
-	}
+    }
 
-	if (index > ixmlNamedNodeMap_getLength(nnMap) - 1lu) {
+    if( index > ixmlNamedNodeMap_getLength( nnMap ) - 1 ) {
-		return NULL;
+        return NULL;
-	}
+    }
 
-	tempNode = nnMap->nodeItem;
+    tempNode = nnMap->nodeItem;
-	for (i = 0u; i < index && tempNode != NULL; ++i) {
+    for( i = 0; i < index && tempNode != NULL; ++i ) {
-		tempNode = tempNode->nextSibling;
+        tempNode = tempNode->nextSibling;
-	}
+    }
 
-	return tempNode;
+    return tempNode;
 }
 
-
+/*================================================================
-unsigned long ixmlNamedNodeMap_getLength(IXML_NamedNodeMap *nnMap)
+*   NamedNodeMap_getLength	
+*       Return the number of Nodes in this map.       
+*       External function.
+*   
+*   Parameters:
+*
+*=================================================================*/
+unsigned long
+ixmlNamedNodeMap_getLength( IN IXML_NamedNodeMap * nnMap )
 {
-	IXML_Node *tempNode;
+    IXML_Node *tempNode;
-	unsigned long length = 0lu;
+    unsigned long length = 0;
 
-	if (nnMap != NULL) {
+    if( nnMap != NULL ) {
-		tempNode = nnMap->nodeItem;
+        tempNode = nnMap->nodeItem;
-		for (length = 0lu; tempNode != NULL; ++length) {
+        for( length = 0; tempNode != NULL; ++length ) {
-			tempNode = tempNode->nextSibling;
+            tempNode = tempNode->nextSibling;
-		}
+        }
-	}
+    }
-
+    return length;
-	return length;
 }
 
-
+/*================================================================
-void ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap)
+*   ixmlNamedNodeMap_free
+*       frees a NamedNodeMap.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNamedNodeMap_free( IXML_NamedNodeMap * nnMap )
 {
-	IXML_NamedNodeMap *pNext;
+    IXML_NamedNodeMap *pNext;
 
-	while (nnMap != NULL) {
+    while( nnMap != NULL ) {
-		pNext = nnMap->next;
+        pNext = nnMap->next;
-		free(nnMap);
+        free( nnMap );
-		nnMap = pNext;
+        nnMap = pNext;
-	}
+    }
 }
 
-
+/*================================================================
-int ixmlNamedNodeMap_addToNamedNodeMap(
+*   NamedNodeMap_addToNamedNodeMap
-	IXML_NamedNodeMap **nnMap,
+*       add a node to a NamedNodeMap.
-	IXML_Node *add)
+*       Internal to parser only.
+*   Parameters:
+*       add: the node to add into NamedNodeMap.
+*   Return:
+*       IXML_SUCCESS or failure.
+*
+*=================================================================*/
+int
+ixmlNamedNodeMap_addToNamedNodeMap( IN IXML_NamedNodeMap ** nnMap,
+                                    IN IXML_Node * add )
 {
-	IXML_NamedNodeMap *traverse = NULL;
+    IXML_NamedNodeMap *traverse = NULL,
-	IXML_NamedNodeMap *p = NULL;
+     *p = NULL;
-	IXML_NamedNodeMap *newItem = NULL;
+    IXML_NamedNodeMap *newItem = NULL;
 
-	if(add == NULL) {
+    if( add == NULL ) {
-		return IXML_SUCCESS;
+        return IXML_SUCCESS;
-	}
+    }
 
-	if (*nnMap == NULL) {
+    if( *nnMap == NULL )        // nodelist is empty
-		/* nodelist is empty */
+    {
-		*nnMap = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
+        *nnMap =
-		if (*nnMap == NULL) {
+            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
-			return IXML_INSUFFICIENT_MEMORY;
+        if( *nnMap == NULL ) {
-		}
+            return IXML_INSUFFICIENT_MEMORY;
-		ixmlNamedNodeMap_init(*nnMap);
+        }
-	}
+        ixmlNamedNodeMap_init( *nnMap );
-	if ((*nnMap)->nodeItem == NULL) {
+    }
-		(*nnMap)->nodeItem = add;
-	} else {
-		traverse = *nnMap;
-		p = traverse;
-		while (traverse != NULL) {
-			p = traverse;
-			traverse = traverse->next;
-		}
-		newItem = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
-		if (newItem == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		p->next = newItem;
-		newItem->nodeItem = add;
-		newItem->next = NULL;
-	}
 
-	return IXML_SUCCESS;
+    if( ( *nnMap )->nodeItem == NULL ) {
+        ( *nnMap )->nodeItem = add;
+    } else {
+        traverse = *nnMap;
+        p = traverse;
+        while( traverse != NULL ) {
+            p = traverse;
+            traverse = traverse->next;
+        }
+
+        newItem =
+            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
+        if( newItem == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        p->next = newItem;
+        newItem->nodeItem = add;
+        newItem->next = NULL;
+    }
+
+    return IXML_SUCCESS;
 }
-

ixml/src/nodeList.c

@@ -1,153 +1,176 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
-
-
-/*!
- * \file
- */
-
 
 #include "ixmlparser.h"
 
-
+/*================================================================
-#include <assert.h>
+*   ixmlNodeList_init
-#include <string.h>
+*       initializes a nodelist 
-
+*       External function.
-
+*
-void ixmlNodeList_init(IXML_NodeList *nList)
+*=================================================================*/
+void
+ixmlNodeList_init( IXML_NodeList * nList )
 {
-	assert(nList != NULL);
+    assert( nList != NULL );
+
+    memset( nList, 0, sizeof( IXML_NodeList ) );
 
-	memset(nList, 0, sizeof (IXML_NodeList));
 }
 
-
+/*================================================================
-IXML_Node *ixmlNodeList_item(
+*   ixmlNodeList_item
-	IXML_NodeList *nList,
+*       Returns the indexth item in the collection. If index is greater
-	unsigned long index)
+*       than or equal to the number of nodes in the list, this returns 
+*       null.
+*       External function.
+*
+*=================================================================*/
+IXML_Node *
+ixmlNodeList_item( IXML_NodeList * nList,
+                   unsigned long index )
 {
-	IXML_NodeList *next;
+    IXML_NodeList *next;
-	unsigned int i;
+    unsigned int i;
 
-	/* if the list ptr is NULL */
+    // if the list ptr is NULL
-	if (nList == NULL) {
+    if( nList == NULL ) {
-		return NULL;
+        return NULL;
-	}
+    }
-	/* if index is more than list length */
+    // if index is more than list length
-	if (index > ixmlNodeList_length(nList) - 1lu) {
+    if( index > ixmlNodeList_length( nList ) - 1 ) {
-		return NULL;
+        return NULL;
-	}
+    }
 
-	next = nList;
+    next = nList;
-	for (i = 0u; i < index && next != NULL; ++i) {
+    for( i = 0; i < index && next != NULL; ++i ) {
-		next = next->next;
+        next = next->next;
-	}
+    }
 
-	if (next == NULL) {
+    if( next == NULL ) return NULL;
-		return NULL;
+
-	}
+    return next->nodeItem;
 
-	return next->nodeItem;
 }
 
-int ixmlNodeList_addToNodeList(
+/*================================================================
-	IXML_NodeList **nList,
+*   ixmlNodeList_addToNodeList
-	IXML_Node *add)
+*       Add a node to nodelist
+*       Internal to parser only.
+*
+*=================================================================*/
+int
+ixmlNodeList_addToNodeList( IN IXML_NodeList ** nList,
+                            IN IXML_Node * add )
 {
-	IXML_NodeList *traverse = NULL;
+    IXML_NodeList *traverse,
-	IXML_NodeList *p = NULL;
+     *p = NULL;
-	IXML_NodeList *newListItem;
+    IXML_NodeList *newListItem;
 
-	assert(add != NULL);
+    assert( add != NULL );
 
-	if (add == NULL) {
+    if( add == NULL ) {
-		return IXML_FAILED;
+        return IXML_FAILED;
-	}
+    }
 
-	if (*nList == NULL) {
+    if( *nList == NULL )        // nodelist is empty
-		/* nodelist is empty */
+    {
-		*nList = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
+        *nList = ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
-		if (*nList == NULL) {
+        if( *nList == NULL ) {
-			return IXML_INSUFFICIENT_MEMORY;
+            return IXML_INSUFFICIENT_MEMORY;
-		}
+        }
 
-		ixmlNodeList_init(*nList);
+        ixmlNodeList_init( *nList );
-	}
+    }
 
-	if ((*nList)->nodeItem == NULL) {
+    if( ( *nList )->nodeItem == NULL ) {
-		(*nList)->nodeItem = add;
+        ( *nList )->nodeItem = add;
-	} else {
+    } else {
-		traverse = *nList;
+        traverse = *nList;
-		while (traverse != NULL) {
+        while( traverse != NULL ) {
-			p = traverse;
+            p = traverse;
-			traverse = traverse->next;
+            traverse = traverse->next;
-		}
+        }
 
-		newListItem = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
+        newListItem =
-		if (newListItem == NULL) {
+            ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
-			return IXML_INSUFFICIENT_MEMORY;
+        if( newListItem == NULL ) {
-		}
+            return IXML_INSUFFICIENT_MEMORY;
-		p->next = newListItem;
+        }
-		newListItem->nodeItem = add;
+        p->next = newListItem;
-		newListItem->next = NULL;
+        newListItem->nodeItem = add;
-	}
+        newListItem->next = NULL;
+    }
 
-	return IXML_SUCCESS;
+    return IXML_SUCCESS;
 }
 
-
+/*================================================================
-unsigned long ixmlNodeList_length(IXML_NodeList *nList)
+*   ixmlNodeList_length
+*       Returns the number of nodes in the list.  The range of valid
+*       child node indices is 0 to length-1 inclusive.
+*       External function.       
+*
+*=================================================================*/
+unsigned long
+ixmlNodeList_length( IN IXML_NodeList * nList )
 {
-	IXML_NodeList *list;
+    IXML_NodeList *list;
-	unsigned long length = 0lu;
+    unsigned long length = 0;
 
-	list = nList;
+    list = nList;
-	while (list != NULL) {
+    while( list != NULL ) {
-		++length;
+        ++length;
-		list = list->next;
+        list = list->next;
-	}
+    }
 
-	return length;
+    return length;
 }
 
-
+/*================================================================
-void ixmlNodeList_free(IXML_NodeList *nList)
+*   ixmlNodeList_free
+*       frees a nodeList
+*       External function
+*       
+*=================================================================*/
+void
+ixmlNodeList_free( IN IXML_NodeList * nList )
 {
-	IXML_NodeList *next;
+    IXML_NodeList *next;
+
+    while( nList != NULL ) {
+        next = nList->next;
+
+        free( nList );
+        nList = next;
+    }
 
-	while (nList != NULL) {
-		next = nList->next;
-		free(nList);
-		nList = next;
-	}
 }
-

libupnp.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libupnp
 Description: Linux SDK for UPnP Devices
 Version: @VERSION@
-Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
+Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
 Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
 

libupnp.spec

@@ -1,4 +1,4 @@
-Version: 1.8.0
+Version: 1.6.2
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}

m4/rt_bool_arg_enable.m4

@@ -41,7 +41,7 @@ AC_DEFUN([RT_BOOL_ARG_ENABLE],[
 		               )])
 	test "x$enable_[$1]" != [x]m4_if([$2],[yes],[no],[yes]) dnl
 		&& enable_[]Name=[$2]
-	AC_MSG_RESULT($enable_[]Name)
+	AC_MSG_RESULT($enable_[]Name)dnl
 	AM_CONDITIONAL([ENABLE_]NAME, test x"$enable_[]Name" = xyes)
 	dnl
 	m4_popdef([NAME])dnl

threadutil/Makefile.am

@@ -1,11 +1,12 @@
+# $Id: Makefile.am,v 1.2 2006/02/27 21:38:56 r3mi Exp $
 #
 # "Makefile.am" for "libupnp/threadutil"
 #
-# (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
+AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
-                          -I$(top_srcdir)/upnp/inc
+AM_CFLAGS		= $(PTHREAD_CFLAGS)
 
 if ENABLE_DEBUG
     AM_CPPFLAGS		+= -DDEBUG -DSTATS
@@ -19,16 +20,13 @@ lib_LTLIBRARIES		= libthreadutil.la
 libthreadutil_la_LDFLAGS = -version-info $(LT_VERSION_THREADUTIL)
 
 libthreadutil_la_SOURCES = \
-			inc/FreeList.h \
+			src/FreeList.c src/LinkedList.c \
-			src/FreeList.c \
+			src/ThreadPool.c src/TimerThread.c \
-			inc/LinkedList.h \
+			src/iasnprintf.c
-			src/LinkedList.c \
-			inc/ThreadPool.h \
-			src/ThreadPool.c \
-			inc/TimerThread.h \
-			src/TimerThread.c
 
 upnpincludedir		= $(includedir)/upnp
 upnpinclude_HEADERS	= \
-			inc/ithread.h
+			inc/FreeList.h inc/LinkedList.h \
+			inc/ThreadPool.h inc/TimerThread.h \
+			inc/iasnprintf.h inc/ithread.h
 

threadutil/inc/FreeList.h

@@ -32,96 +32,105 @@
 #ifndef FREE_LIST_H
 #define FREE_LIST_H
 
-/*!
- * \file
- */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "ithread.h"
-
 #include <errno.h>
 
-/*!
+/****************************************************************************
- * Free list node. points to next free item.
+ * Name: FreeListNode
- * Memory for node is borrowed from allocated items.
+ *
- * \internal
+ *  Description:
- */
+ *      free list node. points to next free item.
+ *      memory for node is borrowed from allocated items.
+ *      Internal Use Only.
+ *****************************************************************************/
 typedef struct FREELISTNODE
 {
 	struct FREELISTNODE *next;
 } FreeListNode;
 
-/*!
+
- * Stores head and size of free list, as well as mutex for protection.
+/****************************************************************************
- * \internal
+ * Name: FreeList
- */
+ *
+ *  Description:
+ *      Stores head and size of free list, as well as mutex for protection.
+ *      Internal Use Only.
+ *****************************************************************************/
 typedef struct FREELIST
 {
 	FreeListNode *head;
 	size_t element_size;
  	int maxFreeListLength;
 	int freeListLength;
-} FreeList;
+        
+}FreeList;
 
-/*!
+/****************************************************************************
- * \brief Initializes Free List.
+ * Function: FreeListInit
  *
- * Must be called first and only once for FreeList.
+ *  Description:
- *
+ *      Initializes Free List. Must be called first.
- * \return:
+ *      And only once for FreeList.
- *	\li \c 0 on success.
+ *  Parameters:
- *	\li \c EINVAL on failure.
+ *      free_list  - must be valid, non null, pointer to a linked list.
- */
+ *      size_t -     size of elements to store in free list
-int FreeListInit(
+ *      maxFreeListSize - max size that the free list can grow to
-	/*! Must be valid, non null, pointer to a linked list. */
+ *                        before returning memory to O.S.
-	FreeList *free_list,
+ *  Returns:
-	/*! Size of elements to store in free list. */
+ *      0 on success. Nonzero on failure.
-	size_t elementSize,
+ *      Always returns 0.
-	/*! Max size that the free list can grow to before returning
+ *****************************************************************************/
-	 * memory to O.S. */
+int FreeListInit(FreeList *free_list, 
-	int maxFreeListLength);
+				 size_t elementSize, 
+				 int maxFreeListSize);
 
-/*!
+/****************************************************************************
- * \brief Allocates chunk of set size.
+ * Function: FreeListAlloc
  *
- * If a free item is available in the list, returnes the stored item,
+ *  Description:
- * otherwise calls the O.S. to allocate memory.
+ *      Allocates chunk of set size.
- *
+ *      If a free item is available in the list, returnes the stored item.
- * \return Non NULL on success. NULL on failure.
+ *      Otherwise calls the O.S. to allocate memory.
- */
+ *  Parameters:
-void *FreeListAlloc(
+ *      free_list  - must be valid, non null, pointer to a linked list.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *  Returns:
-	FreeList *free_list);
+ *      Non NULL on success. NULL on failure.
+ *****************************************************************************/
+void * FreeListAlloc (FreeList *free_list);
 
-/*!
+/****************************************************************************
- * \brief Returns an item to the Free List.
+ * Function: FreeListFree
  *
- * If the free list is smaller than the max size then adds the item to the
+ *  Description:
- * free list, otherwise returns the item to the O.S.
+ *      Returns an item to the Free List.
- *
+ *      If the free list is smaller than the max size than
- * \return:
+ *      adds the item to the free list.
- *	\li \c 0 on success.
+ *      Otherwise returns the item to the O.S.
- *	\li \c EINVAL on failure.
+ *  Parameters:
- */
+ *      free_list  - must be valid, non null, pointer to a linked list.
-int FreeListFree(
+ *  Returns:
-	/*! Must be valid, non null, pointer to a free list. */
+ *      0 on success. Nonzero on failure.
-	FreeList *free_list,
+ *      Always returns 0.
-	/*! Must be a pointer allocated by FreeListAlloc. */
+ *****************************************************************************/
-	void *element);
+int FreeListFree (FreeList *free_list,void * element);
 
-/*!
+/****************************************************************************
- * \brief Releases the resources stored with the free list.
+ * Function: FreeListDestroy
  *
- * \return:
+ *  Description:
- *	\li \c 0 on success.
+ *      Releases the resources stored with the free list.
- *	\li \c EINVAL on failure.
+ *  Parameters:
- */
+ *      free_list  - must be valid, non null, pointer to a linked list.
-int FreeListDestroy(
+ *  Returns:
-	/*! Must be valid, non null, pointer to a linked list. */
+ *      0 on success. Nonzero on failure.
-	FreeList *free_list);
+ *      Always returns 0.
+ *****************************************************************************/
+int FreeListDestroy (FreeList *free_list);
+
 
 #ifdef __cplusplus
 }

threadutil/inc/LinkedList.h

@@ -32,10 +32,6 @@
 #ifndef LINKED_LIST_H
 #define LINKED_LIST_H
 
-/*!
- * \file
- */
-
 #include "FreeList.h"
 
 #ifdef __cplusplus
@@ -48,238 +44,284 @@ extern "C" {
 #define LIST_SUCCESS 1
 #define LIST_FAIL 0
 
-/*! Function for freeing list items. */
+/****************************************************************************
+ * Name: free_routine
+ *
+ *  Description:
+ *     Function for freeing list items
+ *****************************************************************************/
 typedef void (*free_function)(void *arg);
 
-/*! Function for comparing list items. Returns 1 if itemA==itemB */
+/****************************************************************************
+ * Name: cmp_routine
+ *
+ *  Description:
+ *     Function for comparing list items
+ *     Returns 1 if itemA==itemB
+ *****************************************************************************/
 typedef int (*cmp_routine)(void *itemA,void *itemB);
 
-/*! Linked list node. Stores generic item and pointers to next and prev.
+/****************************************************************************
- * \internal
+ * Name: ListNode
- */
+ *
+ *  Description:
+ *      linked list node. stores generic item and pointers to next and prev.
+ *      Internal Use Only.
+ *****************************************************************************/
 typedef struct LISTNODE
 {
-	struct LISTNODE *prev;
+  struct LISTNODE *prev;
-	struct LISTNODE *next;
+  struct LISTNODE *next;
-	void *item;
+  void *item;
 } ListNode;
 
-/*!
+/****************************************************************************
- * Linked list (no protection).
+ * Name: LinkedList
  *
- * Because this is for internal use, parameters are NOT checked for validity.
+ *  Description:
- * The first item of the list is stored at node: head->next
+ *      linked list (no protection). Internal Use Only.
- * The last item of the list is stored at node: tail->prev
+ *      Because this is for internal use, parameters are NOT checked for 
- * If head->next=tail, then list is empty.
+ *      validity.
- * To iterate through the list:
+ *      The first item of the list is stored at node: head->next
+ *      The last item of the list is stored at node: tail->prev
+ *      If head->next=tail, then list is empty.
+ *      To iterate through the list:
  *
- *	LinkedList g;
+ *       LinkedList g;
- *	ListNode *temp = NULL;
+ *       ListNode *temp = NULL;
- *	for (temp = ListHead(g);temp!=NULL;temp = ListNext(g,temp)) {
+ *       for (temp = ListHead(g);temp!=NULL;temp = ListNext(g,temp))
- *	}
+ *       {
+ *        }
  *
- * \internal
+ *****************************************************************************/
- */
 typedef struct LINKEDLIST
 {
-	/*! head, first item is stored at: head->next */
+  ListNode head; /* head, first item is stored at: head->next */
-	ListNode head;
+  ListNode tail; /* tail, last item is stored at: tail->prev  */
-	/*! tail, last item is stored at: tail->prev  */
+  long size;     /* size of list */
-	ListNode tail;
+  FreeList freeNodeList;   /* free list to use */
-	/*! size of list */
+  free_function free_func; /* free function to use */
-	long size;
+  cmp_routine cmp_func;    /* compare function to use */
-	/*! free list to use */
-	FreeList freeNodeList;
-	/*! free function to use */
-	free_function free_func;
-	/*! compare function to use */
-	cmp_routine cmp_func;
 } LinkedList;
 
-/*!
+/****************************************************************************
- * \brief Initializes LinkedList. Must be called first and only once for List.
+ * Function: ListInit
- * 
- *  \return
- *	\li \c 0 on success.
- *	\li \c EOUTOFMEM on failure.
- */
-int ListInit(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Function used to compare items. (May be NULL). */
-	cmp_routine cmp_func,
-	/*! Function used to free items. (May be NULL). */
-	free_function free_func);
-
-/*!
- * \brief Adds a node to the head of the list. Node gets immediately after
- * list head.
  *
+ *  Description:
+ *      Initializes LinkedList. Must be called first.
+ *      And only once for List.
+ *  Parameters:
+ *      list  - must be valid, non null, pointer to a linked list.
+ *      cmp_func - function used to compare items. (May be NULL)
+ *      free_func - function used to free items. (May be NULL)
+ *  Returns:
+ *      0 on success, EOUTOFMEM on failure.
+ *****************************************************************************/
+int ListInit(LinkedList *list,cmp_routine cmp_func, free_function free_func);
+
+/****************************************************************************
+ * Function: ListAddHead
+ *
+ *  Description:
+ *      Adds a node to the head of the list.
+ *      Node gets immediately after list.head.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
  *  Precondition:
  *      The list has been initialized.
- *
+ *****************************************************************************/
- * \return The pointer to the ListNode on success, NULL on failure.
+ListNode *ListAddHead(LinkedList *list, void *item);
- */
-ListNode *ListAddHead(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item);
 
-/*!
+/****************************************************************************
- * \brief Adds a node to the tail of the list. Node gets added immediately
+ * Function: ListAddTail
- * before list.tail.
  *
- * Precondition: The list has been initialized.
+ *  Description:
- *
+ *      Adds a node to the tail of the list.
- * \return The pointer to the ListNode on success, NULL on failure.
+ *      Node gets added immediately before list.tail.
- */
+ *  Parameters:
-ListNode *ListAddTail(
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *      void * item - item to be added
-	LinkedList *list,
+ *  Returns:
-	/*! Item to be added. */
+ *      The pointer to the ListNode on success, NULL on failure.
-	void *item);
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *ListAddTail(LinkedList *list, void *item);
 
-/*!
+/****************************************************************************
- * \brief Adds a node after the specified node. Node gets added immediately
+ * Function: ListAddAfter
- * after bnode.
  *
- *  Precondition: The list has been initialized.
+ *  Description:
- *
+ *      Adds a node after the specified node.
- * \return The pointer to the ListNode on success, NULL on failure.
+ *      Node gets added immediately after bnode.
- */
+ *  Parameters:
-ListNode *ListAddAfter(
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *      void * item - item to be added
-	LinkedList *list,
+ *      ListNode * bnode - node to add after
-	/*! Item to be added. */
+ *  Returns:
-	void *item,
+ *      The pointer to the ListNode on success, NULL on failure.
-	/*! Node to add after. */
+ *  Precondition:
-	ListNode *bnode);
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *ListAddAfter(LinkedList *list, void *item, ListNode *bnode);
 
-/*!
- * \brief Adds a node before the specified node. Node gets added immediately
- * before anode.
- *
- * Precondition: The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddBefore(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item,
-	/*! Node to add in front of. */
-	ListNode *anode);
 
-/*!
+/****************************************************************************
- * \brief Removes a node from the list. The memory for the node is freed.
+ * Function: ListAddBefore
  *
- * Precondition: The list has been initialized.
+ *  Description:
- *
+ *      Adds a node before the specified node.
- * \return The pointer to the item stored in the node or NULL if the item
+ *      Node gets added immediately before anode.
- * is freed.
+ *  Parameters:
- */
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
-void *ListDelNode(
+ *      ListNode * anode  - node to add the in front of.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *      void * item - item to be added
-	LinkedList *list,
+ *  Returns:
-	/*! Node to delete. */
+ *      The pointer to the ListNode on success, NULL on failure.
-	ListNode *dnode,
+ *  Precondition:
-	/*! if !0 then item is freed using free function. If 0 (or free
+ *      The list has been initialized.
-	 * function is NULL) then item is not freed. */
+ *****************************************************************************/
-	int freeItem);
+ListNode *ListAddBefore(LinkedList *list,void *item, ListNode *anode);
 
-/*!
- * \brief Removes all memory associated with list nodes. Does not free
- * LinkedList *list.
- *
- * Precondition: The list has been initialized.
- *
- * \return 0 on success, EINVAL on failure.
- */
-int ListDestroy(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! if !0 then item is freed using free function. If 0 (or free
-	 * function is NULL) then item is not freed. */
-	int freeItem);
 
-/*!
+/****************************************************************************
- * \brief Returns the head of the list.
+ * Function: ListDelNode
+ *
+ *  Description:
+ *      Removes a node from the list
+ *      The memory for the node is freed.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *dnode - done to delete.
+ *      freeItem - if !0 then item is freed using free function.
+ *                 if 0 (or free function is NULL) then item is not freed
+ *  Returns:
+ *      The pointer to the item stored in the node or NULL if the item is freed.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+void *ListDelNode(LinkedList *list,ListNode *dnode, int freeItem);
+
+/****************************************************************************
+ * Function: ListDestroy
+ *
+ *  Description:
+ *      Removes all memory associated with list nodes. 
+ *      Does not free LinkedList *list. 
  *    
- * Precondition: The list has been initialized.
+ *  Parameters:
- *
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
- * \return The head of the list. NULL if list is empty.
+ *      freeItem - if !0 then items are freed using the free_function.
- */
+ *                 if 0 (or free function is NULL) then items are not freed.
-ListNode *ListHead(
+ *  Returns:
-	/*! Must be valid, non null, pointer to a linked list. */
+ *      0 on success. Always returns 0.
-	LinkedList *list);
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int ListDestroy(LinkedList *list, int freeItem);
 
-/*!
+
- * \brief Returns the tail of the list.
+/****************************************************************************
+ * Function: ListHead
+ *
+ *  Description:
+ *      Returns the head of the list.
  *    
- * Precondition: The list has been initialized.
+ *  Parameters:
- *
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
- * \return The tail of the list. NULL if list is empty.
+ *  
- */
+ *  Returns:
-ListNode *ListTail(
+ *      The head of the list. NULL if list is empty.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *  Precondition:
-	LinkedList *list);
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListHead(LinkedList *list);
 
-/*!
+/****************************************************************************
- * \brief Returns the next item in the list.
+ * Function: ListTail
+ *
+ *  Description:
+ *      Returns the tail of the list.
  *    
- * Precondition: The list has been initialized.
+ *  Parameters:
- *
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
- * \return The next item in the list. NULL if there are no more items in list.
+ *  
- */
+ *  Returns:
-ListNode *ListNext(
+ *      The tail of the list. NULL if list is empty.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *  Precondition:
-	LinkedList *list,
+ *      The list has been initialized.
-	/*! Node from the list. */
+ *****************************************************************************/
-	ListNode *node);
+ListNode* ListTail(LinkedList *list);
 
-/*!
+/****************************************************************************
- * \brief Returns the previous item in the list.
+ * Function: ListNext
+ *
+ *  Description:
+ *      Returns the next item in the list.
  *    
- * Precondition: The list has been initialized.
+ *  Parameters:
- *
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
- * \return The previous item in the list. NULL if there are no more items in list.
+ *  
- */
+ *  Returns:
-ListNode *ListPrev(
+ *      The next item in the list. NULL if there are no more items in list.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *  Precondition:
-	LinkedList *list,
+ *      The list has been initialized.
-	/*! Node from the list. */
+ *****************************************************************************/
-	ListNode *node);
+ListNode* ListNext(LinkedList *list, ListNode * node);
 
-/*!
+/****************************************************************************
- * \brief Finds the specified item in the list.
+ * Function: ListPrev
  *
- * Uses the compare function specified in ListInit. If compare function
+ *  Description:
- * is NULL then compares items as pointers.
+ *      Returns the previous item in the list.
- *
+ *    
- * Precondition: The list has been initialized.
+ *  Parameters:
- *
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
- * \return The node containing the item. NULL if no node contains the item.
+ *  
- */
+ *  Returns:
-ListNode* ListFind(
+ *      The previous item in the list. NULL if there are no more items in list.
-	/*! Must be valid, non null, pointer to a linked list. */
+ *  Precondition:
-	LinkedList *list,
+ *      The list has been initialized.
-	/*! The node to start from, NULL if to start from beginning. */
+ *****************************************************************************/
-	ListNode *start,
+ListNode* ListPrev(LinkedList *list, ListNode * node);
-	/*! The item to search for. */
-	void *item);
 
-/*!
+/****************************************************************************
- * \brief Returns the size of the list.
+ * Function: ListFind
  *
- * Precondition: The list has been initialized.
+ *  Description:
+ *      Finds the specified item in the list.
+ *      Uses the compare function specified in ListInit. If compare function
+ *      is NULL then compares items as pointers.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *start - the node to start from, NULL if to start from 
+ *                        beginning.
+ *      void * item - the item to search for.
+ *  Returns:
+ *      The node containing the item. NULL if no node contains the item.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListFind(LinkedList *list, ListNode *start, void * item);
+
+/****************************************************************************
+ * Function: ListSize
  *
- * \return The number of items in the list.
+ *  Description:
- */
+ *     Returns the size of the list.
-long ListSize(
+ *  Parameters:
-	/*! Must be valid, non null, pointer to a linked list. */
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
-	LinkedList* list);
+ 
+ *  Returns:
+ *      The number of items in the list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int ListSize(LinkedList* list);
+
 
 #ifdef __cplusplus
 }

threadutil/inc/ThreadPool.h

@@ -2,7 +2,6 @@
  *
  * Copyright (c) 2000-2003 Intel Corporation 
  * All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions are met: 
@@ -33,504 +32,530 @@
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
 
-/*!
- * \file
- */
-
-#include "FreeList.h"
-#include "ithread.h"
-#include "LinkedList.h"
-#include "UpnpInet.h"
-#include "UpnpGlobal.h" /* for UPNP_INLINE, EXPORT_SPEC */
-
-#include <errno.h>
-
-#ifdef WIN32
-	#include <time.h>
-	struct timezone
-	{
-		int  tz_minuteswest; /* minutes W of Greenwich */
-		int  tz_dsttime;     /* type of dst correction */
-	};
-	int gettimeofday(struct timeval *tv, struct timezone *tz);
-#else /* WIN32 */
-	#include <sys/param.h>
-	#include <sys/time.h> /* for gettimeofday() */
-	#if defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__)
-		#include <sys/resource.h>	/* for setpriority() */
-	#endif
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*! Size of job free list */
+/* Size of job free list */
 #define JOBFREELISTSIZE 100
 
 #define INFINITE_THREADS -1
 
 #define EMAXTHREADS (-8 & 1<<29)
 
-/*! Invalid Policy */
+/* Invalid Policy */
 #define INVALID_POLICY (-9 & 1<<29)
 
-/*! Invalid JOB Id */
+/* Invalid JOB Id */
 #define INVALID_JOB_ID (-2 & 1<<29)
 
-typedef enum duration {
+typedef enum duration {SHORT_TERM,PERSISTENT} Duration;
-	SHORT_TERM,
-	PERSISTENT
-} Duration;
 
-typedef enum priority {
+typedef enum priority {LOW_PRIORITY,
-	LOW_PRIORITY,
+		       MED_PRIORITY,
-	MED_PRIORITY,
+		       HIGH_PRIORITY} ThreadPriority;
-	HIGH_PRIORITY
-} ThreadPriority;
 
-/*! default priority used by TPJobInit */
+#define DEFAULT_PRIORITY MED_PRIORITY /* default priority used by TPJobInit */
-#define DEFAULT_PRIORITY MED_PRIORITY
+#define DEFAULT_MIN_THREADS 1	      /* default minimum used by TPAttrInit */
+#define DEFAULT_MAX_THREADS 10	      /* default max used by TPAttrInit	*/
+#define DEFAULT_JOBS_PER_THREAD 10    /* default jobs per thread used by TPAttrInit */
+#define DEFAULT_STARVATION_TIME	500   /* default starvation time used by TPAttrInit */
+#define DEFAULT_IDLE_TIME 10 * 1000   /* default idle time used by TPAttrInit */
+#define DEFAULT_FREE_ROUTINE NULL     /* default free routine used TPJobInit */
+#define DEFAULT_MAX_JOBS_TOTAL 100    /* default max jobs used TPAttrInit */
 
-/*! default minimum used by TPAttrInit */
+#define STATS 1 /* always include stats because code change is minimal */
-#define DEFAULT_MIN_THREADS 1
 
-/*! default max used by TPAttrInit */
-#define DEFAULT_MAX_THREADS 10
 
-/*! default stack size used by TPAttrInit */
+/* Statistics */
-#define DEFAULT_STACK_SIZE 0u
+#ifdef WIN32 /* TODO: check why STATSONLY fails during compilation */
+	#undef STATS
+#endif
 
-/*! default jobs per thread used by TPAttrInit */
+#ifdef STATS
-#define DEFAULT_JOBS_PER_THREAD 10
+	#define STATSONLY(x) x
-
+#else
-/*! default starvation time used by TPAttrInit */
+	#define STATSONLY(x)
-#define DEFAULT_STARVATION_TIME	500
+#endif
-
-/*! default idle time used by TPAttrInit */
-#define DEFAULT_IDLE_TIME 10 * 1000
-
-/*! default free routine used TPJobInit */
-#define DEFAULT_FREE_ROUTINE NULL
-
-/*! default max jobs used TPAttrInit */
-#define DEFAULT_MAX_JOBS_TOTAL 100
-
-/*!
- * \brief Statistics.
- *
- * Always include stats because code change is minimal.
- */
-#define STATS 1
 
 #ifdef _DEBUG
 	#define DEBUG 1
 #endif
 
+#include "LinkedList.h"
+#include <sys/timeb.h>
+#include "FreeList.h"
+
+#include "ithread.h"
+#include <errno.h>
+#include <sys/timeb.h>
+#define EXPORT
 typedef int PolicyType;
-
 #define DEFAULT_POLICY SCHED_OTHER
+#define DEFAULT_SCHED_PARAM 0 /* default priority */
 
-/*! Function for freeing a thread argument. */
+/****************************************************************************
+ * Name: free_routine
+ *
+ *  Description:
+ *     Function for freeing a thread argument
+ *****************************************************************************/
 typedef void (*free_routine)(void *arg);
 
-
+/****************************************************************************
-/*! Attributes for thread pool. Used to set and change parameters of thread
+ * Name: ThreadPoolAttr
- * pool. */
+ *
+ *  Description:
+ *     Attributes for thread pool. Used to set and change parameters of
+ *     thread pool
+ *****************************************************************************/
 typedef struct THREADPOOLATTR
 {
-	/*! ThreadPool will always maintain at least this many threads. */
+  int minThreads;     /* minThreads, ThreadPool will always maintain at least
-	int minThreads;
+                         this many threads */
-	/*! ThreadPool will never have more than this number of threads. */
+
-	int maxThreads;
+  int maxThreads;     /* maxThreads, ThreadPool will never have more than this
-	/*! This is the minimum stack size allocated for each thread. */
+                         number of threads */
-	size_t stackSize;
+
-	/*! This is the maximum time a thread will
+  int maxIdleTime;    /* maxIdleTime (in milliseconds)
-	 * remain idle before dying (in milliseconds). */
+                         this is the maximum time a thread will remain idle
-	int maxIdleTime;
+                         before dying */
-	/*! Jobs per thread to maintain. */
+
-	int jobsPerThread;
+  int jobsPerThread;  /* jobs per thread to maintain */
-	/*! Maximum number of jobs that can be queued totally. */
+
-	int maxJobsTotal;
+  int maxJobsTotal;   /* maximum number of jobs that can be queued totally. */
-	/*! the time a low priority or med priority job waits before getting
+
-	 * bumped up a priority (in milliseconds). */
+  int starvationTime; /* the time a low priority or med priority
-	int starvationTime;
+	                 job waits before getting bumped
-	/*! scheduling policy to use. */
+                         up a priority (in milliseconds) */
-	PolicyType schedPolicy;
+
+  PolicyType schedPolicy; /* scheduling policy to use */
+
 } ThreadPoolAttr;
 
-/*! Internal ThreadPool Job. */
+/****************************************************************************
+ * Name: ThreadPool
+ *
+ *  Description:
+ *     Internal ThreadPool Job
+ *****************************************************************************/
 typedef struct THREADPOOLJOB
 {
-	start_routine func;
+  start_routine func;
-	void *arg;
+  void *arg;
-	free_routine free_func;
+  free_routine free_func;
-	struct timeval requestTime;
+  struct timeb requestTime;
-	ThreadPriority priority;
+  int priority;
-	int jobId;
+  int jobId;
 } ThreadPoolJob;
 
-/*! Structure to hold statistics. */
+/****************************************************************************
+ * Name: ThreadPoolStats
+ *
+ *  Description:
+ *     Structure to hold statistics
+ *****************************************************************************/
+
+#ifdef STATS
+
 typedef struct TPOOLSTATS
 {
-	double totalTimeHQ;
+  double totalTimeHQ;
-	int totalJobsHQ;
+  int totalJobsHQ;
-	double avgWaitHQ;
+  double avgWaitHQ;
-	double totalTimeMQ;
+  double totalTimeMQ;
-	int totalJobsMQ;
+  int totalJobsMQ;
-	double avgWaitMQ;
+  double avgWaitMQ;
-	double totalTimeLQ;
+  double totalTimeLQ;
-	int totalJobsLQ;
+  int totalJobsLQ;
-	double avgWaitLQ;
+  double avgWaitLQ;
-	double totalWorkTime;
+  double totalWorkTime;
-	double totalIdleTime;
+  double totalIdleTime;
-	int workerThreads;
+  int workerThreads;
-	int idleThreads;
+  int idleThreads;
-	int persistentThreads;
+  int persistentThreads;
-	int totalThreads;
+  int totalThreads;
-	int maxThreads;
+  int maxThreads;
-	int currentJobsHQ;
+  int currentJobsHQ;
-	int currentJobsLQ;
+  int currentJobsLQ;
-	int currentJobsMQ;
+  int currentJobsMQ;
-} ThreadPoolStats;
+}ThreadPoolStats;
 
-/*!
- * \brief A thread pool similar to the thread pool in the UPnP SDK.
- *
- * Allows jobs to be scheduled for running by threads in a 
- * thread pool. The thread pool is initialized with a 
- * minimum and maximum thread number as well as a max idle time
- * and a jobs per thread ratio. If a worker thread waits the whole
- * max idle time without receiving a job and the thread pool
- * currently has more threads running than the minimum
- * then the worker thread will exit. If when 
- * scheduling a job the current job to thread ratio
- * becomes greater than the set ratio and the thread pool currently has
- * less than the maximum threads then a new thread will
- * be created.
- */
-typedef struct THREADPOOL
-{
-	/*! Mutex to protect job qs. */
-	ithread_mutex_t mutex;
-	/*! Condition variable to signal Q. */
-	ithread_cond_t condition;
-	/*! Condition variable for start and stop. */
-	ithread_cond_t start_and_shutdown;
-	/*! ids for jobs */
-	int lastJobId;
-	/*! whether or not we are shutting down */
-	int shutdown;
-	/*! total number of threads */
-	int totalThreads;
-	/*! flag that's set when waiting for a new worker thread to start */
-	int pendingWorkerThreadStart;
-	/*! number of threads that are currently executing jobs */
-	int busyThreads;
-	/*! number of persistent threads */
-	int persistentThreads;
-	/*! free list of jobs */
-	FreeList jobFreeList;
-	/*! low priority job Q */
-	LinkedList lowJobQ;
-	/*! med priority job Q */
-	LinkedList medJobQ;
-	/*! high priority job Q */
-	LinkedList highJobQ;
-	/*! persistent job */
-	ThreadPoolJob *persistentJob;
-	/*! thread pool attributes */
-	ThreadPoolAttr attr;
-	/*! statistics */
-	ThreadPoolStats stats;
-} ThreadPool;
-
-/*!
- * \brief Initializes and starts ThreadPool. Must be called first and
- * only once for ThreadPool.
- *
- * \return
- * \li \c 0 on success.
- * \li \c EAGAIN if not enough system resources to create minimum threads.
- * \li \c INVALID_POLICY if schedPolicy can't be set.
- * \li \c EMAXTHREADS if minimum threads is greater than maximum threads.
- */
-int ThreadPoolInit(
-	/*! Must be valid, non null, pointer to ThreadPool. */
-	ThreadPool *tp,
-	/*! Can be null. if not null then attr contains the following fields:
-	 * \li \c minWorkerThreads - minimum number of worker threads thread
-	 * pool will never have less than this number of threads.
-	 * \li \c maxWorkerThreads - maximum number of worker threads thread
-	 * pool will never have more than this number of threads.
-	 * \li \c maxIdleTime - maximum time that a worker thread will spend
-	 * idle. If a worker is idle longer than this time and there are more
-	 * than the min number of workers running, then the worker thread
-	 * exits.
-	 * \li \c jobsPerThread - ratio of jobs to thread to try and maintain
-	 * if a job is scheduled and the number of jobs per thread is greater
-	 * than this number,and if less than the maximum number of workers are
-	 * running then a new thread is started to help out with efficiency.
-	 * \li \c schedPolicy - scheduling policy to try and set (OS dependent).
-	 */
-	ThreadPoolAttr *attr);
-
-/*!
- * \brief Adds a persistent job to the thread pool.
- *
- * Job will be run as soon as possible. Call will block until job is scheduled.
- * 
- * \return
- *	\li \c 0 on success.
- *	\li \c EOUTOFMEM not enough memory to add job.
- *	\li \c EMAXTHREADS not enough threads to add persistent job.
- */
-int ThreadPoolAddPersistent(
-	/*! Valid thread pool pointer. */
-	ThreadPool*tp,
-	/*! Valid thread pool job. */
-	ThreadPoolJob *job,
-	/*! . */
-	int *jobId);
-
-/*!
- * \brief Gets the current set of attributes associated with the thread pool.
- *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- */
-int ThreadPoolGetAttr(
-	/*! valid thread pool pointer. */
-	ThreadPool *tp,
-	/*! non null pointer to store attributes. */
-	ThreadPoolAttr *out);
-
-/*!
- * \brief Sets the attributes for the thread pool.
- * Only affects future calculations.
- *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- * 	\li \c INVALID_POLICY if policy can not be set.
- */
-int ThreadPoolSetAttr(
-	/*! valid thread pool pointer. */
-	ThreadPool *tp,
-	/*! pointer to attributes, null sets attributes to default. */
-	ThreadPoolAttr *attr);
-
-/*!
- * \brief Adds a job to the thread pool. Job will be run as soon as possible.
- *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- * 	\li \c EOUTOFMEM if not enough memory to add job.
- */
-int ThreadPoolAdd(
-	/*! valid thread pool pointer. */
-	ThreadPool*tp,
-	/*! . */
-	ThreadPoolJob *job,
-	/*! id of job. */
-	int *jobId);
-
-/*!
- * \brief Removes a job from the thread pool. Can only remove jobs which
- * are not currently running.
- *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- * 	\li \c INVALID_JOB_ID if job not found. 
- */
-int ThreadPoolRemove(
-	/*! valid thread pool pointer. */
-	ThreadPool *tp,
-	/*! id of job. */
-	int jobId,
-	/*! space for removed job. */
-	ThreadPoolJob *out);
-
-/*!
- * \brief Shuts the thread pool down. Waits for all threads to finish.
- * May block indefinitely if jobs do not exit.
- *
- * \return 0 on success, nonzero on failure
- */
-int ThreadPoolShutdown(
-	/*! must be valid tp. */
-	ThreadPool *tp);
-
-/*!
- * \brief Initializes thread pool job. Sets the priority to default defined
- * in ThreadPool.h. Sets the free_routine to default defined in ThreadPool.h.
- *
- * \return Always returns 0.
- */
-int TPJobInit(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! function to run, must be valid. */
-	start_routine func,
-	/*! argument to pass to function. */
-	void *arg);
-
-/*!
- * \brief Sets the max threads for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPJobSetPriority(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! value to set. */
-	ThreadPriority priority);
-
-/*!
- * \brief Sets the max threads for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPJobSetFreeFunction(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! value to set. */
-	free_routine func);
-
-/*!
- * \brief Initializes thread pool attributes. Sets values to defaults defined
- * in ThreadPool.h.
- *
- * \return Always returns 0.
- */
-int TPAttrInit(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr);
-
-/*!
- * \brief Sets the max threads for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPAttrSetMaxThreads(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	int maxThreads);
-
-/*!
- * \brief Sets the min threads for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPAttrSetMinThreads(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	int minThreads);
-
-/*!
- * \brief Sets the stack size for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPAttrSetStackSize(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	size_t stackSize);
-
-/*!
- * \brief Sets the idle time for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPAttrSetIdleTime(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! . */
-	int idleTime);
-
-/*!
- * \brief Sets the jobs per thread ratio
- *
- * \return Always returns 0.
- */
-int TPAttrSetJobsPerThread(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! number of jobs per thread to maintain. */
-	int jobsPerThread);
-
-/*!
- * \brief Sets the starvation time for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPAttrSetStarvationTime(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! milliseconds. */
-	int starvationTime);
-
-/*!
- * \brief Sets the scheduling policy for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPAttrSetSchedPolicy(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! must be a valid policy type. */
-	PolicyType schedPolicy);
-
-/*!
- * \brief Sets the maximum number jobs that can be qeued totally.
- *
- * \return Always returns 0.
- */
-int TPAttrSetMaxJobsTotal(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! maximum number of jobs. */
-	int maxJobsTotal);
-
-/*!
- * \brief Returns various statistics about the thread pool.
- *
- * Only valid if STATS has been defined.
- *
- * \return Always returns 0.
- */
-#ifdef STATS
-	EXPORT_SPEC int ThreadPoolGetStats(
-		/*! Valid initialized threadpool. */
-		ThreadPool *tp,
-		/*! Valid stats, out parameter. */
-		ThreadPoolStats *stats);
-#else
-	static UPNP_INLINE int ThreadPoolGetStats(
-		/*! Valid initialized threadpool. */
-		ThreadPool *tp,
-		/*! Valid stats, out parameter. */
-		ThreadPoolStats *stats) {}
 #endif
 
-/*!
+
- * \brief
+/****************************************************************************
- */
+ * Name: ThreadPool
+ *
+ *  Description:
+ *     A thread pool similar to the thread pool in the UPnP SDK.
+ *     Allows jobs to be scheduled for running by threads in a 
+ *     thread pool. The thread pool is initialized with a 
+ *     minimum and maximum thread number as well as a 
+ *	   max idle time
+ *     and a jobs per thread ratio. If a worker thread waits the whole
+ *     max idle time without receiving a job and the thread pool
+ *     currently has more threads running than the minimum
+ *     then the worker thread will exit. If when 
+ *     scheduling a job the current job to thread ratio
+ *     becomes greater than the set ratio and the thread pool currently has
+ *     less than the maximum threads then a new thread will
+ *     be created.
+ *
+ *****************************************************************************/
+
+typedef struct THREADPOOL
+{
+  ithread_mutex_t mutex; /* mutex to protect job qs */
+  ithread_cond_t condition; /* condition variable to signal Q */
+  ithread_cond_t start_and_shutdown; /* condition variable for start 
+                                        and stop */
+  int lastJobId; /* ids for jobs */
+  int shutdown;  /* whether or not we are shutting down */
+  int totalThreads;      /* total number of threads */
+  int persistentThreads; /* number of persistent threads */
+  FreeList jobFreeList;  /* free list of jobs */
+  LinkedList lowJobQ;    /* low priority job Q */
+  LinkedList medJobQ;    /* med priority job Q */
+  LinkedList highJobQ;   /* high priority job Q */
+  ThreadPoolJob *persistentJob; /* persistent job */
+ 
+  ThreadPoolAttr attr; /* thread pool attributes */
+  
 #ifdef STATS
-	EXPORT_SPEC void ThreadPoolPrintStats(
+  /* statistics */
-		/*! . */
+  ThreadPoolStats stats;
-		ThreadPoolStats *stats);
+#endif
+ 
+} ThreadPool;
+
+
+
+/****************************************************************************
+ * Function: ThreadPoolInit
+ *
+ *  Description:
+ *      Initializes and starts ThreadPool. Must be called first.
+ *      And only once for ThreadPool.
+ *  Parameters:
+ *      tp  - must be valid, non null, pointer to ThreadPool.
+ *      attr - can be null
+ *
+ *       if not null then attr contains the following fields:
+ *
+ *      minWorkerThreads - minimum number of worker threads
+ *                                 thread pool will never have less than this
+ *                                  number of threads.
+ *      maxWorkerThreads - maximum number of worker threads
+ *                         thread pool will never have more than this
+ *                         number of threads.
+ *      maxIdleTime      - maximum time that a worker thread will spend
+ *                         idle. If a worker is idle longer than this
+ *                         time and there are more than the min
+ *                         number of workers running, than the
+ *                         worker thread exits.
+ *      jobsPerThread    - ratio of jobs to thread to try and maintain
+ *                         if a job is scheduled and the number of jobs per
+ *                         thread is greater than this number,and  
+ *                         if less than the maximum number of
+ *                         workers are running then a new thread is 
+ *                         started to help out with efficiency.
+ *      schedPolicy      - scheduling policy to try and set (OS dependent)
+ *  Returns:
+ *      0 on success, nonzero on failure.
+ *      EAGAIN if not enough system resources to create minimum threads.
+ *      INVALID_POLICY if schedPolicy can't be set
+ *      EMAXTHREADS if minimum threads is greater than maximum threads
+ *****************************************************************************/
+int ThreadPoolInit(ThreadPool *tp,
+  ThreadPoolAttr *attr);
+
+/****************************************************************************
+ * Function: ThreadPoolAddPersistent
+ *
+ *  Description:
+ *      Adds a persistent job to the thread pool.
+ *      Job will be run as soon as possible.
+ *      Call will block until job is scheduled.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      ThreadPoolJob - valid thread pool job with the following fields:
+ *
+ *        func - ThreadFunction to run
+ *        arg - argument to function.
+ *        priority - priority of job.
+ * 
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      EOUTOFMEM not enough memory to add job.
+ *      EMAXTHREADS not enough threads to add persistent job.
+ *****************************************************************************/
+int ThreadPoolAddPersistent (ThreadPool*tp,
+  ThreadPoolJob *job,
+  int *jobId);
+
+/****************************************************************************
+ * Function: ThreadPoolGetAttr
+ *
+ *  Description:
+ *      Gets the current set of attributes
+ *      associated with the thread pool.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      out - non null pointer to store attributes
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      Always returns 0.
+ *****************************************************************************/
+int ThreadPoolGetAttr(ThreadPool *tp,
+  ThreadPoolAttr *out);
+/****************************************************************************
+ * Function: ThreadPoolSetAttr
+ *
+ *  Description:
+ *      Sets the attributes for the thread pool.
+ *      Only affects future calculations. 
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      attr - pointer to attributes, null sets attributes to default.
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      Returns INVALID_POLICY if policy can not be set.
+ *****************************************************************************/
+int ThreadPoolSetAttr(ThreadPool *tp,
+  ThreadPoolAttr *attr);
+
+/****************************************************************************
+ * Function: ThreadPoolAdd
+ *
+ *  Description:
+ *      Adds a job to the thread pool.
+ *      Job will be run as soon as possible.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      func - ThreadFunction to run
+ *      arg - argument to function.
+ *      priority - priority of job.
+ *      poolid - id of job
+ *      free_function - function to use when freeing argument 
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      EOUTOFMEM if not enough memory to add job.
+ *****************************************************************************/
+int ThreadPoolAdd (ThreadPool*tp,
+  ThreadPoolJob *job,
+  int *jobId);
+
+/****************************************************************************
+ * Function: ThreadPoolRemove
+ *
+ *  Description:
+ *      Removes a job from the thread pool.
+ *      Can only remove jobs which are not
+ *      currently running.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      jobid - id of job
+ *      out - space for removed job.
+ *  Returns:
+ *      0 on success, nonzero on failure.
+ *      INVALID_JOB_ID if job not found. 
+ *****************************************************************************/
+int ThreadPoolRemove(ThreadPool *tp,
+  int jobId, ThreadPoolJob *out);
+
+
+
+/****************************************************************************
+ * Function: ThreadPoolShutdown
+ *
+ *  Description:
+ *      Shuts the thread pool down.
+ *      Waits for all threads to finish. 
+ *      May block indefinitely if jobs do not
+ *      exit.
+ *  Parameters:
+ *      tp - must be valid tp     
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      Always returns 0.
+ *****************************************************************************/
+int ThreadPoolShutdown(ThreadPool *tp);
+
+
+/****************************************************************************
+ * Function: TPJobInit
+ *
+ *  Description:
+ *      Initializes thread pool job.
+ *      Sets the priority to default defined in ThreadPool.h.
+ *      Sets the free_routine to default defined in ThreadPool.h
+ *  Parameters:
+ *      ThreadPoolJob *job - must be valid thread pool attributes.    
+ *      start_routine func - function to run, must be valid
+ *      void * arg - argument to pass to function.
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPJobInit(ThreadPoolJob *job, start_routine func, void *arg);
+
+/****************************************************************************
+ * Function: TPJobSetPriority
+ *
+ *  Description:
+ *      Sets the max threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      maxThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);
+
+/****************************************************************************
+ * Function: TPJobSetFreeFunction
+ *
+ *  Description:
+ *      Sets the max threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      maxThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);
+
+
+/****************************************************************************
+ * Function: TPAttrInit
+ *
+ *  Description:
+ *      Initializes thread pool attributes.
+ *      Sets values to defaults defined in ThreadPool.h.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrInit(ThreadPoolAttr *attr);
+
+/****************************************************************************
+ * Function: TPAttrSetMaxThreads
+ *
+ *  Description:
+ *      Sets the max threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      maxThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);
+
+/****************************************************************************
+ * Function: TPAttrSetMinThreads
+ *
+ *  Description:
+ *      Sets the min threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      minThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);
+
+/****************************************************************************
+ * Function: TPAttrSetIdleTime
+ *
+ *  Description:
+ *      Sets the idle time for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetIdleTime(ThreadPoolAttr *attr, int idleTime);
+
+/****************************************************************************
+ * Function: TPAttrSetJobsPerThread
+ *
+ *  Description:
+ *      Sets the jobs per thread ratio
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.
+ *      jobsPerThread - number of jobs per thread to maintain
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetJobsPerThread(ThreadPoolAttr *attr, int jobsPerThread);
+
+/****************************************************************************
+ * Function: TPAttrSetStarvationTime
+ *
+ *  Description:
+ *      Sets the starvation time for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *      int starvationTime - milliseconds
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetStarvationTime(ThreadPoolAttr *attr, int starvationTime);
+
+/****************************************************************************
+ * Function: TPAttrSetSchedPolicy
+ *
+ *  Description:
+ *      Sets the scheduling policy for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *      PolicyType schedPolicy - must be a valid policy type.
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetSchedPolicy(ThreadPoolAttr *attr, PolicyType schedPolicy);
+
+
+/****************************************************************************
+ * Function: TPAttrSetMaxJobsTotal
+ *
+ *  Description:
+ *      Sets the maximum number jobs that can be qeued totally.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.
+ *      maxJobsTotal - maximum number of jobs
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
+
+/****************************************************************************
+ * Function: ThreadPoolGetStats
+ *
+ *  Description:
+ *      Returns various statistics about the
+ *      thread pool.
+ *      Only valid if STATS has been defined.
+ *  Parameters:
+ *      ThreadPool *tp - valid initialized threadpool    
+ *      ThreadPoolStats *stats - valid stats, out parameter
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+#ifdef STATS
+	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
+
+	EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats);
 #else
-	static UPNP_INLINE void ThreadPoolPrintStats(
+	static UPNP_INLINE int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats) {}
-		/*! . */
+
-		ThreadPoolStats *stats) {}
+	static UPNP_INLINE void ThreadPoolPrintStats(ThreadPoolStats *stats) {}
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* THREADPOOL_H */
+#endif /* ThreadPool */
 

threadutil/inc/TimerThread.h

@@ -32,13 +32,9 @@
 #ifndef TIMERTHREAD_H
 #define TIMERTHREAD_H
 
-/*!
- * \file
- */
-
-#include "FreeList.h"
 #include "ithread.h"
 #include "LinkedList.h"
+#include "FreeList.h"
 #include "ThreadPool.h"
 
 #ifdef __cplusplus
@@ -47,111 +43,146 @@ extern "C" {
 
 #define INVALID_EVENT_ID (-10 & 1<<29)
 
-/*! Timeout Types. */
+/* Timeout Types */
-typedef enum timeoutType {
+/* absolute means in seconds from Jan 1, 1970 */
-	/*! seconds from Jan 1, 1970. */
+/* relative means in seconds from current time */
-	ABS_SEC,
+typedef enum timeoutType {ABS_SEC,REL_SEC} TimeoutType;
-	/*! seconds from current time. */
-	REL_SEC
-} TimeoutType;
 
-/*!
+
- * A timer thread similar to the one in the Upnp SDK that allows
+/****************************************************************************
- * the scheduling of a job to run at a specified time in the future.
+ * Name: TimerThread
- *
+ * 
- * Because the timer thread uses the thread pool there is no 
+ *   Description:
- * gurantee of timing, only approximate timing.
+ *     A timer thread similar to the one in the Upnp SDK that allows
- *
+ *     the scheduling of a job to run at a specified time in the future
- * Uses ThreadPool, Mutex, Condition, Thread.
+ *     Because the timer thread uses the thread pool there is no 
- */
+ *     gurantee of timing, only approximate timing.
+ *     Uses ThreadPool, Mutex, Condition, Thread
+ *    
+ * 
+ *****************************************************************************/
 typedef struct TIMERTHREAD
 {
-	ithread_mutex_t mutex;
+  ithread_mutex_t mutex;
-	ithread_cond_t condition;
+  ithread_cond_t condition;
-	int lastEventId;
+  int lastEventId;
-	LinkedList eventQ;
+  LinkedList eventQ;
-	int shutdown;
+  int shutdown;
-	FreeList freeEvents;
+  FreeList freeEvents;
-	ThreadPool *tp;
+  ThreadPool *tp;
 } TimerThread;
 
-/*!
+
- * Struct to contain information for a timer event.
+/****************************************************************************
- *
+ * Name: TimerEvent
- * Internal to the TimerThread.
+ * 
- */
+ *   Description:
+ *     
+ *     Struct to contain information for a timer event.
+ *     Internal to the TimerThread
+ *   
+ *****************************************************************************/
 typedef struct TIMEREVENT
 {
-	ThreadPoolJob job;
+  ThreadPoolJob job;
-	/*! [in] Absolute time for event in seconds since Jan 1, 1970. */
+  time_t eventTime; /* absolute time for event in seconds since Jan 1, 1970 */
-	time_t eventTime;
+  Duration persistent;  /* long term or short term job */
-	/*! [in] Long term or short term job. */
+  int id;
-	Duration persistent;
-	int id;
 } TimerEvent;
 
-/*!
- * \brief Initializes and starts timer thread.
- *
- * \return 0 on success, nonzero on failure. Returns error from
- * 	ThreadPoolAddPersistent on failure.
- */
-int TimerThreadInit(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] Valid thread pool to use. Must be started. Must be valid for
-	 * lifetime of timer. Timer must be shutdown BEFORE thread pool. */
-	ThreadPool *tp);
 
-/*!
- * \brief Schedules an event to run at a specified time.
- *
- * \return 0 on success, nonzero on failure, EOUTOFMEM if not enough memory
- * 	to schedule job.
- */
-int TimerThreadSchedule(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread* timer,
-	/*! [in] time of event. Either in absolute seconds, or relative
-	 * seconds in the future. */
-	time_t time, 
-	/*! [in] either ABS_SEC, or REL_SEC. If REL_SEC, then the event
-	 * will be scheduled at the current time + REL_SEC. */
-	TimeoutType type,
-	/*! [in] Valid Thread pool job with following fields. */
-	ThreadPoolJob *job,
-	/*! [in] . */
-	Duration duration,
-	/*! [in] Id of timer event. (out, can be null). */
-	int *id);
 
-/*!
- * \brief Removes an event from the timer Q.
- *
- * Events can only be removed before they have been placed in the thread pool.
- *
- * \return 0 on success, INVALID_EVENT_ID on failure.
- */
-int TimerThreadRemove(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] Id of event to remove. */
-	int id,
-	/*! [in] Space for thread pool job. */
-	ThreadPoolJob *out);
 
-/*!
+/************************************************************************
- * \brief Shutdown the timer thread.
+ * Function: TimerThreadInit
+ * 
+ *  Description:
+ *     Initializes and starts timer thread.
  *
- * Events scheduled in the future will NOT be run.
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             tp  - valid thread pool to use. Must be
+ *                   started. Must be valid for lifetime
+ *                   of timer.  Timer must be shutdown
+ *                   BEFORE thread pool.
+ *  Return:
+ *            0 on success, nonzero on failure
+ *            Returns error from ThreadPoolAddPersistent on failure.
  *
- * Timer thread should be shutdown BEFORE it's associated thread pool.
+ ************************************************************************/
+int TimerThreadInit(TimerThread *timer,
+		    ThreadPool *tp);
+
+
+/************************************************************************
+ * Function: TimerThreadSchedule
+ * 
+ *  Description:
+ *     Schedules an event to run at a specified time.
  *
- * \return 0 if succesfull, nonzero otherwise. Always returns 0.
+ *  Parameters:
- */
+ *             timer - valid timer thread pointer.
-int TimerThreadShutdown(
+ *             time_t - time of event.
-	/*! [in] Valid timer thread pointer. */
+ *                      either in absolute seconds,
-	TimerThread *timer);
+ *                      or relative seconds in the future.
+ *             timeoutType - either ABS_SEC, or REL_SEC.
+ *                           if REL_SEC, then the event
+ *                           will be scheduled at the
+ *                           current time + REL_SEC.
+ *             job-> valid Thread pool job with following fields
+ *             func - function to schedule
+ *             arg - argument to function
+ *             priority - priority of job.
+ *         
+ *             id - id of timer event. (out, can be null)
+ *  Return:
+ *            0 on success, nonzero on failure
+ *            EOUTOFMEM if not enough memory to schedule job.
+ *
+ ************************************************************************/
+int TimerThreadSchedule(TimerThread* timer,
+			time_t time, 
+			TimeoutType type,
+			ThreadPoolJob *job,
+			Duration duration,
+			int *id);
+
+/************************************************************************
+ * Function: TimerThreadRemove
+ * 
+ *  Description:
+ *     Removes an event from the timer Q.
+ *     Events can only be removed 
+ *     before they have been placed in the
+ *     thread pool.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             id - id of event to remove.
+ *             ThreadPoolJob *out - space for thread pool job.
+ *  Return:
+ *            0 on success, 
+ *            INVALID_EVENT_ID on failure
+ *			 
+ ************************************************************************/
+int TimerThreadRemove(TimerThread *timer,
+			   int id,
+			   ThreadPoolJob *out);
+
+/************************************************************************
+ * Function: TimerThreadShutdown
+ * 
+ *  Description:
+ *    Shutdown the timer thread
+ *    Events scheduled in the future will NOT be run.
+ *    Timer thread should be shutdown BEFORE it's associated
+ *    thread pool.
+ *  Returns:
+ *    returns 0 if succesfull,
+ *            nonzero otherwise.
+ *            Always returns 0.
+ ***********************************************************************/   
+int TimerThreadShutdown(TimerThread *timer);
 
 #ifdef __cplusplus
 }

threadutil/inc/iasnprintf.h

@@ -6,12 +6,12 @@
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions are met: 
  *
- * - Redistributions of source code must retain the above copyright notice, 
+ * * Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+ * * 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. 
- * - Neither name of Intel Corporation nor the names of its contributors 
+ * * Neither name of Intel Corporation nor the names of its contributors 
  * may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * 
@@ -29,44 +29,38 @@
  *
  ******************************************************************************/
 
-#include "sample_util.h"
-#include "tv_device.h"
-
 #include <stdarg.h>
-#include <stdio.h>
 
-int main(int argc, char *argv[])
+#define EXPORT
-{
+
-	int rc;
+#ifdef __cplusplus
-	ithread_t cmdloop_thread;
+extern "C" {
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
 #endif
-	int code;
 
-	rc = device_main(argc, argv);
+/**
-	if (rc != UPNP_E_SUCCESS) {
+ * Allocates enough memory for the
-		return rc;
+ * Formatted string, up to max
-	}
+ * specified.
+ * With max set to -1, allocates
+ * as much size as needed.
+ * Memory must be freed using free.
+ */
 
-	/* start a command loop thread */
+EXPORT int iasnprintf(char **ret,
-	code = ithread_create(&cmdloop_thread, NULL, TvDeviceCommandLoop, NULL);
+	       int incr,
-	if (code !=  0) {
+	       int max,
-		return UPNP_E_INTERNAL_ERROR;
+	       const char * fmt, ...)
-	}
+#ifndef SPARC_SOLARIS
-#ifdef WIN32
+ #if (__GNUC__ >= 3)
-	ithread_join(cmdloop_thread, NULL);
+	__attribute__((format (__printf__, 4, 5)));
+ #else
+ ;
+ #endif
+ EXPORT void iasnprintfFree(char *);
 #else
-	/* Catch Ctrl-C and properly shutdown */
+;
-	sigemptyset(&sigs_to_catch);
-	sigaddset(&sigs_to_catch, SIGINT);
-	sigwait(&sigs_to_catch, &sig);
-	SampleUtil_Print("Shutting down on signal %d...\n", sig);
 #endif
-	rc = TvDeviceStop();
 
-	return rc;
+#ifdef __cplusplus
 }
-
+#endif

threadutil/inc/ithread.h

@@ -1,11 +1,7 @@
-#ifndef ITHREAD_H
-#define ITHREAD_H
-
 /*******************************************************************************
  *
  * Copyright (c) 2000-2003 Intel Corporation 
  * All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions are met: 
@@ -33,29 +29,23 @@
  *
  ******************************************************************************/
 
-/*!
+#ifndef ITHREADH
- * \file
+#define ITHREADH
- */
-
-#if !defined(WIN32)
-	#include <sys/param.h>
-#endif
-
-#include "UpnpGlobal.h" /* For UPNP_INLINE, EXPORT_SPEC */
-#include "UpnpUniStd.h" /* for close() */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <pthread.h>
 
-#if defined(BSD) && !defined(__GNU__)
+#include <pthread.h>
+#ifndef WIN32
+	#include <unistd.h>
+#endif
+
+#ifdef __FreeBSD__
 	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif
 
-
+#ifdef PTHREAD_MUTEX_RECURSIVE
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
 	/* This system has SuS2-compliant mutex attributes.
 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
 	 */
@@ -75,11 +65,7 @@ extern "C" {
 
 #define ITHREAD_CANCELED PTHREAD_CANCELED
 
-
+  
-#define ITHREAD_STACK_MIN PTHREAD_STACK_MIN
-#define ITHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED
-#define ITHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE
-
 /***************************************************************************
  * Name: ithread_t
  *
@@ -88,8 +74,7 @@ extern "C" {
  *      typedef to pthread_t.
  *      Internal Use Only.
  ***************************************************************************/
-typedef pthread_t ithread_t;
+typedef pthread_t ithread_t; 
-
   
 /****************************************************************************
  * Name: ithread_attr_t
@@ -109,7 +94,7 @@ typedef pthread_attr_t ithread_attr_t;
  *      Thread start routine 
  *      Internal Use Only.
  ***************************************************************************/
-typedef void *(*start_routine)(void *arg);
+typedef void * (*start_routine) (void *arg);
 
   
 /****************************************************************************
@@ -165,9 +150,7 @@ typedef pthread_condattr_t ithread_condattr_t;
  *      typedef to pthread_rwlockattr_t
  *      Internal Use Only
  ***************************************************************************/
-#if UPNP_USE_RWLOCK
 typedef pthread_rwlockattr_t ithread_rwlockattr_t;	
-#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -178,93 +161,7 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
  *      typedef to pthread_rwlock_t
  *      Internal Use Only
  ***************************************************************************/
-#if UPNP_USE_RWLOCK
+typedef pthread_rwlock_t ithread_rwlock_t;	
-	typedef pthread_rwlock_t ithread_rwlock_t;
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	typedef ithread_mutex_t ithread_rwlock_t;
-#endif /* UPNP_USE_RWLOCK */
-
-
-/****************************************************************************
- * Function: ithread_initialize_library
- *
- *  Description:
- *      Initializes the library. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_initialize_library(void) {
-	int ret = 0;
-
-	return ret;
-}
-
-
-/****************************************************************************
- * Function: ithread_cleanup_library
- *
- *  Description:
- *      Clean up library resources. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_cleanup_library(void) {
-	int ret = 0;
-
-	return ret;
-}
-
-
-/****************************************************************************
- * Function: ithread_initialize_thread
- *
- *  Description:
- *      Initializes the thread. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_initialize_thread(void) {
-	int ret = 0;
-
-#if defined(WIN32) && defined(PTW32_STATIC_LIB)
-	ret = !pthread_win32_thread_attach_np();
-#endif
-
-	return ret;
-}
-
-
-/****************************************************************************
- * Function: ithread_cleanup_thread
- *
- *  Description:
- *      Clean up thread resources. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_cleanup_thread(void) {
-	int ret = 0;
-
-#if defined(WIN32) && defined(PTW32_STATIC_LIB)
-	ret = !pthread_win32_thread_detach_np();
-#endif
-
-	return ret;
-}
-
 
 /****************************************************************************
  * Function: ithread_mutexattr_init
@@ -319,11 +216,11 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Returns EINVAL if the kind is not supported.
  *      See man page for pthread_mutexattr_setkind_np
  *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#ifdef PTHREAD_MUTEX_RECURSIVE
 	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
 #else
 	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-#endif /* UPNP_USE_RWLOCK */
+#endif
 
 /****************************************************************************
  * Function: ithread_mutexattr_getkind_np
@@ -344,11 +241,11 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_mutexattr_getkind_np
  *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#ifdef PTHREAD_MUTEX_RECURSIVE
 	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
 #else
 	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
-#endif /* UPNP_USE_RWLOCK */
+#endif
 
   
 /****************************************************************************
@@ -436,9 +333,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlockattr_init
  ***************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlockattr_init pthread_rwlockattr_init
-	#define ithread_rwlockattr_init pthread_rwlockattr_init
-#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -454,9 +349,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlockattr_destroy
  ***************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
-	#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
-#endif /* UPNP_USE_RWLOCK */
   
   
 /****************************************************************************
@@ -477,9 +370,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Returns EINVAL if the kind is not supported.
  *      See man page for pthread_rwlockattr_setkind_np
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
-	#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
-#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -500,9 +391,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlockatttr_getpshared
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
-	#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
-#endif /* UPNP_USE_RWLOCK */
 
   
 /****************************************************************************
@@ -513,19 +402,15 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Must be called before use.
  *      
  *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      const ithread_rwlockattr_t *rwlock_attr 
+ *      const ithread_rwlockattr_t * rwlock_attr 
  *  Returns:
  *      0 on success, Nonzero on failure.
  *      Always returns 0.
  *      See man page for pthread_rwlock_init
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlock_init pthread_rwlock_init
-	#define ithread_rwlock_init pthread_rwlock_init
+
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_init ithread_mutex_init
-#endif
 
 /****************************************************************************
  * Function: ithread_rwlock_rdlock
@@ -533,7 +418,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *  Description:
  *      Locks rwlock for reading.
  *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *      
  *  Returns:
@@ -541,12 +426,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_rdlock
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlock_rdlock pthread_rwlock_rdlock
-	#define ithread_rwlock_rdlock pthread_rwlock_rdlock
+
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_rdlock ithread_mutex_lock
-#endif /* UPNP_USE_RWLOCK */
 
 /****************************************************************************
  * Function: ithread_rwlock_wrlock
@@ -554,7 +435,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *  Description:
  *      Locks rwlock for writting.
  *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *      
  *  Returns:
@@ -562,12 +443,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_wrlock
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlock_wrlock pthread_rwlock_wrlock
-	#define ithread_rwlock_wrlock pthread_rwlock_wrlock
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_wrlock ithread_mutex_lock
-#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -577,7 +453,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Unlocks rwlock.
  *
  *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *      
  *  Returns:
@@ -585,12 +461,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_unlock
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlock_unlock pthread_rwlock_unlock
-	#define ithread_rwlock_unlock pthread_rwlock_unlock
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_unlock ithread_mutex_unlock
-#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -602,19 +473,14 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *		rwlock is only destroyed when there are no longer any threads waiting on it. 
  *		rwlock cannot be destroyed if it is locked.
  *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *  Returns:
  *      0 on success. Nonzero on failure.
  *      Always returns 0.
  *      See man page for pthread_rwlock_destroy
  *****************************************************************************/
-#if UPNP_USE_RWLOCK
+#define ithread_rwlock_destroy pthread_rwlock_destroy
-	#define ithread_rwlock_destroy pthread_rwlock_destroy
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_destroy ithread_mutex_destroy
-#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -624,8 +490,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Initializes condition variable.
  *      Must be called before use.
  *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to pthread_cond_t)
+ *      ithread_cond_t * cond (must be valid non NULL pointer to pthread_cond_t)
- *      const ithread_condattr_t *cond_attr (ignored)
+ *      const ithread_condattr_t * cond_attr (ignored)
  *  Returns:
  *      0 on success, Nonzero on failure.
  *      See man page for pthread_cond_init
@@ -633,6 +499,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #define ithread_cond_init pthread_cond_init
 
 
+
 /****************************************************************************
  * Function: ithread_cond_signal
  *
@@ -640,7 +507,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Wakes up exactly one thread waiting on condition.
  *      Associated mutex MUST be locked by thread before entering this call.
  *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to 
+ *      ithread_cond_t * cond (must be valid non NULL pointer to 
  *      ithread_cond_t)
  *      cond must be initialized
  *  Returns:
@@ -657,7 +524,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Wakes up all threads waiting on condition.
  *      Associated mutex MUST be locked by thread before entering this call.
  *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to 
+ *      ithread_cond_t * cond (must be valid non NULL pointer to 
  *      ithread_cond_t)
  *      cond must be initialized
  *  Returns:
@@ -675,7 +542,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Associated mutex MUST be locked by thread before entering this call.
  *      Mutex is reacquired when call returns.
  *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to 
+ *      ithread_cond_t * cond (must be valid non NULL pointer to 
  *      ithread_cond_t)
  *      cond must be initialized
  *      ithread_mutex_t *mutex (must be valid non NULL pointer to 
@@ -691,19 +558,23 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   /****************************************************************************
    * Function: pthread_cond_timedwait
    *
-   *	Description:      
+   *  Description:      
-   *		Atomically releases the associated mutex and waits on the
+   *      Atomically releases the associated mutex and waits on the condition. 
-   *	condition.
+   *		If the condition is not signaled in the specified time 
-   *		If the condition is not signaled in the specified time than the
+   *              than the 
-   *	call times out and returns.
+   *		call times out and returns.
-   *		Associated mutex MUST be locked by thread before entering this call.
+   *		Associated mutex MUST be locked by thread before entering 
-   *		Mutex is reacquired when call returns.
+   *              this call.
+   *      Mutex is reacquired when call returns.
    *  Parameters:
-   *      ithread_cond_t *cond (must be valid non NULL pointer to ithread_cond_t)
+   *      ithread_cond_t * cond (must be valid non NULL pointer to 
-   *      	cond must be initialized
+   *      ithread_cond_t)
-   *      ithread_mutex_t *mutex (must be valid non NULL pointer to ithread_mutex_t)
+   *      cond must be initialized
-   *      	Mutex must be locked.
+   *      ithread_mutex_t *mutex (must be valid non NULL pointer to 
-   *      const struct timespec *abstime (absolute time, measured from Jan 1, 1970)
+   *      ithread_mutex_t)
+   *      Mutex must be locked.
+   *      const struct timespec *abstime (absolute time, measured 
+   *      from Jan 1, 1970)
    *  Returns:
    *      0 on success. ETIMEDOUT on timeout. Nonzero on failure.
    *      See man page for pthread_cond_timedwait
@@ -719,7 +590,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    *      Releases any resources held by the condition variable. 
    *		Condition variable can no longer be used after this call.	
    *  Parameters:
-   *      ithread_cond_t *cond (must be valid non NULL pointer to 
+   *      ithread_cond_t * cond (must be valid non NULL pointer to 
    *      ithread_cond_t)
    *      cond must be initialized.
    *  Returns:
@@ -728,65 +599,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_cond_destroy pthread_cond_destroy
 
-  /****************************************************************************
-   * Function: ithread_attr_init
-   *
-   *  Description:
-   *      Initialises thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_init
-   ***************************************************************************/
-#define ithread_attr_init pthread_attr_init
-
-  /****************************************************************************
-   * Function: ithread_attr_destroy
-   *
-   *  Description:
-   *      Destroys thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_destroy
-   ***************************************************************************/
-#define ithread_attr_destroy pthread_attr_destroy
-
-  /****************************************************************************
-   * Function: ithread_attr_setstacksize
-   *
-   *  Description:
-   *      Sets stack size of a thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *      size_t stacksize (value of stacksize must be greater than
-   *      ITHREAD_STACK_MIN and lower than system-imposed limits
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_setstacksize
-   ***************************************************************************/
-#define ithread_attr_setstacksize pthread_attr_setstacksize
-
-  /****************************************************************************
-   * Function: ithread_attr_setdetachstate
-   *
-   *  Description:
-   *      Sets detach state of a thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *      int detachstate (value of detachstate must be ITHREAD_CREATE_DETACHED
-   *      or ITHREAD_CREATE_JOINABLE)
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_setdetachstate
-   ***************************************************************************/
-#define ithread_attr_setdetachstate pthread_attr_setdetachstate
 
   /****************************************************************************
    * Function: ithread_create
@@ -796,7 +608,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    *      and argument.
    *  Parameters:
    *      ithread_t * thread (must be valid non NULL pointer to pthread_t)
-   *      ithread_attr_t *attr
+   *      ithread_attr_t *attr, IGNORED
    *      void * (start_routine) (void *arg) (start routine)
    *      void * arg - argument.
    *  Returns:
@@ -834,7 +646,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_exit pthread_exit
 
-
 /****************************************************************************
    * Function: ithread_get_current_thread_id
    *
@@ -858,7 +669,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_self pthread_self
 
-
   /****************************************************************************
    * Function: ithread_detach
    *
@@ -872,7 +682,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_detach pthread_detach  
 
-
   /****************************************************************************
    * Function: ithread_join
    *
@@ -892,6 +701,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #define ithread_join pthread_join
   
 
+
 /****************************************************************************
  * Function: isleep
  *
@@ -905,12 +715,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
-#ifdef WIN32
+#define isleep sleep
-	#define isleep(x) Sleep((x)*1000)
-#else
-	#define isleep sleep
-#endif
-
 
 /****************************************************************************
  * Function: isleep
@@ -925,24 +730,32 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
+#define imillisleep(x) usleep(1000*x)
+
 #ifdef WIN32
-	#define imillisleep Sleep
+	#ifndef UPNP_STATIC_LIB
+		#ifdef LIBUPNP_EXPORTS
+			/* set up declspec for dll export to make functions visible to library users */
+			#define EXPORT_SPEC __declspec(dllexport)
+		#else
+			#define EXPORT_SPEC __declspec(dllimport)
+		#endif
+	#else
+		#define EXPORT_SPEC
+	#endif
 #else
-	#define imillisleep(x) usleep(1000*x)
+	#define EXPORT_SPEC
 #endif
 
 
-#if !defined(PTHREAD_MUTEX_RECURSIVE) && !defined(__DragonFly__) && !defined(UPNP_USE_MSVCPP)
+#ifndef PTHREAD_MUTEX_RECURSIVE
-/* !defined(UPNP_USE_MSVCPP) should probably also have pthreads version check - but it's not clear if that is possible */
 /* NK: Added for satisfying the gcc compiler */
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
 #endif
 
-
 #ifdef __cplusplus
 }
 #endif
 
-
+#endif /* ITHREADH */
-#endif /* ITHREAD_H */
 

threadutil/src/FreeList.c

@@ -1,111 +1,177 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * - Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- **************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #include "FreeList.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
-int FreeListInit(FreeList *free_list, size_t elementSize, int maxFreeListLength)
+/****************************************************************************
+ * Function: FreeListInit
+ *
+ *  Description:
+ *      Initializes Free List. Must be called first.
+ *      And only once for FreeList.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *      size_t -     size of elements to store in free list
+ *      maxFreeListSize - max size that the free list can grow to
+ *                        before returning memory to O.S.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int
+FreeListInit( FreeList * free_list,
+              size_t elementSize,
+              int maxFreeListLength )
 {
-	assert(free_list != NULL);
+    assert( free_list != NULL );
 
-	if (free_list == NULL)
+    if( free_list == NULL )
-		return EINVAL;
+        return EINVAL;
-	free_list->element_size = elementSize;
-	free_list->maxFreeListLength = maxFreeListLength;
-	free_list->head = NULL;
-	free_list->freeListLength = 0;
 
-	return 0;
+    free_list->element_size = elementSize;
+    free_list->maxFreeListLength = maxFreeListLength;
+    free_list->head = NULL;
+    free_list->freeListLength = 0;
+    return 0;
 }
 
-void *FreeListAlloc(FreeList *free_list)
+/****************************************************************************
+ * Function: FreeListAlloc
+ *
+ *  Description:
+ *      Allocates chunk of set size.
+ *      If a free item is available in the list, returnes the stored item.
+ *      Otherwise calls the O.S. to allocate memory.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      Non NULL on success. NULL on failure.
+ *****************************************************************************/
+void *
+FreeListAlloc( FreeList * free_list )
 {
-	FreeListNode *ret = NULL;
+    FreeListNode *ret = NULL;
 
-	assert(free_list != NULL);
+    assert( free_list != NULL );
 
-	if (free_list == NULL)
+    if( free_list == NULL )
-		return NULL;
+        return NULL;
 
-	if (free_list->head) {
+    if( free_list->head ) {
-		ret = free_list->head;
+        ret = free_list->head;
-		free_list->head = free_list->head->next;
+        free_list->head = free_list->head->next;
-		free_list->freeListLength--;
+        free_list->freeListLength--;
-	} else {
+    } else {
-		ret = malloc(free_list->element_size);
+        ret = malloc( free_list->element_size );
-	}
+    }
 
-	return ret;
+    return ret;
 }
 
-int FreeListFree(FreeList *free_list, void *element)
+/****************************************************************************
+ * Function: FreeListFree
+ *
+ *  Description:
+ *      Returns an item to the Free List.
+ *      If the free list is smaller than the max size than
+ *      adds the item to the free list.
+ *      Otherwise returns the item to the O.S.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a free list.
+ *      element - must be a pointer allocated by FreeListAlloc
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int
+FreeListFree( FreeList * free_list,
+              void *element )
 {
-	FreeListNode *temp = NULL;
 
-	assert(free_list != NULL);
+    FreeListNode *temp = NULL;
 
-	if (free_list == NULL)
+    assert( free_list != NULL );
-		return EINVAL;
-	if (element != NULL &&
-	    free_list->freeListLength + 1 < free_list->maxFreeListLength) {
-		free_list->freeListLength++;
-		temp = (FreeListNode *)element;
-		temp->next = free_list->head;
-		free_list->head = temp;
-	} else {
-		free(element);
-	}
 
-	return 0;
+    if( free_list == NULL )
+        return EINVAL;
+
+    if( ( element != NULL ) &&
+        ( ( free_list->freeListLength + 1 ) <
+          free_list->maxFreeListLength ) ) {
+        free_list->freeListLength++;
+        temp = ( FreeListNode * ) element;
+        temp->next = free_list->head;
+        free_list->head = temp;
+
+    } else {
+
+        free( element );
+    }
+
+    return 0;
 }
 
-int FreeListDestroy(FreeList *free_list)
+/****************************************************************************
+ * Function: FreeListDestroy
+ *
+ *  Description:
+ *      Releases the resources stored with the free list.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int
+FreeListDestroy( FreeList * free_list )
 {
-	FreeListNode *temp = NULL;
+    FreeListNode *temp = NULL;
-	int i = 0;
+    int i = 0;
 
-	assert(free_list != NULL);
+    assert( free_list != NULL );
 
-	if (!free_list)
+    if( free_list == NULL )
-		return EINVAL;
+        return EINVAL;
-	while (free_list->head) {
-		i++;
-		temp = free_list->head->next;
-		free(free_list->head);
-		free_list->head = temp;
-	}
-	free_list->freeListLength = 0;
 
-	return 0;
+    while( free_list->head ) {
+        i++;
+        temp = free_list->head->next;
+        free( free_list->head );
+        free_list->head = temp;
+    }
+
+    free_list->freeListLength = 0;
+
+    return 0;
 }
-

threadutil/src/LinkedList.c

@@ -1,310 +1,534 @@
-/**************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- **************************************************************************/
 
 #include "LinkedList.h"
-
+#include <sys/param.h>
-#ifdef WIN32
+#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
-	/* Do not #include <sys/param.h> */
+#include <stdlib.h>
 #else
-	#include <sys/param.h>
+#include <malloc.h>
 #endif
-
-#if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
-	#include <stdlib.h>
-#else
-	#include <malloc.h>
-#endif
-
 #include <assert.h>
 
-static int freeListNode(ListNode *node, LinkedList *list)
+static int
+freeListNode( ListNode * node,
+              LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );
 
-	return FreeListFree(&list->freeNodeList, node);
+    return FreeListFree( &list->freeNodeList, node );
 }
 
-/*!
+/****************************************************************************
- * \brief Dynamically creates a list node.
+ * Function: CreateListNode
+ *
+ *  Description:
+ *      Creates a list node. Dynamically.
  *      
  *  Parameters:
  *      void * item - the item to store
  *  Returns:
  *      The new node, NULL on failure.
- */
+ *****************************************************************************/
-static ListNode *CreateListNode(
+static ListNode *
-	/*! the item to store. */
+CreateListNode( void *item,
-	void *item,
+                LinkedList * list )
-	/*! The list to add it to. */
-	LinkedList *list)
 {
-	ListNode *temp = NULL;
 
-	assert(list != NULL);
+    ListNode *temp = NULL;
 
-	temp = (ListNode *)FreeListAlloc(&list->freeNodeList);
+    assert( list != NULL );
-	if (temp) {
-		temp->prev = NULL;
-		temp->next = NULL;
-		temp->item = item;
-	}
 
-	return temp;
+    temp = ( ListNode * ) FreeListAlloc( &list->freeNodeList );
+    if( temp ) {
+        temp->prev = NULL;
+        temp->next = NULL;
+        temp->item = item;
+    }
+    return temp;
 }
 
-int ListInit(LinkedList *list, cmp_routine cmp_func, free_function free_func)
+/****************************************************************************
+ * Function: ListInit
+ *
+ *  Description:
+ *      Initializes LinkedList. Must be called first.
+ *      And only once for List.
+ *  Parameters:
+ *      list  - must be valid, non null, pointer to a linked list.
+ *      cmp_func - function used to compare items. (May be NULL)
+ *      free_func - function used to free items. (May be NULL)
+ *  Returns:
+ *      0 on success, EOUTOFMEM on failure.
+ *****************************************************************************/
+int
+ListInit( LinkedList * list,
+          cmp_routine cmp_func,
+          free_function free_func )
 {
-	int retCode = 0;
 
-	assert(list != NULL);
+    int retCode = 0;
 
-	if (!list)
+    assert( list != NULL );
-		return EINVAL;
-	list->size = 0;
-	list->cmp_func = cmp_func;
-	list->free_func = free_func;
-	retCode = FreeListInit(&list->freeNodeList, sizeof(ListNode), FREELISTSIZE);
 
-	assert(retCode == 0);
+    if( list == NULL )
+        return EINVAL;
 
-	list->head.item = NULL;
+    list->size = 0;
-	list->head.next = &list->tail;
+    list->cmp_func = cmp_func;
-	list->head.prev = NULL;
+    list->free_func = free_func;
-	list->tail.item = NULL;
-	list->tail.prev = &list->head;
-	list->tail.next = NULL;
 
-	return retCode;
+    retCode =
+        FreeListInit( &list->freeNodeList, sizeof( ListNode ),
+                      FREELISTSIZE );
+
+    assert( retCode == 0 );
+
+    list->head.item = NULL;
+    list->head.next = &list->tail;
+    list->head.prev = NULL;
+
+    list->tail.item = NULL;
+    list->tail.prev = &list->head;
+    list->tail.next = NULL;
+
+    return 0;
 }
 
-ListNode *ListAddHead(LinkedList *list, void *item)
+/****************************************************************************
+ * Function: ListAddHead
+ *
+ *  Description:
+ *      Adds a node to the head of the list.
+ *      Node gets immediately after list.head.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddHead( LinkedList * list,
+             void *item )
 {
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (list == NULL)
+    if( list == NULL )
-	return NULL;
+        return NULL;
 
-	return ListAddAfter(list, item, &list->head);
+    return ListAddAfter( list, item, &list->head );
 }
 
-ListNode *ListAddTail(LinkedList *list, void *item)
+/****************************************************************************
+ * Function: ListAddTail
+ *
+ *  Description:
+ *      Adds a node to the tail of the list.
+ *      Node gets added immediately before list.tail.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddTail( LinkedList * list,
+             void *item )
 {
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (!list)
+    if( list == NULL )
-		return NULL;
+        return NULL;
 
-	return ListAddBefore(list, item, &list->tail);
+    return ListAddBefore( list, item, &list->tail );
 }
 
-ListNode *ListAddAfter(LinkedList *list, void *item, ListNode *bnode)
+/****************************************************************************
+ * Function: ListAddAfter
+ *
+ *  Description:
+ *      Adds a node after the specified node.
+ *      Node gets added immediately after bnode.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *      ListNode * bnode - node to add after
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddAfter( LinkedList * list,
+              void *item,
+              ListNode * bnode )
 {
-	ListNode *newNode = NULL;
+    ListNode *newNode = NULL;
 
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (!list || !bnode)
+    if( ( list == NULL ) || ( bnode == NULL ) )
-		return NULL;
+        return NULL;
-	newNode = CreateListNode(item, list);
-	if (newNode) {
-		ListNode *temp = bnode->next;
 
-		bnode->next = newNode;
+    newNode = CreateListNode( item, list );
-		newNode->prev = bnode;
+    if( newNode ) {
-		newNode->next = temp;
+        ListNode *temp = bnode->next;
-		temp->prev = newNode;
-		list->size++;
 
-		return newNode;
+        bnode->next = newNode;
-	}
+        newNode->prev = bnode;
-
+        newNode->next = temp;
-	return NULL;
+        temp->prev = newNode;
+        list->size++;
+        return newNode;
+    }
+    return NULL;
 }
 
-ListNode *ListAddBefore(LinkedList *list, void *item, ListNode *anode)
+/****************************************************************************
+ * Function: ListAddBefore
+ *
+ *  Description:
+ *      Adds a node before the specified node.
+ *      Node gets added immediately before anode.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode * anode  - node to add the in front of.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddBefore( LinkedList * list,
+               void *item,
+               ListNode * anode )
 {
-	ListNode *newNode = NULL;
+    ListNode *newNode = NULL;
 
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (!list || !anode)
+    if( ( list == NULL ) || ( anode == NULL ) )
-		return NULL;
+        return NULL;
-	newNode = CreateListNode(item, list);
-	if (newNode) {
-		ListNode *temp = anode->prev;
 
-		anode->prev = newNode;
+    newNode = CreateListNode( item, list );
-		newNode->next = anode;
-		newNode->prev = temp;
-		temp->next = newNode;
-		list->size++;
 
-		return newNode;
+    if( newNode ) {
-	}
+        ListNode *temp = anode->prev;
 
-	return NULL;
+        anode->prev = newNode;
+        newNode->next = anode;
+        newNode->prev = temp;
+        temp->next = newNode;
+        list->size++;
+        return newNode;
+    }
+    return NULL;
 }
 
-void *ListDelNode(LinkedList *list, ListNode *dnode, int freeItem)
+/****************************************************************************
+ * Function: ListDelNode
+ *
+ *  Description:
+ *      Removes a node from the list
+ *      The memory for the node is freed but the
+ *      the memory for the items are not.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *dnode - done to delete.
+ *  Returns:
+ *      The pointer to the item stored in node on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+void *
+ListDelNode( LinkedList * list,
+             ListNode * dnode,
+             int freeItem )
 {
-	void *temp;
+    void *temp;
 
-	assert(list != NULL);
+    assert( list != NULL );
-	assert(dnode != &list->head);
+    assert( dnode != &list->head );
-	assert(dnode != &list->tail);
+    assert( dnode != &list->tail );
 
-	if (!list || dnode == &list->head || dnode == &list->tail || !dnode)
+    if( ( list == NULL ) ||
-		return NULL;
+        ( dnode == &list->head ) ||
-	temp = dnode->item;
+        ( dnode == &list->tail ) || ( dnode == NULL ) ) {
-	dnode->prev->next = dnode->next;
+        return NULL;
-	dnode->next->prev = dnode->prev;
+    }
-	freeListNode(dnode, list);
-	list->size--;
-	if (freeItem && list->free_func) {
-		list->free_func(temp);
-		temp = NULL;
-	}
 
-	return temp;
+    temp = dnode->item;
+    dnode->prev->next = dnode->next;
+    dnode->next->prev = dnode->prev;
+
+    freeListNode( dnode, list );
+    list->size--;
+
+    if( freeItem && list->free_func ) {
+        list->free_func( temp );
+        temp = NULL;
+    }
+
+    return temp;
 }
 
-int ListDestroy(LinkedList *list, int freeItem)
+/****************************************************************************
+ * Function: ListDestroy
+ *
+ *  Description:
+ *      Removes all memory associated with list nodes. 
+ *      Does not free LinkedList *list. 
+ *      Items stored in the list are not freed, only nodes are.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int
+ListDestroy( LinkedList * list,
+             int freeItem )
 {
-	ListNode *dnode = NULL;
+    ListNode *dnode = NULL;
-	ListNode *temp = NULL;
+    ListNode *temp = NULL;
 
-	if(!list)
+    if( list == NULL )
-		return EINVAL;
+        return EINVAL;
 
-	for (dnode = list->head.next; dnode != &list->tail; ) {
+    for( dnode = list->head.next; dnode != &list->tail; ) {
-		temp = dnode->next;
+        temp = dnode->next;
-		ListDelNode(list, dnode, freeItem);
+        ListDelNode( list, dnode, freeItem );
-		dnode = temp;
+        dnode = temp;
-	}
+    }
-	list->size = 0;
-	FreeListDestroy(&list->freeNodeList);
 
-	return 0;
+    list->size = 0;
+    FreeListDestroy( &list->freeNodeList );
+    return 0;
 }
 
-ListNode *ListHead(LinkedList *list)
+/****************************************************************************
+ * Function: ListHead
+ *
+ *  Description:
+ *      Returns the head of the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The head of the list. NULL if list is empty.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListHead( LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (!list)
+    if( list == NULL )
-		return NULL;
+        return NULL;
 
-	if (!list->size)
+    if( list->size == 0 )
-		return NULL;
+        return NULL;
-	else
+    else
-		return list->head.next;
+        return list->head.next;
 }
 
-ListNode *ListTail(LinkedList *list)
+/****************************************************************************
+ * Function: ListTail
+ *
+ *  Description:
+ *      Returns the tail of the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The tail of the list. NULL if list is empty.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListTail( LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (!list)
+    if( list == NULL )
-		return NULL;
+        return NULL;
 
-	if (!list->size)
+    if( list->size == 0 )
-		return NULL;
+        return NULL;
-	else
+    else
-		return list->tail.prev;
+        return list->tail.prev;
 }
 
-ListNode *ListNext(LinkedList *list, ListNode *node)
+/****************************************************************************
+ * Function: ListNext
+ *
+ *  Description:
+ *      Returns the next item in the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The next item in the list. NULL if there are no more items in list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListNext( LinkedList * list,
+          ListNode * node )
 {
-	assert(list != NULL);
+    assert( list != NULL );
-	assert(node != NULL);
+    assert( node != NULL );
 
-	if (!list || !node)
+    if( ( list == NULL ) || ( node == NULL ) )
-		return NULL;
+        return NULL;
-	if (node->next == &list->tail)
+
-		return NULL;
+    if( node->next == &list->tail )
-	else
+        return NULL;
-		return node->next;
+    else
+        return node->next;
 }
 
-ListNode *ListPrev(LinkedList *list, ListNode *node)
+/****************************************************************************
+ * Function: ListPrev
+ *
+ *  Description:
+ *      Returns the previous item in the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The previous item in the list. NULL if there are no more items in list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListPrev( LinkedList * list,
+          ListNode * node )
 {
-	assert(list != NULL);
+    assert( list != NULL );
-	assert(node != NULL);
+    assert( node != NULL );
 
-	if (!list || !node)
+    if( ( list == NULL ) || ( node == NULL ) )
-		return NULL;
+        return NULL;
 
-	if (node->prev == &list->head)
+    if( node->prev == &list->head )
-		return NULL;
+        return NULL;
-	else
+    else
-		return node->prev;
+        return node->prev;
 }
 
-ListNode *ListFind(LinkedList *list, ListNode *start, void *item)
+/****************************************************************************
+ * Function: ListFind
+ *
+ *  Description:
+ *      Finds the specified item in the list.
+ *      Uses the compare function specified in ListInit. If compare function
+ *      is NULL then compares items as pointers.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *start - the node to start from, NULL if to start from 
+ *                        beginning.
+ *      void * item - the item to search for.
+ *  Returns:
+ *      The node containing the item. NULL if no node contains the item.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListFind( LinkedList * list,
+          ListNode * start,
+          void *item )
 {
-	ListNode *finger = NULL;
 
-	if (!list)
+    ListNode *finger = NULL;
-		return NULL;
-	if (!start)
-		start = &list->head;
 
-	assert(start);
+    if( list == NULL )
+        return NULL;
 
-	finger = start->next;
+    if( start == NULL )
+        start = &list->head;
 
-	assert(finger);
+    assert( start );
 
-	while (finger != &list->tail) {
+    finger = start->next;
-		if (list->cmp_func) {
+
-			if (list->cmp_func(item, finger->item))
+    assert( finger );
-				return finger;
+
-		} else {
+    while( finger != &list->tail ) {
-			if (item == finger->item)
+        if( list->cmp_func ) {
-				return finger;
+            if( list->cmp_func( item, finger->item ) )
-		}
+                return finger;
-		finger = finger->next;
+        } else {
-	}
+            if( item == finger->item )
+                return finger;
+        }
+        finger = finger->next;
+    }
+
+    return NULL;
 
-	return NULL;
 }
 
-long ListSize(LinkedList *list)
+/****************************************************************************
+ * Function: ListSize
+ *
+ *  Description:
+ *     Returns the size of the list.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ 
+ *  Returns:
+ *      The number of items in the list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int
+ListSize( LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );
 
-	if (!list)
+    if( list == NULL )
-		return EINVAL;
+        return EINVAL;
 
-	return list->size;
+    return list->size;
 }
-

threadutil/src/TimerThread.c

@@ -1,173 +1,203 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- * Copyright (c) 2012 France Telecom All rights reserved. 
+//
- *
+// Redistribution and use in source and binary forms, with or without 
- * Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
- * modification, are permitted provided that the following conditions are met: 
+//
- *
+// * Redistributions of source code must retain the above copyright notice, 
- * - Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
- * this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * - Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
- * this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
- * and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * - Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
- * may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
- * without specific prior written permission.
+// 
- * 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
- *
+///////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
-
-/*!
- * \file
- */
 
 #include "TimerThread.h"
-
 #include <assert.h>
 
-/*!
+/****************************************************************************
- * \brief Deallocates a dynamically allocated TimerEvent.
+ * Function: FreeTimerEvent
- */
+ *
-static void FreeTimerEvent(
+ *  Description:
-	/*! [in] Valid timer thread pointer. */
+ *      Deallocates a dynamically allocated TimerEvent.
-	TimerThread *timer,
+ *  Parameters:
-	/*! [in] Must be allocated with CreateTimerEvent*/
+ *      TimerEvent *event - must be allocated with CreateTimerEvent
-	TimerEvent *event)
+ *****************************************************************************/
+static void
+FreeTimerEvent( TimerThread * timer,
+                TimerEvent * event )
 {
-	assert(timer != NULL);
 
-	FreeListFree(&timer->freeEvents, event);
+    assert( timer != NULL );
+
+    FreeListFree( &timer->freeEvents, event );
 }
 
-/*!
+/****************************************************************************
- * \brief Implements timer thread.
+ * Function: TimerThreadWorker
  *
- * Waits for next event to occur and schedules associated job into threadpool.
+ *  Description:
- */
+ *      Implements timer thread.
-static void *TimerThreadWorker(
+ *      Waits for next event to occur and schedules
-	/*! [in] arg is cast to (TimerThread *). */
+ *      associated job into threadpool.
-	void *arg)
+ *      Internal Only.
+ *  Parameters:
+ *      void * arg -> is cast to TimerThread *
+ *****************************************************************************/
+static void *
+TimerThreadWorker( void *arg )
 {
     TimerThread *timer = ( TimerThread * ) arg;
     ListNode *head = NULL;
+
     TimerEvent *nextEvent = NULL;
+
     time_t currentTime = 0;
     time_t nextEventTime = 0;
     struct timespec timeToWait;
+
     int tempId;
 
     assert( timer != NULL );
 
     ithread_mutex_lock( &timer->mutex );
-    while (1) {
+
-        /* mutex should always be locked at top of loop */
+    while( 1 )
-	/* Check for shutdown. */
+    {
-        if (timer->shutdown) {
+
+        //mutex should always be locked at top of loop
+
+        //Check for shutdown
+
+        if( timer->shutdown )
+        {
+
             timer->shutdown = 0;
             ithread_cond_signal( &timer->condition );
             ithread_mutex_unlock( &timer->mutex );
             return NULL;
+
         }
+
         nextEvent = NULL;
-        /* Get the next event if possible. */
+
-        if (timer->eventQ.size > 0) {
+        //Get the next event if possible
+        if( timer->eventQ.size > 0 )
+        {
             head = ListHead( &timer->eventQ );
-            if (head == NULL) {
+
-                ithread_mutex_unlock( &timer->mutex );
-                return NULL;
-            }
             nextEvent = ( TimerEvent * ) head->item;
             nextEventTime = nextEvent->eventTime;
         }
-        currentTime = time(NULL);
+
-        /* If time has elapsed, schedule job. */
+        currentTime = time( NULL );
-        if (nextEvent && currentTime >= nextEventTime) {
+
+        //If time has elapsed, schedule job
+
+        if( ( nextEvent != NULL ) && ( currentTime >= nextEventTime ) )
+        {
+
             if( nextEvent->persistent ) {
-                if (ThreadPoolAddPersistent( timer->tp, &nextEvent->job, &tempId ) != 0) {
+
-			if (nextEvent->job.arg != NULL && nextEvent->job.free_func != NULL) {
+                ThreadPoolAddPersistent( timer->tp, &nextEvent->job,
-				nextEvent->job.free_func(nextEvent->job.arg);
+                                         &tempId );
-			}
-		}
             } else {
-                if (ThreadPoolAdd( timer->tp, &nextEvent->job, &tempId ) != 0) {
+
-			if (nextEvent->job.arg != NULL && nextEvent->job.free_func != NULL) {
+                ThreadPoolAdd( timer->tp, &nextEvent->job, &tempId );
-				nextEvent->job.free_func(nextEvent->job.arg);
-			}
-		}
             }
+
             ListDelNode( &timer->eventQ, head, 0 );
             FreeTimerEvent( timer, nextEvent );
+
             continue;
+
         }
-        if (nextEvent) {
+
+        if( nextEvent != NULL ) {
             timeToWait.tv_nsec = 0;
-            timeToWait.tv_sec = (long)nextEvent->eventTime;
+            timeToWait.tv_sec = nextEvent->eventTime;
+
             ithread_cond_timedwait( &timer->condition, &timer->mutex,
                                     &timeToWait );
+
         } else {
             ithread_cond_wait( &timer->condition, &timer->mutex );
         }
+
     }
 }
 
-
+/****************************************************************************
-/*!
+ * Function: CalculateEventTime
- * \brief Calculates the appropriate timeout in absolute seconds
- * since Jan 1, 1970.
  *
- * \return 
+ *  Description:
- */
+ *      Calculates the appropriate timeout in absolute seconds since
-static int CalculateEventTime(
+ *      Jan 1, 1970
-	/*! [in] Timeout. */
+ *      Internal Only.
-	time_t *timeout,
+ *  Parameters:
-	/*! [in] Timeout type. */
+ *      time_t *timeout - timeout
-	TimeoutType type)
+ *      
+ *****************************************************************************/
+static int
+CalculateEventTime( time_t * timeout,
+                    TimeoutType type )
 {
     time_t now;
 
     assert( timeout != NULL );
 
-    switch (type) {
+    if( type == ABS_SEC )
-    case ABS_SEC:
         return 0;
-    default: /* REL_SEC) */
+    else if( type == REL_SEC ) {
-        time(&now);
+        time( &now );
         ( *timeout ) += now;
         return 0;
     }
 
     return -1;
+
 }
 
-/*!
+/****************************************************************************
- * \brief Creates a Timer Event. (Dynamically allocated).
+ * Function: CreateTimerEvent
  *
- * \return (TimerEvent *) on success, NULL on failure.
+ *  Description:
- */
+ *      Creates a Timer Event. (Dynamically allocated)
-static TimerEvent *CreateTimerEvent(
+ *      Internal to timer thread.
-	/*! [in] Valid timer thread pointer. */
+ *  Parameters:
-	TimerThread *timer,
+ *      func - thread function to run.
-	/*! [in] . */
+ *      arg - argument to function.
-	ThreadPoolJob *job,
+ *      priority - priority of job.
-	/*! [in] . */
+ *      eventTime - the absoule time of the event
-	Duration persistent,
+ *                  in seconds from Jan, 1970
-	/*! [in] The absoule time of the event in seconds from Jan, 1970. */
+ *      id - id of job
-	time_t eventTime,
+ *      
-	/*! [in] Id of job. */
+ *  Returns:
-	int id)
+ *      TimerEvent * on success, NULL on failure.
+ ****************************************************************************/
+static TimerEvent *
+CreateTimerEvent( TimerThread * timer,
+                  ThreadPoolJob * job,
+                  Duration persistent,
+                  time_t eventTime,
+                  int id )
 {
     TimerEvent *temp = NULL;
 
@@ -185,8 +215,25 @@ static TimerEvent *CreateTimerEvent(
     return temp;
 }
 
-
+/************************************************************************
-int TimerThreadInit(TimerThread *timer, ThreadPool *tp)
+ * Function: TimerThreadInit
+ * 
+ *  Description:
+ *     Initializes and starts timer thread.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             tp  - valid thread pool to use. Must be
+ *                   started. Must be valid for lifetime
+ *                   of timer.  Timer must be shutdown
+ *                   BEFORE thread pool.
+ *  Return:
+ *            0 on success, nonzero on failure
+ *            Returns error from ThreadPoolAddPersistent if failure.
+ ************************************************************************/
+int
+TimerThreadInit( TimerThread * timer,
+                 ThreadPool * tp )
 {
 
     int rc = 0;
@@ -240,16 +287,42 @@ int TimerThreadInit(TimerThread *timer, ThreadPool *tp)
     }
 
     return rc;
+
 }
 
-int TimerThreadSchedule(
+/************************************************************************
-	TimerThread *timer,
+ * Function: TimerThreadSchedule
-	time_t timeout,
+ * 
-	TimeoutType type,
+ *  Description:
-	ThreadPoolJob *job,
+ *     Schedules an event to run at a specified time.
-	Duration duration,
+ *
-	int *id)
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             time_t - time of event.
+ *                      either in absolute seconds,
+ *                      or relative seconds in the future.
+ *             timeoutType - either ABS_SEC, or REL_SEC.
+ *                           if REL_SEC, then the event
+ *                           will be scheduled at the
+ *                           current time + REL_SEC.
+ *             
+ *             func - function to schedule
+ *             arg - argument to function
+ *             priority - priority of job.
+ *             id - id of timer event. (out)
+ *  Return:
+ *            0 on success, nonzero on failure
+ *			  EOUTOFMEM if not enough memory to schedule job
+ ************************************************************************/
+int
+TimerThreadSchedule( TimerThread * timer,
+                     time_t timeout,
+                     TimeoutType type,
+                     ThreadPoolJob * job,
+                     Duration duration,
+                     int *id )
 {
+
     int rc = EOUTOFMEM;
     int found = 0;
     int tempId = 0;
@@ -282,25 +355,35 @@ int TimerThreadSchedule(
     }
 
     tempNode = ListHead( &timer->eventQ );
-    /* add job to Q. Q is ordered by eventTime with the head of the Q being
+    //add job to Q
-     * the next event. */
+    //Q is ordered by eventTime
+    //with the head of the Q being the next event
+
     while( tempNode != NULL ) {
         temp = ( TimerEvent * ) tempNode->item;
-        if( temp->eventTime >= timeout ) {
+        if( temp->eventTime >= timeout )
-            if (ListAddBefore( &timer->eventQ, newEvent, tempNode))
+        {
+
+            if( ListAddBefore( &timer->eventQ, newEvent, tempNode ) !=
+                NULL )
                 rc = 0;
             found = 1;
             break;
+
         }
         tempNode = ListNext( &timer->eventQ, tempNode );
     }
-    /* add to the end of Q. */
+
-    if (!found) {
+    //add to the end of Q
+    if( !found ) {
+
         if( ListAddTail( &timer->eventQ, newEvent ) != NULL )
             rc = 0;
+
     }
-    /* signal change in Q. */
+    //signal change in Q
     if( rc == 0 ) {
+
         ithread_cond_signal( &timer->condition );
     } else {
         FreeTimerEvent( timer, newEvent );
@@ -311,10 +394,28 @@ int TimerThreadSchedule(
     return rc;
 }
 
-int TimerThreadRemove(
+/************************************************************************
-	TimerThread *timer,
+ * Function: TimerThreadRemove
-	int id,
+ * 
-	ThreadPoolJob *out)
+ *  Description:
+ *     Removes an event from the timer Q.
+ *     Events can only be removed 
+ *     before they have been placed in the
+ *     thread pool.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             id - id of event to remove.
+ *             out - space for returned job (Can be NULL)
+ *  Return:
+ *            0 on success.
+ *            INVALID_EVENT_ID on error.
+ *
+ ************************************************************************/
+int
+TimerThreadRemove( TimerThread * timer,
+                   int id,
+                   ThreadPoolJob * out )
 {
     int rc = INVALID_EVENT_ID;
     ListNode *tempNode = NULL;
@@ -349,7 +450,21 @@ int TimerThreadRemove(
     return rc;
 }
 
-int TimerThreadShutdown(TimerThread *timer)
+/************************************************************************
+ * Function: TimerThreadShutdown
+ * 
+ *  Description:
+ *    Shutdown the timer thread
+ *    Events scheduled in the future will NOT be run.
+ *    Timer thread should be shutdown BEFORE it's associated
+ *    thread pool.
+ *  Returns:
+ *    returns 0 if succesfull,
+ *            nonzero otherwise.
+ *            Always returns 0.
+ ***********************************************************************/
+int
+TimerThreadShutdown( TimerThread * timer )
 {
     ListNode *tempNode2 = NULL;
     ListNode *tempNode = NULL;
@@ -365,7 +480,9 @@ int TimerThreadShutdown(TimerThread *timer)
     timer->shutdown = 1;
     tempNode = ListHead( &timer->eventQ );
 
-    /* Delete nodes in Q. Call registered free function on argument. */
+    //Delete nodes in Q
+    //call registered free function 
+    //on argument
     while( tempNode != NULL ) {
         TimerEvent *temp = ( TimerEvent * ) tempNode->item;
 
@@ -383,19 +500,20 @@ int TimerThreadShutdown(TimerThread *timer)
 
     ithread_cond_broadcast( &timer->condition );
 
-    while (timer->shutdown) {
+    while( timer->shutdown )    //wait for timer thread to shutdown
-	/* wait for timer thread to shutdown. */
+    {
         ithread_cond_wait( &timer->condition, &timer->mutex );
     }
-    ithread_mutex_unlock(&timer->mutex);
 
-    /* destroy condition. */
+    ithread_mutex_unlock( &timer->mutex );
-    while(ithread_cond_destroy(&timer->condition) != 0) {
+
+    //destroy condition
+    while( ithread_cond_destroy( &timer->condition ) != 0 ) {
     }
-    /* destroy mutex. */
+
-    while (ithread_mutex_destroy(&timer->mutex) != 0) {
+    //destroy mutex
+    while( ithread_mutex_destroy( &timer->mutex ) != 0 ) {
     }
 
     return 0;
 }
-

threadutil/src/iasnprintf.c

@@ -0,0 +1,153 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * 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. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "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 INTEL 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.
+//
+///////////////////////////////////////////////////////////////////////////
+
+#include <stdarg.h>
+#include <assert.h>
+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include <stdio.h>
+#include "iasnprintf.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef WIN32
+ #define vsnprintf _vsnprintf
+#endif
+
+/**
+ * Allocates enough memory for the
+ * Formatted string, up to max
+ * specified.
+ * With max set to -1, it allocates as
+ * much size as needed.
+ * Memory must be freed using free.
+ */
+
+int
+iasnprintf( char **ret,
+            int incr,
+            int max,
+            const char *fmt,
+            ... )
+{
+    int size = incr;
+    int retc = 0;
+    va_list ap;
+    char *temp = NULL;
+
+    assert( ret );
+    assert( fmt );
+    ( *ret ) = ( char * )malloc( incr );
+
+    if( ( *ret ) == NULL ) return -1;
+
+    while( 1 ) {
+        va_start( ap, fmt );
+        retc = vsnprintf( ( *ret ), size, fmt, ap );
+        va_end( ap );
+
+        if( retc < 0 ) {
+            //size not big enough
+            //and vsnprintf does NOT return the
+            //necessary number of bytes
+            if( ( max != -1 ) && ( size == max ) )  //max reached
+            {
+                break;
+            }
+
+            incr *= 2;          //increase increment
+            //increase size and try again  
+            if( ( max != -1 ) && ( ( size + incr ) > max ) ) {
+                incr = ( max - size );
+            }
+
+            temp = ( char * )realloc( ( *ret ), size + incr );
+            if( temp == NULL ) {
+                break;
+            }
+            size += incr;
+            ( *ret ) = temp;
+
+        } else {
+            if( ( retc + 1 ) > size ) {
+                //size not big enough
+                //and vsnprintf 
+                //returns the necessary 
+                //number of bytes
+                if( ( max != -1 ) && ( retc + 1 > max ) ) {
+                    retc = -1;
+                    break;
+                }
+
+                temp = ( char * )realloc( ( *ret ), retc + 1 );
+                if( temp == NULL ) {
+                    retc = -1;
+                    break;
+                }
+                size = retc + 1;
+                ( *ret ) = temp;    //size increased try again
+            } else if( ( retc + 1 ) < size ) {
+                //size is bigger than needed
+                //try and reallocate smaller
+
+                temp = ( char * )realloc( ( *ret ), retc + 1 );
+                if( temp != NULL ) {
+                    ( *ret ) = temp;
+                }
+                break;
+            } else              //size is just right, exit
+            {
+                break;
+            }
+
+        }
+    }
+
+    if( retc < 0 ) {
+        free( ( *ret ) );
+        ( *ret ) = NULL;
+    }
+
+    return retc;
+}
+
+void
+iasnprintfFree( char *fChar )
+{
+    free( fChar );
+    fChar = NULL;
+}

upnp/Makefile.am

@@ -1,16 +1,20 @@
 #
 # "Makefile.am" for "libupnp/upnp"
 #
-# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
-SUBDIRS = doc . sample unittest
+SUBDIRS = doc . sample
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/inc \
 	-I$(top_srcdir)/threadutil/inc \
 	-I$(top_srcdir)/ixml/inc
 
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
 LDADD = \
 	libupnp.la \
 	$(top_builddir)/threadutil/libthreadutil.la \
@@ -19,29 +23,8 @@ LDADD = \
 
 upnpincludedir = $(includedir)/upnp
 upnpinclude_HEADERS = \
-	inc/ActionComplete.h \
-	inc/ActionRequest.h \
-	inc/Callback.h \
-	inc/Discovery.h \
-	inc/Event.h \
-	inc/EventSubscribe.h \
-	inc/FileInfo.h \
-	inc/list.h \
-	inc/poison.h \
-	inc/StateVarComplete.h \
-	inc/StateVarRequest.h \
-	inc/SubscriptionRequest.h \
-	inc/TemplateInclude.h \
-	inc/TemplateSource.h \
-	inc/TemplateUndef.h \
-	inc/UpnpString.h \
 	inc/upnp.h \
-	inc/upnpdebug.h \
+	inc/upnpdebug.h
-	inc/UpnpGlobal.h \
-	inc/UpnpInet.h \
-	inc/UpnpIntTypes.h \
-	inc/UpnpStdInt.h \
-	inc/UpnpUniStd.h
 
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
@@ -62,12 +45,12 @@ libupnp_la_LDFLAGS = \
 libupnp_la_SOURCES = \
 	src/inc/config.h \
 	src/inc/client_table.h \
-	src/inc/ClientSubscription.h \
 	src/inc/gena.h \
 	src/inc/gena_ctrlpt.h \
 	src/inc/gena_device.h \
 	src/inc/global.h \
 	src/inc/gmtdate.h \
+	src/inc/http_client.h \
 	src/inc/httpparser.h \
 	src/inc/httpreadwrite.h \
 	src/inc/md5.h \
@@ -86,42 +69,36 @@ libupnp_la_SOURCES = \
 	src/inc/sysdep.h \
 	src/inc/unixutil.h \
 	src/inc/upnpapi.h \
+	src/inc/upnpclosesocket.h \
 	src/inc/upnp_timeout.h \
 	src/inc/uri.h \
 	src/inc/urlconfig.h \
-	src/inc/upnputil.h \
+	src/inc/util.h \
+	src/inc/utilall.h \
 	src/inc/uuid.h \
-	src/inc/VirtualDir.h \
 	src/inc/webserver.h
 
 # ssdp
-if ENABLE_SSDP
 libupnp_la_SOURCES += \
-	src/ssdp/ssdp_ResultData.c \
-	src/ssdp/ssdp_ResultData.h \
 	src/ssdp/ssdp_device.c \
 	src/ssdp/ssdp_ctrlpt.c \
 	src/ssdp/ssdp_server.c
-endif
 
 # soap
-if ENABLE_SOAP
 libupnp_la_SOURCES += \
 	src/soap/soap_device.c \
 	src/soap/soap_ctrlpt.c \
 	src/soap/soap_common.c
-endif
 
 # genlib
 libupnp_la_SOURCES += \
 	src/genlib/miniserver/miniserver.c \
-	src/genlib/client_table/client_table.c \
-	src/genlib/client_table/ClientSubscription.c \
 	src/genlib/service_table/service_table.c \
 	src/genlib/util/membuffer.c \
 	src/genlib/util/strintmap.c \
 	src/genlib/util/upnp_timeout.c \
 	src/genlib/util/util.c \
+	src/genlib/client_table/client_table.c \
 	src/genlib/net/sock.c \
 	src/genlib/net/http/httpparser.c \
 	src/genlib/net/http/httpreadwrite.c \
@@ -131,65 +108,42 @@ libupnp_la_SOURCES += \
 	src/genlib/net/uri/uri.c
 
 # gena
-if ENABLE_GENA
 libupnp_la_SOURCES += \
 	src/gena/gena_device.c \
 	src/gena/gena_ctrlpt.c \
 	src/gena/gena_callback2.c
-endif
 
 # api
-libupnp_la_SOURCES += \
+libupnp_la_SOURCES += src/api/upnpapi.c
-	src/api/ActionComplete.c \
-	src/api/ActionRequest.c \
-	src/api/Discovery.c \
-	src/api/Event.c \
-	src/api/EventSubscribe.c \
-	src/api/FileInfo.c \
-	src/api/StateVarComplete.c \
-	src/api/StateVarRequest.c \
-	src/api/SubscriptionRequest.c \
-	src/api/UpnpString.c \
-	src/api/upnpapi.c
-
 if ENABLE_TOOLS
 libupnp_la_SOURCES += src/api/upnptools.c
 endif
-
 if ENABLE_DEBUG
 libupnp_la_SOURCES += src/api/upnpdebug.c 
 endif
 
 
 # uuid
-if ENABLE_UUID
 libupnp_la_SOURCES += \
 	src/uuid/md5.c \
 	src/uuid/sysdep.c \
 	src/uuid/uuid.c
-endif
 
 
 # urlconfig
 libupnp_la_SOURCES += src/urlconfig/urlconfig.c
 
 
-# inet_pton (needed on Win32, compiles to nothing elsewhere)
-libupnp_la_SOURCES += \
-	src/inet_pton.c \
-	src/inc/inet_pton.h
-
-
 # check / distcheck tests
-check_PROGRAMS = test_init test_url
+check_PROGRAMS = test_init
-TESTS = test_init test_url
+TESTS = test_init
 test_init_SOURCES = test/test_init.c
-test_url_SOURCES = test/test_url.c
 
 
 EXTRA_DIST = \
 	LICENSE \
-	m4/libupnp.m4 \
+	src/inc/inet_pton.h \
+	src/inet_pton.c \
 	src/win_dll.c
 
 

upnp/inc/ActionComplete.h

@@ -1,26 +0,0 @@
-
-#ifndef ACTIONCOMPLETE_H
-#define ACTIONCOMPLETE_H
-
-
-/*!
- * \file
- *
- * \brief UpnpActionComplete object declaration.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#define CLASS UpnpActionComplete
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ErrCode, int) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, CtrlUrl) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ActionRequest, IXML_Document *) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ActionResult, IXML_Document *) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* ACTIONCOMPLETE_H */
-

upnp/inc/ActionRequest.h

@@ -1,36 +0,0 @@
-
-#ifndef ACTIONREQUEST_H
-#define ACTIONREQUEST_H
-
-
-/*!
- * \file
- *
- * \brief UpnpActionRequest object declaration.
- *
- * Returned as part of a \b UPNP_CONTROL_ACTION_COMPLETE callback.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#include "UpnpInet.h" /* for struct sockaddr_storage */
-
-#define CLASS UpnpActionRequest
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ErrCode, int) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, Socket, int) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ErrStr) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ActionName) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, DevUDN) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ServiceID) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ActionRequest, IXML_Document *) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ActionResult, IXML_Document *) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, SoapHeader, IXML_Document *) \
-	EXPAND_CLASS_MEMBER_BUFFER(CLASS, CtrlPtIPAddr, struct sockaddr_storage) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* ACTIONREQUEST_H */
-

upnp/inc/Callback.h

@@ -1,153 +0,0 @@
-
-#ifndef CALLBACK_H
-#define CALLBACK_H
-
-/*!
- * \file
- */
-
-/*!
- * \brief The reason code for an event callback.
- *
- * The \b Event parameter will be different depending on the reason for the
- * callback. The descriptions for each event type describe the contents of the
- * \b Event parameter.
- */
-enum Upnp_EventType_e {
-	/*
-	 * Control callbacks
-	 */
-
-	/*! Received by a device when a control point issues a control
-	 * request.  The \b Event parameter contains a pointer to a \b
-	 * UpnpActionRequest structure containing the action.  The application
-	 * stores the results of the action in this structure. */
-	UPNP_CONTROL_ACTION_REQUEST,
-
-	/*! A \b UpnpSendActionAsync call completed. The \b Event
-	 * parameter contains a pointer to a \b UpnpActionComplete structure
-	 * with the results of the action.  */
-	UPNP_CONTROL_ACTION_COMPLETE,
-
-	/*! Received by a device when a query for a single service variable
-	 * arrives.  The \b Event parameter contains a pointer to a \b
-	 * UpnpStateVarRequest structure containing the name of the variable
-	 * and value.  */
-	UPNP_CONTROL_GET_VAR_REQUEST,
-
-	/*! A \b UpnpGetServiceVarStatus call completed. The \b Event
-	 * parameter contains a pointer to a \b UpnpStateVarComplete structure
-	 * containing the value for the variable.  */
-	UPNP_CONTROL_GET_VAR_COMPLETE,
-
-	/*
-	 * Discovery callbacks
-	 */
-
-	/*! Received by a control point when a new device or service is available.  
-	 * The \b Event parameter contains a pointer to a \b
-	 * UpnpDiscovery structure with the information about the device
-	 * or service.  */
-	UPNP_DISCOVERY_ADVERTISEMENT_ALIVE,
-
-	/*! Received by a control point when a device or service shuts down. The \b
-	 * Event parameter contains a pointer to a \b UpnpDiscovery
-	 * structure containing the information about the device or
-	 * service.  */
-	UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE,
-
-	/*! Received by a control point when a matching device or service responds.
-	 * The \b Event parameter contains a pointer to a \b
-	 * UpnpDiscovery structure containing the information about
-	 * the reply to the search request.  */
-	UPNP_DISCOVERY_SEARCH_RESULT,
-
-	/*! Received by a control point when the search timeout expires.  The
-	 * SDK generates no more callbacks for this search after this 
-	 * event.  The \b Event parameter is \c NULL.  */
-	UPNP_DISCOVERY_SEARCH_TIMEOUT,
-
-	/*
-	 * Eventing callbacks
-	 */
-
-	/*! Received by a device when a subscription arrives.
-	 * The \b Event parameter contains a pointer to a \b
-	 * UpnpSubscriptionRequest structure.  At this point, the
-	 * subscription has already been accepted.  \b UpnpAcceptSubscription
-	 * needs to be called to confirm the subscription and transmit the
-	 * initial state table.  This can be done during this callback.  The SDK
-	 * generates no events for a subscription unless the device 
-	 * application calls \b UpnpAcceptSubscription.
-	 */
-	UPNP_EVENT_SUBSCRIPTION_REQUEST,
-
-	/*! Received by a control point when an event arrives. The \b
-	 * Event parameter contains a \b UpnpEvent structure
-	 * with the information about the event.  */
-	UPNP_EVENT_RECEIVED,
-
-	/*! A \b UpnpRenewSubscriptionAsync call completed. The status of
-	 * the renewal is in the \b Event parameter as a \b
-	 * Upnp_Event_Subscription structure.  */
-	UPNP_EVENT_RENEWAL_COMPLETE,
-
-	/*! A \b UpnpSubscribeAsync call completed. The status of the
-	 * subscription is in the \b Event parameter as a \b
-	 * Upnp_Event_Subscription structure.  */
-	UPNP_EVENT_SUBSCRIBE_COMPLETE,
-
-	/*! A \b UpnpUnSubscribeAsync call completed. The status of the
-	 * subscription is in the \b Event parameter as a \b
-	 * UpnpEventSubscribe structure.  */
-	UPNP_EVENT_UNSUBSCRIBE_COMPLETE,
-
-	/*! The auto-renewal of a client subscription failed.   
-	 * The \b Event parameter is a \b UpnpEventSubscribe structure 
-	 * with the error code set appropriately. The subscription is no longer 
-	 * valid. */
-	UPNP_EVENT_AUTORENEWAL_FAILED,
-
-	/*! A client subscription has expired. This will only occur 
-	 * if auto-renewal of subscriptions is disabled.
-	 * The \b Event parameter is a \b UpnpEventSubscribe
-	 * structure. The subscription is no longer valid. */
-	UPNP_EVENT_SUBSCRIPTION_EXPIRED
-};
-
-typedef enum Upnp_EventType_e Upnp_EventType;
-
-/*!
- *  All callback functions share the same prototype, documented below.
- *  Note that any memory passed to the callback function
- *  is valid only during the callback and should be copied if it
- *  needs to persist.  This callback function needs to be thread
- *  safe.  The context of the callback is always on a valid thread 
- *  context and standard synchronization methods can be used.  Note, 
- *  however, because of this the callback cannot call SDK functions
- *  unless explicitly noted.
- *
- *  \verbatim
-      int CallbackFxn(Upnp_EventType EventType, void *Event, void *Cookie);
-    \endverbatim 
- *
- *  where \b EventType is the event that triggered the callback, 
- *  \b Event is a structure that denotes event-specific information for that
- *  event, and \b Cookie is the user data passed when the callback was
- *  registered.
- *
- *  See \b Upnp_EventType for more information on the callback values and
- *  the associated \b Event parameter.  
- *
- *  The return value of the callback is currently ignored. It may be used
- *  in the future to communicate results back to the SDK.
- */
-typedef int (*Upnp_FunPtr)(
-	/*! [in] .*/
-	Upnp_EventType EventType,
-	/*! [in] .*/
-	const void *Event,
-	/*! [in] .*/
-	void *Cookie);
-
-#endif /* CALLBACK_H */

upnp/inc/Discovery.h

@@ -1,35 +0,0 @@
-
-#ifndef DISCOVERY_H
-#define DISCOVERY_H
-
-/*!
- * \file
- *
- * \brief UpnpDiscovery object declararion.
- *
- * Returned in a \b UPNP_DISCOVERY_RESULT callback.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#include "UpnpInet.h" /* for struct sockaddr_storage */
-
-#define CLASS UpnpDiscovery
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ErrCode, int) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, Expires, int) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, DeviceID) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, DeviceType) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ServiceType) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ServiceVer) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, Location) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, Os) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, Date) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, Ext) \
-	EXPAND_CLASS_MEMBER_BUFFER(CLASS, DestAddr, struct sockaddr_storage) \
-
-#include "TemplateInclude.h"
-
-#endif /* DISCOVERY_H */
-

upnp/inc/Event.h

@@ -1,27 +0,0 @@
-
-#ifndef EVENT_H
-#define EVENT_H
-
-
-/*!
- * \file
- *
- * \brief UpnpEvent object declararion.
- *
- * Returned along with a \b UPNP_EVENT_RECEIVED callback.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#define CLASS UpnpEvent
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, EventKey, int) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ChangedVariables, IXML_Document *) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, SID) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* EVENT_H */
-

upnp/inc/EventSubscribe.h

@@ -1,29 +0,0 @@
-
-#ifndef EVENTSUBSCRIBE_H
-#define EVENTSUBSCRIBE_H
-
-
-/*!
- * \file
- *
- * \brief UpnpEventSubscribe object declararion.
- *
- * Returned along with a \b UPNP_EVENT_SUBSCRIBE_COMPLETE or
- * \b UPNP_EVENT_UNSUBSCRIBE_COMPLETE callback.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#define CLASS UpnpEventSubscribe
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ErrCode, int) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, TimeOut, int) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, SID) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, PublisherUrl) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* EVENTSUBSCRIBE_H */
-

upnp/inc/FileInfo.h

@@ -1,35 +0,0 @@
-
-#ifndef FILEINFO_H
-#define FILEINFO_H
-
-
-/*!
- * \file
- *
- * \brief UpnpFileInfo object declararion.
- *
- * Detailed description of this class should go here
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#include "upnpconfig.h"
-
-#include <sys/types.h>  /* for off_t */
-#include <time.h>       /* for time_t */
-
-#define CLASS UpnpFileInfo
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, FileLength, off_t) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, LastModified, time_t) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, IsDirectory, int) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, IsReadable, int) \
-	EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, ContentType) \
-	EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, ExtraHeaders) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* FILEINFO_H */
-

upnp/inc/StateVarComplete.h

@@ -1,29 +0,0 @@
-
-#ifndef STATEVARCOMPLETE_H
-#define STATEVARCOMPLETE_H
-
-
-/*!
- * \file
- *
- * \brief UpnpStateVarComplete object declararion.
- *
- * Represents the reply for the current value of a state variable in an
- * asynchronous call.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#define CLASS UpnpStateVarComplete
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ErrCode, int) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, CtrlUrl) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, StateVarName) \
-	EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, CurrentVal) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* STATEVARCOMPLETE_H */
-

upnp/inc/StateVarRequest.h

@@ -1,35 +0,0 @@
-
-#ifndef STATEVARREQUEST_H
-#define STATEVARREQUEST_H
-
-
-/*!
- * \file
- *
- * \brief UpnpStateVarRequest object declararion.
- *
- * Represents the request for current value of a state variable in a service
- * state table.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#include "UpnpInet.h" /* for struct sockaddr_storage */
-
-#define CLASS UpnpStateVarRequest
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, ErrCode, int) \
-	EXPAND_CLASS_MEMBER_INT(CLASS, Socket, int) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ErrStr) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, DevUDN) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ServiceID) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, StateVarName) \
-	EXPAND_CLASS_MEMBER_BUFFER(CLASS, CtrlPtIPAddr, struct sockaddr_storage) \
-	EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, CurrentVal) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* STATEVARREQUEST_H */
-

upnp/inc/SubscriptionRequest.h

@@ -1,28 +0,0 @@
-
-
-#ifndef SUBSCRIPTIONREQUEST_H
-#define SUBSCRIPTIONREQUEST_H
-
-
-/*!
- * \file
- *
- * \brief UpnpSubscriptionRequest object declararion.
- *
- * Returned along with a \b UPNP_EVENT_SUBSCRIPTION_REQUEST callback.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-#define CLASS UpnpSubscriptionRequest
-
-#define EXPAND_CLASS_MEMBERS(CLASS) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, ServiceId) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, UDN) \
-	EXPAND_CLASS_MEMBER_STRING(CLASS, SID) \
-
-#include "TemplateInclude.h"
-
-
-#endif /* SUBSCRIPTIONREQUEST_H */
-

upnp/inc/TemplateInclude.h

@@ -1,165 +0,0 @@
-/*
- * C Template objects.
- *
- * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
- */
-
-#ifndef TEMPLATEINCLUDE_H
-#define TEMPLATEINCLUDE_H
-
-
-/*!
- * \file
- *
- * \brief Templates for include files of objects.
- *
- * Usage:
- *
- * - In the include file Token.h:
- *	#include "Token_def.h"
- *	#include "TemplateInclude.h"
- *
- * - In the source file Token.c:
- *	#include "Token.h"
- *	#include "TemplateSource.h"
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_COMMON(CLASS) \
-	TEMPLATE_PROTOTYPE_COMMON_AUX(CLASS)
-#define TEMPLATE_PROTOTYPE_COMMON_AUX(CLASS) \
-	/*!
-	 * DOC_##CLASS
-	 */ \
-	typedef struct s_##CLASS CLASS; \
-	\
-	/*! Constructor */ \
-	EXPORT_SPEC CLASS *CLASS##_new(); \
-	\
-	/*! Destructor */ \
-	EXPORT_SPEC void CLASS##_delete(CLASS *p); \
-	\
-	/*! Copy Constructor */ \
-	EXPORT_SPEC CLASS *CLASS##_dup(const CLASS *p); \
-	\
-	/*! Assignment operator */ \
-	EXPORT_SPEC int CLASS##_assign(CLASS *p, const CLASS *q); \
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_INT(CLASS, MEMBER, TYPE) \
-	TEMPLATE_PROTOTYPE_INT_AUX(CLASS, MEMBER, TYPE)
-#define TEMPLATE_PROTOTYPE_INT_AUX(CLASS, MEMBER, TYPE) \
-	/*! DOC_##CLASS##_##MEMBER */ \
-	EXPORT_SPEC TYPE CLASS##_get_##MEMBER(const CLASS *p); \
-	EXPORT_SPEC int CLASS##_set_##MEMBER(CLASS *p, TYPE n); \
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_BUFFER(CLASS, MEMBER, TYPE) \
-	TEMPLATE_PROTOTYPE_BUFFER_AUX(CLASS, MEMBER, TYPE)
-#define TEMPLATE_PROTOTYPE_BUFFER_AUX(CLASS, MEMBER, TYPE) \
-	/*! DOC_##CLASS_##MEMBER */ \
-	EXPORT_SPEC const TYPE *CLASS##_get_##MEMBER(const CLASS *p); \
-	EXPORT_SPEC int CLASS##_set_##MEMBER(CLASS *p, const TYPE *buf); \
-	EXPORT_SPEC void CLASS##_clear_##MEMBER(CLASS *p); \
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_LIST(CLASS, MEMBER) \
-	TEMPLATE_PROTOTYPE_LIST_AUX(CLASS, MEMBER)
-#define TEMPLATE_PROTOTYPE_LIST_AUX(CLASS, MEMBER) \
-	/*! DOC_##CLASS_##MEMBER */ \
-	EXPORT_SPEC const struct list_head *CLASS##_get_##MEMBER(const CLASS *p); \
-	EXPORT_SPEC void CLASS##_add_to_list_##MEMBER(CLASS *p, struct list_head *head); \
-	EXPORT_SPEC void CLASS##_remove_from_list_##MEMBER(CLASS *p); \
-	EXPORT_SPEC void CLASS##_replace_in_list_##MEMBER(CLASS *p, struct list_head *new); \
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_OBJECT(CLASS, MEMBER, TYPE) \
-	TEMPLATE_PROTOTYPE_OBJECT_AUX(CLASS, MEMBER, TYPE)
-#define TEMPLATE_PROTOTYPE_OBJECT_AUX(CLASS, MEMBER, TYPE) \
-	/*! DOC_##CLASS##_##MEMBER */ \
-	EXPORT_SPEC const TYPE *CLASS##_get_##MEMBER(const CLASS *p); \
-	EXPORT_SPEC int CLASS##_set_##MEMBER(CLASS *p, const TYPE *n); \
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_STRING(CLASS, MEMBER) \
-	TEMPLATE_PROTOTYPE_STRING_AUX(CLASS, MEMBER)
-#define TEMPLATE_PROTOTYPE_STRING_AUX(CLASS, MEMBER) \
-	/*! DOC_##CLASS##_##MEMBER */ \
-	EXPORT_SPEC const UpnpString *CLASS##_get_##MEMBER(const CLASS *p); \
-	EXPORT_SPEC int CLASS##_set_##MEMBER(CLASS *p, const UpnpString *s); \
-	EXPORT_SPEC size_t CLASS##_get_##MEMBER##_Length(const CLASS *p); \
-	EXPORT_SPEC const char *CLASS##_get_##MEMBER##_cstr(const CLASS *p); \
-	EXPORT_SPEC int CLASS##_strcpy_##MEMBER(CLASS *p, const char *s); \
-	EXPORT_SPEC int CLASS##_strncpy_##MEMBER(CLASS *p, const char *s, size_t n); \
-	EXPORT_SPEC void CLASS##_clear_##MEMBER(CLASS *p); \
-
-
-/******************************************************************************/
-#define TEMPLATE_PROTOTYPE_DOMSTRING(CLASS, MEMBER) \
-	TEMPLATE_PROTOTYPE_DOMSTRING_AUX(CLASS, MEMBER)
-#define TEMPLATE_PROTOTYPE_DOMSTRING_AUX(CLASS, MEMBER) \
-	/*! DOC_##CLASS_##MEMBER */ \
-	EXPORT_SPEC const DOMString CLASS##_get_##MEMBER(const CLASS *p); \
-	EXPORT_SPEC int CLASS##_set_##MEMBER(CLASS *p, const DOMString s); \
-	EXPORT_SPEC const char *CLASS##_get_##MEMBER##_cstr(const CLASS *p); \
-
-
-#endif /* TEMPLATEINCLUDE_H */
-
-
-/******************************************************************************
- *
- * Actual source starts here.
- *
- ******************************************************************************/
-
-
-#include <stdlib.h> /* for size_t */
-
-
-#include "ixml.h"       /* for DOMString, IXML_Document */
-#include "list.h"	/* for struct list_head */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-TEMPLATE_PROTOTYPE_COMMON(CLASS)
-
-#define EXPAND_CLASS_MEMBER_INT(CLASS, MEMBER, TYPE)	TEMPLATE_PROTOTYPE_INT(CLASS, MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_BUFFER(CLASS, MEMBER, TYPE)	TEMPLATE_PROTOTYPE_BUFFER(CLASS, MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_LIST(CLASS, MEMBER)		TEMPLATE_PROTOTYPE_LIST(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_OBJECT(CLASS, MEMBER, TYPE)	TEMPLATE_PROTOTYPE_OBJECT(CLASS, MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_STRING(CLASS, MEMBER)	TEMPLATE_PROTOTYPE_STRING(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, MEMBER)	TEMPLATE_PROTOTYPE_DOMSTRING(CLASS, MEMBER)
-
-EXPAND_CLASS_MEMBERS(CLASS)
-
-#include "TemplateUndef.h"
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#ifdef TEMPLATE_GENERATE_SOURCE
-	#include "TemplateSource.h"
-#endif /* TEMPLATE_GENERATE_SOURCE */
-
-/* Cleanup the template mess. */
-#undef PREFIX
-#undef CLASS
-#undef EXPAND_CLASS_MEMBERS
-

upnp/inc/TemplateSource.h

@@ -1,340 +0,0 @@
-/*
- * C Template objects.
- *
- * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
- */
-
-#ifndef TEMPLATESOURCE_H
-#define TEMPLATESOURCE_H
-
-/*!
- * \file
- *
- * \brief Templates for source files of objects.
- *
- * Usage:
- *
- * - In the include file Token.h:
- *	#include "Token_def.h"
- *	#include "TemplateInclude.h"
- *
- * - In the source file Token.c:
- *	#include "Token.h"
- *	#include "TemplateSource.h"
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/******************************************************************************/
-#define TEMPLATE_DEFINITION_INT(MEMBER, TYPE)		TYPE m_##MEMBER;
-#define TEMPLATE_DEFINITION_BUFFER(MEMBER, TYPE)	TYPE m_##MEMBER;
-#define TEMPLATE_DEFINITION_LIST(MEMBER)		struct list_head m_##MEMBER;
-#define TEMPLATE_DEFINITION_OBJECT(MEMBER, TYPE)	TYPE *m_##MEMBER;
-#define TEMPLATE_DEFINITION_STRING(MEMBER)		UpnpString *m_##MEMBER;
-#define TEMPLATE_DEFINITION_DOMSTRING(MEMBER)		DOMString m_##MEMBER;
-
-/******************************************************************************/
-#define TEMPLATE_CONSTRUCTOR_INT(MEMBER, TYPE)		/* p->m_##MEMBER = 0; */
-#define TEMPLATE_CONSTRUCTOR_BUFFER(MEMBER, TYPE)	\
-	/* memset(&p->m_##MEMBER, 0, sizeof (TYPE)); */
-#define TEMPLATE_CONSTRUCTOR_LIST(MEMBER, TYPE)		INIT_LIST_HEAD(&p->m_##MEMBER);
-#define TEMPLATE_CONSTRUCTOR_OBJECT(MEMBER, TYPE)	p->m_##MEMBER = TYPE##_new();
-#define TEMPLATE_CONSTRUCTOR_STRING(MEMBER)		p->m_##MEMBER = UpnpString_new();
-#define TEMPLATE_CONSTRUCTOR_DOMSTRING(MEMBER)		 p->m_##MEMBER = NULL;
-
-/******************************************************************************/
-#define TEMPLATE_DESTRUCTOR_INT(MEMBER, TYPE)		p->m_##MEMBER = 0;
-#define TEMPLATE_DESTRUCTOR_BUFFER(MEMBER, TYPE)	memset(&p->m_##MEMBER, 0, sizeof (TYPE));
-#define TEMPLATE_DESTRUCTOR_LIST(MEMBER)		list_del(&p->m_##MEMBER);
-#define TEMPLATE_DESTRUCTOR_OBJECT(MEMBER, TYPE)	TYPE##_delete(p->m_##MEMBER); p->m_##MEMBER = NULL;
-#define TEMPLATE_DESTRUCTOR_STRING(MEMBER)		UpnpString_delete(p->m_##MEMBER); p->m_##MEMBER = NULL;
-#define TEMPLATE_DESTRUCTOR_DOMSTRING(MEMBER)		ixmlFreeDOMString(p->m_##MEMBER); p->m_##MEMBER = NULL;
-
-/******************************************************************************/
-#define TEMPLATE_ASSIGNMENT(CLASS, MEMBER)	ok = ok && CLASS##_set_##MEMBER(p, CLASS##_get_##MEMBER(q));
-
-
-/******************************************************************************/
-#define TEMPLATE_METHODS_INT(CLASS, MEMBER, TYPE) \
-	TEMPLATE_METHODS_INT_AUX(CLASS, MEMBER, TYPE)
-#define TEMPLATE_METHODS_INT_AUX(CLASS, MEMBER, TYPE) \
-TYPE CLASS##_get_##MEMBER(const CLASS *p) \
-{ \
-	return ((struct S##CLASS *)p)->m_##MEMBER; \
-} \
-\
-int CLASS##_set_##MEMBER(CLASS *p, TYPE n) \
-{ \
-	((struct S##CLASS *)p)->m_##MEMBER = n; \
-	return 1; \
-} \
-
-
-/******************************************************************************/
-#define TEMPLATE_METHODS_BUFFER(CLASS, MEMBER, TYPE) \
-	TEMPLATE_METHODS_BUFFER_AUX(CLASS, MEMBER, TYPE)
-#define TEMPLATE_METHODS_BUFFER_AUX(CLASS, MEMBER, TYPE) \
-const TYPE *CLASS##_get_##MEMBER(const CLASS *p) \
-{ \
-	return (TYPE *)&((struct S##CLASS *)p)->m_##MEMBER; \
-} \
-\
-int CLASS##_set_##MEMBER(CLASS *p, const TYPE *buf) \
-{ \
-	((struct S##CLASS *)p)->m_##MEMBER = *(TYPE *)buf; \
-	return 1; \
-} \
-\
-void CLASS##_clear_##MEMBER(CLASS *p) \
-{ \
-	memset(&((struct S##CLASS *)p)->m_##MEMBER, 0, sizeof(TYPE)); \
-} \
-
-
-/******************************************************************************/
-#define TEMPLATE_METHODS_LIST(CLASS, MEMBER) \
-	TEMPLATE_METHODS_LIST_AUX(CLASS, MEMBER)
-#define TEMPLATE_METHODS_LIST_AUX(CLASS, MEMBER) \
-const struct list_head *CLASS##_get_##MEMBER(const CLASS *p) \
-{ \
-	return (struct list_head *)&((struct S##CLASS *)p)->m_##MEMBER; \
-} \
-\
-void CLASS##_add_to_list_##MEMBER(CLASS *p, struct list_head *head) \
-{ \
-	list_add(&((struct S##CLASS *)p)->m_##MEMBER, head); \
-} \
-\
-void CLASS##_remove_from_list_##MEMBER(CLASS *p) \
-{ \
-	list_del_init(&((struct S##CLASS *)p)->m_##MEMBER); \
-} \
-\
-void CLASS##_replace_in_list_##MEMBER(CLASS *p, struct list_head *new) \
-{ \
-	list_replace_init(&((struct S##CLASS *)p)->m_##MEMBER, new); \
-} \
-
-
-/******************************************************************************/
-#define TEMPLATE_METHODS_OBJECT(CLASS, MEMBER, TYPE) \
-	TEMPLATE_METHODS_OBJECT_AUX(CLASS, MEMBER, TYPE)
-#define TEMPLATE_METHODS_OBJECT_AUX(CLASS, MEMBER, TYPE) \
-const TYPE *CLASS##_get_##MEMBER(const CLASS *p) \
-{ \
-	return ((struct S##CLASS *)p)->m_##MEMBER; \
-} \
-\
-int CLASS##_set_##MEMBER(CLASS *p, const TYPE *s) \
-{ \
-	TYPE *q = TYPE##_dup(s); \
-	if (!q) return 0; \
-	TYPE##_delete(((struct S##CLASS *)p)->m_##MEMBER); \
-	((struct S##CLASS *)p)->m_##MEMBER = q; \
-	return 1; \
-} \
-
-
-/******************************************************************************/
-#define TEMPLATE_METHODS_STRING(CLASS, MEMBER) \
-	TEMPLATE_METHODS_STRING_AUX(CLASS, MEMBER)
-#define TEMPLATE_METHODS_STRING_AUX(CLASS, MEMBER) \
-const UpnpString *CLASS##_get_##MEMBER(const CLASS *p) \
-{ \
-	return ((struct S##CLASS *)p)->m_##MEMBER; \
-} \
-\
-int CLASS##_set_##MEMBER(CLASS *p, const UpnpString *s) \
-{ \
-	const char *q = UpnpString_get_String(s); \
-	return UpnpString_set_String(((struct S##CLASS *)p)->m_##MEMBER, q); \
-} \
-\
-size_t CLASS##_get_##MEMBER##_Length(const CLASS *p) \
-{ \
-	return UpnpString_get_Length(CLASS##_get_##MEMBER(p)); \
-} \
-const char *CLASS##_get_##MEMBER##_cstr(const CLASS *p) \
-{ \
-	return UpnpString_get_String(CLASS##_get_##MEMBER(p)); \
-} \
-\
-int CLASS##_strcpy_##MEMBER(CLASS *p, const char *s) \
-{ \
-	return UpnpString_set_String(((struct S##CLASS *)p)->m_##MEMBER, s); \
-} \
-\
-int CLASS##_strncpy_##MEMBER(CLASS *p, const char *s, size_t n) \
-{ \
-	return UpnpString_set_StringN(((struct S##CLASS *)p)->m_##MEMBER, s, n); \
-} \
-\
-void CLASS##_clear_##MEMBER(CLASS *p) \
-{ \
-	UpnpString_clear(((struct S##CLASS *)p)->m_##MEMBER); \
-} \
-
-
-/******************************************************************************/
-#define TEMPLATE_METHODS_DOMSTRING(CLASS, MEMBER) \
-	TEMPLATE_METHODS_DOMSTRING_AUX(CLASS, MEMBER)
-#define TEMPLATE_METHODS_DOMSTRING_AUX(CLASS, MEMBER) \
-const DOMString CLASS##_get_##MEMBER(const CLASS *p) \
-{ \
-	return ((struct S##CLASS *)p)->m_##MEMBER; \
-} \
-\
-int CLASS##_set_##MEMBER(CLASS *p, const DOMString s) \
-{ \
-	DOMString q = ixmlCloneDOMString(s); \
-	if (!q) return 0; \
-	ixmlFreeDOMString(((struct S##CLASS *)p)->m_##MEMBER); \
-	((struct S##CLASS *)p)->m_##MEMBER = q; \
-	return 1; \
-} \
-\
-const char *CLASS##_get_##MEMBER##_cstr(const CLASS *p) \
-{ \
-	return (const char *)CLASS##_get_##MEMBER(p); \
-} \
-
-
-/******************************************************************************
- *
- * Actual source starts here.
- *
- ******************************************************************************/
-
-#include "config.h"
-
-#include <stdlib.h> /* for calloc(), free() */	
-#include <string.h> /* for strlen(), strdup() */
-
-/******************************************************************************/
-#define EXPAND_CLASS_MEMBER_INT(CLASS, MEMBER, TYPE)	TEMPLATE_DEFINITION_INT(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_BUFFER(CLASS, MEMBER, TYPE)	TEMPLATE_DEFINITION_BUFFER(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_LIST(CLASS, MEMBER)		TEMPLATE_DEFINITION_LIST(MEMBER)
-#define EXPAND_CLASS_MEMBER_OBJECT(CLASS, MEMBER, TYPE)	TEMPLATE_DEFINITION_OBJECT(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_STRING(CLASS, MEMBER)	TEMPLATE_DEFINITION_STRING(MEMBER)
-#define EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, MEMBER)	TEMPLATE_DEFINITION_DOMSTRING(MEMBER)
-
-#define TEMPLATE_DECLARATION_STRUCT(CLASS) \
-	TEMPLATE_DECLARATION_STRUCT_AUX(CLASS)
-#define TEMPLATE_DECLARATION_STRUCT_AUX(CLASS) \
-struct S##CLASS { \
-	EXPAND_CLASS_MEMBERS(CLASS) \
-};
-
-TEMPLATE_DECLARATION_STRUCT(CLASS)
-
-#include "TemplateUndef.h"
-
-/******************************************************************************/
-#define EXPAND_CLASS_MEMBER_INT(CLASS, MEMBER, TYPE)	TEMPLATE_CONSTRUCTOR_INT(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_BUFFER(CLASS, MEMBER, TYPE)	TEMPLATE_CONSTRUCTOR_BUFFER(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_LIST(CLASS, MEMBER)		TEMPLATE_CONSTRUCTOR_LIST(MEMBER, MEMBER)
-#define EXPAND_CLASS_MEMBER_OBJECT(CLASS, MEMBER, TYPE)	TEMPLATE_CONSTRUCTOR_OBJECT(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_STRING(CLASS, MEMBER)	TEMPLATE_CONSTRUCTOR_STRING(MEMBER)
-#define EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, MEMBER)	TEMPLATE_CONSTRUCTOR_DOMSTRING(MEMBER)
-
-#define TEMPLATE_DEFINITION_CONSTRUCTOR(CLASS) \
-	TEMPLATE_DEFINITION_CONSTRUCTOR_AUX(CLASS)
-#define TEMPLATE_DEFINITION_CONSTRUCTOR_AUX(CLASS) \
-CLASS *CLASS##_new() \
-{ \
-	struct S##CLASS *p = calloc(1, sizeof (struct S##CLASS)); \
-\
-	if (!p) return NULL; \
-\
-	EXPAND_CLASS_MEMBERS(CLASS) \
-\
-	return (CLASS *)p; \
-}
-
-TEMPLATE_DEFINITION_CONSTRUCTOR(CLASS)
-
-#include "TemplateUndef.h"
-
-/******************************************************************************/
-#define EXPAND_CLASS_MEMBER_INT(CLASS, MEMBER, TYPE)	TEMPLATE_DESTRUCTOR_INT(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_BUFFER(CLASS, MEMBER, TYPE)	TEMPLATE_DESTRUCTOR_BUFFER(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_LIST(CLASS, MEMBER)		TEMPLATE_DESTRUCTOR_LIST(MEMBER)
-#define EXPAND_CLASS_MEMBER_OBJECT(CLASS, MEMBER, TYPE)	TEMPLATE_DESTRUCTOR_OBJECT(MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_STRING(CLASS, MEMBER)	TEMPLATE_DESTRUCTOR_STRING(MEMBER)
-#define EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, MEMBER)	TEMPLATE_DESTRUCTOR_DOMSTRING(MEMBER)
-
-#define TEMPLATE_DEFINITION_DESTRUCTOR(CLASS) \
-	TEMPLATE_DEFINITION_DESTRUCTOR_AUX(CLASS)
-#define TEMPLATE_DEFINITION_DESTRUCTOR_AUX(CLASS) \
-void CLASS##_delete(CLASS *q) \
-{ \
-	struct S##CLASS *p = (struct S##CLASS *)q; \
-\
-	if (!p) return; \
-\
-	EXPAND_CLASS_MEMBERS(CLASS) \
-\
-	free(p); \
-}
-
-TEMPLATE_DEFINITION_DESTRUCTOR(CLASS)
-
-#include "TemplateUndef.h"
-
-/******************************************************************************/
-#define TEMPLATE_DEFINITION_COPY_CONSTRUCTOR(CLASS) \
-	TEMPLATE_DEFINITION_COPY_CONSTRUCTOR_AUX(CLASS)
-#define TEMPLATE_DEFINITION_COPY_CONSTRUCTOR_AUX(CLASS) \
-CLASS *CLASS##_dup(const CLASS *q) \
-{ \
-	CLASS *p = CLASS##_new(); \
-\
-	if (!p) return NULL; \
-\
-	CLASS##_assign(p, q); \
-\
-	return p; \
-}
-
-TEMPLATE_DEFINITION_COPY_CONSTRUCTOR(CLASS)
-
-/******************************************************************************/
-#define EXPAND_CLASS_MEMBER_INT(CLASS, MEMBER, TYPE)	TEMPLATE_ASSIGNMENT(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_BUFFER(CLASS, MEMBER, TYPE)	TEMPLATE_ASSIGNMENT(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_LIST(CLASS, MEMBER)		/* Do not assing. */
-#define EXPAND_CLASS_MEMBER_OBJECT(CLASS, MEMBER, TYPE)	TEMPLATE_ASSIGNMENT(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_STRING(CLASS, MEMBER)	TEMPLATE_ASSIGNMENT(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, MEMBER)	TEMPLATE_ASSIGNMENT(CLASS, MEMBER)
-
-#define TEMPLATE_DEFINITION_ASSIGNMENT(CLASS) \
-	TEMPLATE_DEFINITION_ASSIGNMENT_AUX(CLASS)
-#define TEMPLATE_DEFINITION_ASSIGNMENT_AUX(CLASS) \
-int CLASS##_assign(CLASS *p, const CLASS *q) \
-{ \
-	int ok = 1; \
-	if (p != q) { \
-		EXPAND_CLASS_MEMBERS(CLASS) \
-	} \
-	return ok; \
-}
-
-TEMPLATE_DEFINITION_ASSIGNMENT(CLASS)
-
-#include "TemplateUndef.h"
-
-/******************************************************************************/
-#define EXPAND_CLASS_MEMBER_INT(CLASS, MEMBER, TYPE)	TEMPLATE_METHODS_INT(CLASS, MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_BUFFER(CLASS, MEMBER, TYPE)	TEMPLATE_METHODS_BUFFER(CLASS, MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_LIST(CLASS, MEMBER)		TEMPLATE_METHODS_LIST(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_OBJECT(CLASS, MEMBER, TYPE)	TEMPLATE_METHODS_OBJECT(CLASS, MEMBER, TYPE)
-#define EXPAND_CLASS_MEMBER_STRING(CLASS, MEMBER)	TEMPLATE_METHODS_STRING(CLASS, MEMBER)
-#define EXPAND_CLASS_MEMBER_DOMSTRING(CLASS, MEMBER)	TEMPLATE_METHODS_DOMSTRING(CLASS, MEMBER)
-
-EXPAND_CLASS_MEMBERS(CLASS)
-
-#include "TemplateUndef.h"
-
-
-#endif /* TEMPLATESOURCE_H */
-

upnp/inc/TemplateUndef.h

@@ -1,17 +0,0 @@
-/*
- * C Template objects.
- *
- * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
- */
-
-/*!
- * \file
- */
-
-#undef EXPAND_CLASS_MEMBER_INT
-#undef EXPAND_CLASS_MEMBER_BUFFER
-#undef EXPAND_CLASS_MEMBER_LIST
-#undef EXPAND_CLASS_MEMBER_OBJECT
-#undef EXPAND_CLASS_MEMBER_STRING
-#undef EXPAND_CLASS_MEMBER_DOMSTRING
-

upnp/inc/UpnpGlobal.h

@@ -1,122 +0,0 @@
-#ifndef UPNPGLOBAL_H
-#define UPNPGLOBAL_H
-
-/*!
- * \file
- *
- * \brief Defines constants that for some reason are not defined on some systems.
- */
-
-#if defined MYLIB_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 != 64
-	#if defined __GNUC__
-		#warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
-	#else
-		#error  libupnp requires largefile mode - use AC_SYS_LARGEFILE
-	#endif
-#endif
-
-#ifdef WIN32
-	/*
-	 * EXPORT_SPEC
-	 */
-	#ifdef UPNP_STATIC_LIB
-		#define EXPORT_SPEC
-	#else /* UPNP_STATIC_LIB */
-		#ifdef LIBUPNP_EXPORTS
-			/*! set up declspec for dll export to make functions
-			 * visible to library users */
-			#define EXPORT_SPEC __declspec(dllexport)
-		#else /* LIBUPNP_EXPORTS */
-			#define EXPORT_SPEC __declspec(dllimport)
-		#endif /* LIBUPNP_EXPORTS */
-	#endif /* UPNP_STATIC_LIB */
-
-	/*
-	 * UPNP_INLINE
-	 * PRId64
-	 * PRIzd
-	 * PRIzu
-	 * PRIzx
-	 */
-	#ifdef UPNP_USE_MSVCPP
-		/* define some things the M$ VC++ doesn't know */
-		#define UPNP_INLINE _inline
-		typedef __int64 int64_t;
-		#define PRId64 "I64d"
-		#define PRIzd "ld"
-		#define PRIzu "lu"
-		#define PRIzx "lx"
-	#endif /* UPNP_USE_MSVCPP */
-
-	#ifdef UPNP_USE_BCBPP
-		/* define some things Borland Builder doesn't know */
-		#define UPNP_INLINE inline
-		typedef __int64 int64_t;
-		#warning The Borland C compiler is probably broken on PRId64,
-		#warning please someone provide a proper fix here
-		#define PRId64 "I64d"
-		#define PRIzd "zd"
-		#define PRIzu "zu"
-		#define PRIzx "zx"
-	#endif /* UPNP_USE_BCBPP */
-
-	#ifdef __GNUC__
-		#define UPNP_INLINE inline
-		/* Note with PRIzu that in the case of Mingw32, it's the MS C
-		 * runtime printf which ends up getting called, not the glibc
-		 * printf, so it genuinely doesn't have "zu"
-		 */
-		#define PRIzd "ld"
-		#define PRIzu "lu"
-		#define PRIzx "lx"
-	#endif /* __GNUC__ */
-#else
-	/*! 
-	 * \brief Export functions on WIN32 DLLs.
-	 *
-	 * Every funtion that belongs to the library API must use this
-	 * definition upon declaration or it will not be exported on WIN32
-	 * DLLs.
-	 */
-	#define EXPORT_SPEC
-
-	/*!
-	 * \brief Declares an inline function.
-	 *
-	 * Surprisingly, there are some compilers that do not understand the
-	 * inline keyword. This definition makes the use of this keyword
-	 * portable to these systems.
-	 */
-	#ifdef __STRICT_ANSI__
-		#define UPNP_INLINE __inline__
-	#else
-		#define UPNP_INLINE inline
-	#endif
-
-	/*!
-	 * \brief Supply the PRId64 printf() macro.
-	 *
-	 * MSVC still does not know about this.
-	 */
-	/* #define PRId64 PRId64 */
-
-	/*!
-	 * \brief Supply the PRIz* printf() macros.
-	 *
-	 * These macros were invented so that we can live a little longer with
-	 * MSVC lack of C99. "z" is the correct printf() size specifier for
-	 * the size_t type.
-	 */
-	#define PRIzd "zd"
-	#define PRIzu "zu"
-	#define PRIzx "zx"
-#endif
-
-/*
- * Defining this macro here gives some interesting information about unused
- * functions in the code. Of course, this should never go uncommented on a
- * release.
- */
-/*#define inline*/
-
-#endif /* UPNPGLOBAL_H */

upnp/inc/UpnpInet.h

@@ -1,67 +0,0 @@
-#ifndef UPNPINET_H
-#define UPNPINET_H
-
-/*!
- * \addtogroup Sock
- * 
- * @{
- * 
- * \file
- *
- * \brief Provides a platform independent way to include TCP/IP types and functions.
- */
-
-#include "UpnpUniStd.h" /* for close() */
-
-#ifdef WIN32
-	#include <stdarg.h>
-	#ifndef UPNP_USE_MSVCPP
-		/* Removed: not required (and cause compilation issues) */
-		#include <winbase.h>
-		#include <windef.h>
-	#endif
-	#include <winsock2.h>
-	#include <iphlpapi.h>
-	#include <ws2tcpip.h>
-
-	#define UpnpCloseSocket closesocket
-
-	#if(_WIN32_WINNT < 0x0600)
-		typedef short sa_family_t;
-	#else
-		typedef ADDRESS_FAMILY sa_family_t;
-	#endif
-
-#else /* WIN32 */
-	#include <sys/param.h>
-	#if defined(__sun)
-		#include <fcntl.h>
-		#include <sys/sockio.h>
-	#elif (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
-		#include <ifaddrs.h>
-		/* Do not move or remove the include below for "sys/socket"!
-		 * Will break FreeBSD builds. */
-		#include <sys/socket.h>
-	#endif
-	#include <arpa/inet.h>  /* for inet_pton() */
-	#include <net/if.h>
-	#include <netinet/in.h>
-
-	/*! This typedef makes the code slightly more WIN32 tolerant.
-	 * On WIN32 systems, SOCKET is unsigned and is not a file
-	 * descriptor. */
-	typedef int SOCKET;
-
-	/*! INVALID_SOCKET is unsigned on win32. */
-	#define INVALID_SOCKET (-1)
-
-	/*! select() returns SOCKET_ERROR on win32. */
-	#define SOCKET_ERROR (-1)
-
-	/*! Alias to close() to make code more WIN32 tolerant. */
-	#define UpnpCloseSocket close
-#endif /* WIN32 */
-
-/* @} Sock */
-
-#endif /* UPNPINET_H */

upnp/inc/UpnpIntTypes.h

@@ -1,11 +0,0 @@
-#ifndef UPNPINTTYPES_H
-#define UPNPINTTYPES_H
-
-#if !defined(UPNP_USE_BCBPP)
-
-/* Printf format for integers. */
-#include <inttypes.h>
-
-#endif /* !defined(UPNP_USE_BCBPP) */
-
-#endif /* UPNPINTTYPES_H */

upnp/inc/UpnpStdInt.h

@@ -1,20 +0,0 @@
-#ifndef UPNPSTDINT_H
-#define UPNPSTDINT_H
-
-#if !defined(UPNP_USE_BCBPP)
-
-/* Sized integer types. */
-#include <stdint.h>
-
-#ifdef UPNP_USE_MSVCPP
-	/* no ssize_t defined for VC */
-	#ifdef  _WIN64
-		typedef int64_t ssize_t;
-	#else
-		typedef int32_t ssize_t;
-	#endif
-#endif
-
-#endif /* !defined(UPNP_USE_BCBPP) */
-
-#endif /* UPNPSTDINT_H */

upnp/inc/UpnpString.h

@@ -1,171 +0,0 @@
-
-
-#ifndef STRING_H
-#define STRING_H
-
-
-/*!
- * \defgroup UpnpString The UpnpString Class
- *
- * \brief Implements string operations in the UPnP library.
- *
- * \author Marcelo Roberto Jimenez
- *
- * \version 1.0
- *
- * @{
- *
- * \file
- *
- * \brief UpnpString object declaration.
- */
-
-
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-
-
-#include <stdlib.h> /* for size_t */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*!
- * \brief Type of the string objects inside libupnp.
- */
-typedef struct s_UpnpString UpnpString;
-
-
-/*!
- * \brief Constructor.
- *
- * \return A pointer to a new allocated object.
- */
-EXPORT_SPEC UpnpString *UpnpString_new();
-
-
-/*!
- * \brief Destructor.
- */
-EXPORT_SPEC void UpnpString_delete(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p);
-
-
-/*!
- * \brief Copy Constructor.
- *
- * \return A pointer to a new allocated copy of the original object.
- */
-EXPORT_SPEC UpnpString *UpnpString_dup(
-	/*! [in] The \em \b this pointer. */
-	const UpnpString *p);
-
-
-/*!
- * \brief Assignment operator.
- */
-EXPORT_SPEC void UpnpString_assign(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] The \em \b that pointer. */
-	const UpnpString *q);
-
-
-/*!
- * \brief Returns the length of the string.
- *
- * \return The length of the string.
- * */
-EXPORT_SPEC size_t UpnpString_get_Length(
-	/*! [in] The \em \b this pointer. */
-	const UpnpString *p);
-
-
-/*!
- * \brief Truncates the string to the specified lenght, or does nothing
- * if the current lenght is less than or equal to the requested length.
- * */
-EXPORT_SPEC void UpnpString_set_Length(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] The requested length. */
-	size_t n);
-
-
-/*!
- * \brief Returns the pointer to char.
- *
- * \return The pointer to char.
- */
-EXPORT_SPEC const char *UpnpString_get_String(
-	/*! [in] The \em \b this pointer. */
-	const UpnpString *p);
-
-
-/*!
- * \brief Sets the string from a pointer to char.
- */
-EXPORT_SPEC int UpnpString_set_String(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] (char *) to copy from. */
-	const char *s);
-
-
-/*!
- * \brief Sets the string from a pointer to char using a maximum of N chars.
- */
-EXPORT_SPEC int UpnpString_set_StringN(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] (char *) to copy from. */
-	const char *s,
-	/*! Maximum number of chars to copy.*/
-	size_t n);
-
-
-/*!
- * \brief Clears the string, sets its size to zero.
- */
-EXPORT_SPEC void UpnpString_clear(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p);
-
-
-/*!
- * \brief Compares two strings for equality. Case matters.
- *
- * \return The result of strcmp().
- */
-EXPORT_SPEC int UpnpString_cmp(
-	/*! [in] The \em \b the first string. */
-	UpnpString *p,
-	/*! [in] The \em \b the second string. */
-	UpnpString *q);
-
-
-/*!
- * \brief Compares two strings for equality. Case does not matter.
- *
- * \return The result of strcasecmp().
- */
-EXPORT_SPEC int UpnpString_casecmp(
-	/*! [in] The \em \b the first string. */
-	UpnpString *p,
-	/*! [in] The \em \b the second string. */
-	UpnpString *q);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-/* @} UpnpString The UpnpString API */
-
-
-#endif /* STRING_H */
-

upnp/inc/UpnpUniStd.h

@@ -1,10 +0,0 @@
-#ifndef UPNPUNISTD_H
-#define UPNPUNISTD_H
-
-#ifdef WIN32
-	/* Do not #include <unistd.h> on WIN32. */
-#else /* WIN32 */
-	#include <unistd.h> /* for close() */
-#endif /* WIN32 */
-
-#endif /* UPNPUNISTD_H */

upnp/inc/list.h

@@ -1,720 +0,0 @@
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-#if 0
-#include <linux/stddef.h>
-#include <linux/poison.h>
-#include <linux/prefetch.h>
-#include <asm/system.h>
-#endif
-#include "poison.h"
-
-#ifdef __APPLE__
-/* Apple systems define these macros in system headers, so we undef
- * them prior to inclusion of this file */
-#undef LIST_HEAD
-#undef LIST_HEAD_INIT
-#undef INIT_LIST_HEAD
-#endif
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
-	struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-	struct list_head name = LIST_HEAD_INIT(name)
-
-static UPNP_INLINE void INIT_LIST_HEAD(struct list_head *list)
-{
-	list->next = list;
-	list->prev = list;
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-#ifndef CONFIG_DEBUG_LIST
-static UPNP_INLINE void __list_add(struct list_head *new_,
-			      struct list_head *prev,
-			      struct list_head *next)
-{
-	next->prev = new_;
-	new_->next = next;
-	new_->prev = prev;
-	prev->next = new_;
-}
-#else
-extern void __list_add(struct list_head *new_,
-			      struct list_head *prev,
-			      struct list_head *next);
-#endif
-
-/**
- * list_add - add a new entry
- * @new_: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static UPNP_INLINE void list_add(struct list_head *new_, struct list_head *head)
-{
-	__list_add(new_, head, head->next);
-}
-
-
-/**
- * list_add_tail - add a new entry
- * @new_: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static UPNP_INLINE void list_add_tail(struct list_head *new_, struct list_head *head)
-{
-	__list_add(new_, head->prev, head);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static UPNP_INLINE void __list_del(struct list_head * prev, struct list_head * next)
-{
-	next->prev = prev;
-	prev->next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty() on entry does not return true after this, the entry is
- * in an undefined state.
- */
-#ifndef CONFIG_DEBUG_LIST
-static UPNP_INLINE void list_del(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	entry->next = (struct list_head *)LIST_POISON1;
-	entry->prev = (struct list_head *)LIST_POISON2;
-}
-#else
-extern void list_del(struct list_head *entry);
-#endif
-
-/**
- * list_replace - replace old entry by new one
- * @old : the element to be replaced
- * @new_ : the new element to insert
- *
- * If @old was empty, it will be overwritten.
- */
-static UPNP_INLINE void list_replace(struct list_head *old,
-				struct list_head *new_)
-{
-	new_->next = old->next;
-	new_->next->prev = new_;
-	new_->prev = old->prev;
-	new_->prev->next = new_;
-}
-
-static UPNP_INLINE void list_replace_init(struct list_head *old,
-					struct list_head *new_)
-{
-	list_replace(old, new_);
-	INIT_LIST_HEAD(old);
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static UPNP_INLINE void list_del_init(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_move - delete from one list and add as another's head
- * @list: the entry to move
- * @head: the head that will precede our entry
- */
-static UPNP_INLINE void list_move(struct list_head *list, struct list_head *head)
-{
-	__list_del(list->prev, list->next);
-	list_add(list, head);
-}
-
-/**
- * list_move_tail - delete from one list and add as another's tail
- * @list: the entry to move
- * @head: the head that will follow our entry
- */
-static UPNP_INLINE void list_move_tail(struct list_head *list,
-				  struct list_head *head)
-{
-	__list_del(list->prev, list->next);
-	list_add_tail(list, head);
-}
-
-/**
- * list_is_last - tests whether @list is the last entry in list @head
- * @list: the entry to test
- * @head: the head of the list
- */
-static UPNP_INLINE int list_is_last(const struct list_head *list,
-				const struct list_head *head)
-{
-	return list->next == head;
-}
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static UPNP_INLINE int list_empty(const struct list_head *head)
-{
-	return head->next == head;
-}
-
-/**
- * list_empty_careful - tests whether a list is empty and not being modified
- * @head: the list to test
- *
- * Description:
- * tests whether a list is empty _and_ checks that no other CPU might be
- * in the process of modifying either member (next or prev)
- *
- * NOTE: using list_empty_careful() without synchronization
- * can only be safe if the only activity that can happen
- * to the list entry is list_del_init(). Eg. it cannot be used
- * if another CPU could re-list_add() it.
- */
-static UPNP_INLINE int list_empty_careful(const struct list_head *head)
-{
-	struct list_head *next = head->next;
-	return (next == head) && (next == head->prev);
-}
-
-/**
- * list_rotate_left - rotate the list to the left
- * @head: the head of the list
- */
-static UPNP_INLINE void list_rotate_left(struct list_head *head)
-{
-	struct list_head *first;
-
-	if (!list_empty(head)) {
-		first = head->next;
-		list_move_tail(first, head);
-	}
-}
-
-/**
- * list_is_singular - tests whether a list has just one entry.
- * @head: the list to test.
- */
-static UPNP_INLINE int list_is_singular(const struct list_head *head)
-{
-	return !list_empty(head) && (head->next == head->prev);
-}
-
-static UPNP_INLINE void __list_cut_position(struct list_head *list,
-		struct list_head *head, struct list_head *entry)
-{
-	struct list_head *new_first = entry->next;
-	list->next = head->next;
-	list->next->prev = list;
-	list->prev = entry;
-	entry->next = list;
-	head->next = new_first;
-	new_first->prev = head;
-}
-
-/**
- * list_cut_position - cut a list into two
- * @list: a new list to add all removed entries
- * @head: a list with entries
- * @entry: an entry within head, could be the head itself
- *	and if so we won't cut the list
- *
- * This helper moves the initial part of @head, up to and
- * including @entry, from @head to @list. You should
- * pass on @entry an element you know is on @head. @list
- * should be an empty list or a list you do not care about
- * losing its data.
- *
- */
-static UPNP_INLINE void list_cut_position(struct list_head *list,
-		struct list_head *head, struct list_head *entry)
-{
-	if (list_empty(head))
-		return;
-	if (list_is_singular(head) &&
-		(head->next != entry && head != entry))
-		return;
-	if (entry == head)
-		INIT_LIST_HEAD(list);
-	else
-		__list_cut_position(list, head, entry);
-}
-
-static UPNP_INLINE void __list_splice(const struct list_head *list,
-				 struct list_head *prev,
-				 struct list_head *next)
-{
-	struct list_head *first = list->next;
-	struct list_head *last = list->prev;
-
-	first->prev = prev;
-	prev->next = first;
-
-	last->next = next;
-	next->prev = last;
-}
-
-/**
- * list_splice - join two lists, this is designed for stacks
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static UPNP_INLINE void list_splice(const struct list_head *list,
-				struct list_head *head)
-{
-	if (!list_empty(list))
-		__list_splice(list, head, head->next);
-}
-
-/**
- * list_splice_tail - join two lists, each list being a queue
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static UPNP_INLINE void list_splice_tail(struct list_head *list,
-				struct list_head *head)
-{
-	if (!list_empty(list))
-		__list_splice(list, head->prev, head);
-}
-
-/**
- * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * The list at @list is reinitialised
- */
-static UPNP_INLINE void list_splice_init(struct list_head *list,
-				    struct list_head *head)
-{
-	if (!list_empty(list)) {
-		__list_splice(list, head, head->next);
-		INIT_LIST_HEAD(list);
-	}
-}
-
-/**
- * list_splice_tail_init - join two lists and reinitialise the emptied list
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * Each of the lists is a queue.
- * The list at @list is reinitialised
- */
-static UPNP_INLINE void list_splice_tail_init(struct list_head *list,
-					 struct list_head *head)
-{
-	if (!list_empty(list)) {
-		__list_splice(list, head->prev, head);
-		INIT_LIST_HEAD(list);
-	}
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:	the &struct list_head pointer.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
-
-/**
- * list_first_entry - get the first element from a list
- * @ptr:	the list head to take the element from.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- *
- * Note, that list is expected to be not empty.
- */
-#define list_first_entry(ptr, type, member) \
-	list_entry((ptr)->next, type, member)
-
-/**
- * list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop cursor.
- * @head:	the head for your list.
- */
-#define list_for_each(pos, head) \
-	for (pos = (head)->next; prefetch(pos->next), pos != (head); \
-        	pos = pos->next)
-
-/**
- * __list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop cursor.
- * @head:	the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code, no prefetching is done.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
- * list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct list_head to use as a loop cursor.
- * @head:	the head for your list.
- */
-#define list_for_each_prev(pos, head) \
-	for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \
-        	pos = pos->prev)
-
-/**
- * list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop cursor.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, n = pos->next)
-
-/**
- * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop cursor.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_prev_safe(pos, n, head) \
-	for (pos = (head)->prev, n = pos->prev; \
-	     prefetch(pos->prev), pos != (head); \
-	     pos = n, n = pos->prev)
-
-/**
- * list_for_each_entry	-	iterate over list of given type
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry(pos, head, member)				\
-	for (pos = list_entry((head)->next, typeof(*pos), member);	\
-	     prefetch(pos->member.next), &pos->member != (head); 	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_reverse - iterate backwards over list of given type.
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
-	     prefetch(pos->member.prev), &pos->member != (head); 	\
-	     pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
- * @pos:	the type * to use as a start point
- * @head:	the head of the list
- * @member:	the name of the list_struct within the struct.
- *
- * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
- */
-#define list_prepare_entry(pos, head, member) \
-	((pos) ? : list_entry(head, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue - continue iteration over list of given type
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Continue to iterate over list of given type, continuing after
- * the current position.
- */
-#define list_for_each_entry_continue(pos, head, member) 		\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
-	     prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue_reverse - iterate backwards from the given point
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Start to iterate over list of given type backwards, continuing after
- * the current position.
- */
-#define list_for_each_entry_continue_reverse(pos, head, member)		\
-	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
-	     prefetch(pos->member.prev), &pos->member != (head);	\
-	     pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_for_each_entry_from - iterate over list of given type from the current point
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate over list of given type, continuing from current position.
- */
-#define list_for_each_entry_from(pos, head, member) 			\
-	for (; prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		n = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_continue - continue list iteration safe against removal
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate over list of given type, continuing after current point,
- * safe against removal of list entry.
- */
-#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
-		n = list_entry(pos->member.next, typeof(*pos), member);		\
-	     &pos->member != (head);						\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_from - iterate over list from current point safe against removal
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate over list of given type from current point, safe against
- * removal of list entry.
- */
-#define list_for_each_entry_safe_from(pos, n, head, member) 			\
-	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
-	     &pos->member != (head);						\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_reverse - iterate backwards over list safe against removal
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate backwards over list of given type, safe against removal
- * of list entry.
- */
-#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
-	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
-		n = list_entry(pos->member.prev, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
-
-/*
- * Double linked lists with a single pointer list head.
- * Mostly useful for hash tables where the two pointer list head is
- * too wasteful.
- * You lose the ability to access the tail in O(1).
- */
-
-struct hlist_head {
-	struct hlist_node *first;
-};
-
-struct hlist_node {
-	struct hlist_node *next, **pprev;
-};
-
-#define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
-#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static UPNP_INLINE void INIT_HLIST_NODE(struct hlist_node *h)
-{
-	h->next = NULL;
-	h->pprev = NULL;
-}
-
-static UPNP_INLINE int hlist_unhashed(const struct hlist_node *h)
-{
-	return !h->pprev;
-}
-
-static UPNP_INLINE int hlist_empty(const struct hlist_head *h)
-{
-	return !h->first;
-}
-
-static UPNP_INLINE void __hlist_del(struct hlist_node *n)
-{
-	struct hlist_node *next = n->next;
-	struct hlist_node **pprev = n->pprev;
-	*pprev = next;
-	if (next)
-		next->pprev = pprev;
-}
-
-static UPNP_INLINE void hlist_del(struct hlist_node *n)
-{
-	__hlist_del(n);
-	n->next = (struct hlist_node *)LIST_POISON1;
-	n->pprev = (struct hlist_node **)LIST_POISON2;
-}
-
-static UPNP_INLINE void hlist_del_init(struct hlist_node *n)
-{
-	if (!hlist_unhashed(n)) {
-		__hlist_del(n);
-		INIT_HLIST_NODE(n);
-	}
-}
-
-static UPNP_INLINE void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
-{
-	struct hlist_node *first = h->first;
-	n->next = first;
-	if (first)
-		first->pprev = &n->next;
-	h->first = n;
-	n->pprev = &h->first;
-}
-
-/* next must be != NULL */
-static UPNP_INLINE void hlist_add_before(struct hlist_node *n,
-					struct hlist_node *next)
-{
-	n->pprev = next->pprev;
-	n->next = next;
-	next->pprev = &n->next;
-	*(n->pprev) = n;
-}
-
-static UPNP_INLINE void hlist_add_after(struct hlist_node *n,
-					struct hlist_node *next)
-{
-	next->next = n->next;
-	n->next = next;
-	next->pprev = &n->next;
-
-	if(next->next)
-		next->next->pprev  = &next->next;
-}
-
-/*
- * Move a list from one list head to another. Fixup the pprev
- * reference of the first entry if it exists.
- */
-static UPNP_INLINE void hlist_move_list(struct hlist_head *old,
-				   struct hlist_head *new_)
-{
-	new_->first = old->first;
-	if (new_->first)
-		new_->first->pprev = &new_->first;
-	old->first = NULL;
-}
-
-#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
-
-#define hlist_for_each(pos, head) \
-	for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
-	     pos = pos->next)
-
-#define hlist_for_each_safe(pos, n, head) \
-	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
-	     pos = n)
-
-/**
- * hlist_for_each_entry	- iterate over list of given type
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry(tpos, pos, head, member)			 \
-	for (pos = (head)->first;					 \
-	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_continue(tpos, pos, member)		 \
-	for (pos = (pos)->next;						 \
-	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_from - iterate over a hlist continuing from current point
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_from(tpos, pos, member)			 \
-	for (; pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @n:		another &struct hlist_node to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
-	for (pos = (head)->first;					 \
-	     pos && ({ n = pos->next; 1; }) && 				 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = n)
-
-#endif

upnp/inc/poison.h

@@ -1,89 +0,0 @@
-#ifndef _LINUX_POISON_H
-#define _LINUX_POISON_H
-
-/********** include/linux/list.h **********/
-
-/*
- * Architectures might want to move the poison pointer offset
- * into some well-recognized area such as 0xdead000000000000,
- * that is also not mappable by user-space exploits:
- */
-#ifdef CONFIG_ILLEGAL_POINTER_VALUE
-# define POISON_POINTER_DELTA _AC(CONFIG_ILLEGAL_POINTER_VALUE, UL)
-#else
-# define POISON_POINTER_DELTA 0
-#endif
-
-/*
- * These are non-NULL pointers that will result in page faults
- * under normal circumstances, used to verify that nobody uses
- * non-initialized list entries.
- */
-#define LIST_POISON1  ((void *) (0x00100100 + POISON_POINTER_DELTA))
-#define LIST_POISON2  ((void *) (0x00200200 + POISON_POINTER_DELTA))
-
-/********** include/linux/timer.h **********/
-/*
- * Magic number "tsta" to indicate a static timer initializer
- * for the object debugging code.
- */
-#define TIMER_ENTRY_STATIC	((void *) 0x74737461)
-
-/********** mm/debug-pagealloc.c **********/
-#define PAGE_POISON 0xaa
-
-/********** mm/slab.c **********/
-/*
- * Magic nums for obj red zoning.
- * Placed in the first word before and the first word after an obj.
- */
-#define	RED_INACTIVE	0x09F911029D74E35BULL	/* when obj is inactive */
-#define	RED_ACTIVE	0xD84156C5635688C0ULL	/* when obj is active */
-
-#define SLUB_RED_INACTIVE	0xbb
-#define SLUB_RED_ACTIVE		0xcc
-
-/* ...and for poisoning */
-#define	POISON_INUSE	0x5a	/* for use-uninitialised poisoning */
-#define POISON_FREE	0x6b	/* for use-after-free poisoning */
-#define	POISON_END	0xa5	/* end-byte of poisoning */
-
-/********** arch/$ARCH/mm/init.c **********/
-#define POISON_FREE_INITMEM	0xcc
-
-/********** arch/ia64/hp/common/sba_iommu.c **********/
-/*
- * arch/ia64/hp/common/sba_iommu.c uses a 16-byte poison string with a
- * value of "SBAIOMMU POISON\0" for spill-over poisoning.
- */
-
-/********** fs/jbd/journal.c **********/
-#define JBD_POISON_FREE		0x5b
-#define JBD2_POISON_FREE	0x5c
-
-/********** drivers/base/dmapool.c **********/
-#define	POOL_POISON_FREED	0xa7	/* !inuse */
-#define	POOL_POISON_ALLOCATED	0xa9	/* !initted */
-
-/********** drivers/atm/ **********/
-#define ATM_POISON_FREE		0x12
-#define ATM_POISON		0xdeadbeef
-
-/********** net/ **********/
-#define NEIGHBOR_DEAD		0xdeadbeef
-#define NETFILTER_LINK_POISON	0xdead57ac
-
-/********** kernel/mutexes **********/
-#define MUTEX_DEBUG_INIT	0x11
-#define MUTEX_DEBUG_FREE	0x22
-
-/********** lib/flex_array.c **********/
-#define FLEX_ARRAY_FREE	0x6c	/* for use-after-free poisoning */
-
-/********** security/ **********/
-#define KEY_DESTROY		0xbd
-
-/********** sound/oss/ **********/
-#define OSS_POISON_FREE		0xAB
-
-#endif

upnp/inc/upnpconfig.h.in

@@ -1,7 +1,7 @@
 /* -*- C -*- */
 /*******************************************************************************
  *
- * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
@@ -52,26 +52,13 @@
 
 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
-  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
+  ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH)
 
 
 
-/***************************************************************************
- * Large file support
- ***************************************************************************/
-
-/** File Offset size */
-#undef _FILE_OFFSET_BITS
-
-/** Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/** Large files support */
-#undef _LARGE_FILE_SOURCE
-
 /***************************************************************************
  * Library optional features
- ***************************************************************************/
+ ***************************************************************************/ 
 
 /*
  * The following defines can be tested in order to know which 
@@ -99,41 +86,10 @@
 #undef UPNP_HAVE_WEBSERVER
 
 
-/** Defined to 1 if the library has been compiled with the SSDP part enabled
- *  (i.e. configure --enable-ssdp) */
-#undef UPNP_HAVE_SSDP
-
-
-/** Defined to 1 if the library has been compiled with optional SSDP headers
- *  support (i.e. configure --enable-optssdp) */
-#undef UPNP_HAVE_OPTSSDP
-
-
-/** Defined to 1 if the library has been compiled with the SOAP part enabled
- *  (i.e. configure --enable-soap) */
-#undef UPNP_HAVE_SOAP
-
-
-/** Defined to 1 if the library has been compiled with the GENA part enabled
- *  (i.e. configure --enable-gena) */
-#undef UPNP_HAVE_GENA
-
-
 /** Defined to 1 if the library has been compiled with helper API
  *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
 #undef UPNP_HAVE_TOOLS
 
-/** Defined to 1 if the library has been compiled with ipv6 support
- *  (i.e. configure --enable-ipv6) */
-#undef UPNP_ENABLE_IPV6
-
-/** Defined to 1 if the library has been compiled with unspecified SERVER
- * header (i.e. configure --enable-unspecified_server) */
-#undef UPNP_ENABLE_UNSPECIFIED_SERVER
-
-/** Defined to 1 if the library has been compiled with OpenSSL support
- *  (i.e. configure --enable-open_ssl) */
-#undef UPNP_ENABLE_OPEN_SSL
 
 #endif /* UPNP_CONFIG_H */
 

upnp/inc/upnpdebug.h

@@ -1,45 +1,40 @@
 /*******************************************************************************
  *
- * Copyright (c) 2000-2003 Intel Corporation
+ * Copyright (c) 2000-2003 Intel Corporation 
- * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
- * All rights reserved.
+ * All rights reserved. 
  *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met: 
  *
- * - Redistributions of source code must retain the above copyright notice,
+ * * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice,
+ * * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation
+ * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution.
+ * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors
+ * * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software
+ * may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
- *
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * 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
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ******************************************************************************/
 
 #ifndef UPNP_DEBUG_H
-#define UPNP_DEBUG_H
+#define UPNP_DEBUG_H 
 
-/*!
+#include "upnp.h"
- * \file
- */
-
-#include "ThreadPool.h"
 #include "upnpconfig.h"
-#include "UpnpGlobal.h"		/* for UPNP_INLINE */
 
 #include <stdio.h>
 
@@ -47,15 +42,16 @@
 extern "C" {
 #endif
 
-/*! \name Other debugging features
- *
- * The UPnP SDK contains other features to aid in debugging.
- */
-/*@{*/
 
-/*! \name Upnp_LogLevel
+/** @name Other debugging features
+          The UPnP SDK contains other features to aid in debugging.
+ */
+
+/*! @{ */
+
+/** @name Upnp_LogLevel
  *  The user has the option to select 4 different types of debugging levels,
- *  see \c UpnpSetLogLevel. 
+ *  see {\tt UpnpSetLogLevel}. 
  *  The critical level will show only those messages 
  *  which can halt the normal processing of the library, like memory 
  *  allocation errors. The remaining three levels are just for debugging 
@@ -64,11 +60,14 @@ extern "C" {
  *  Info Level displays the other important operational information 
  *  regarding the working of the library. If the user selects All, 
  *  then the library displays all the debugging information that it has.
- *    \li \c UPNP_CRITICAL [0]
+ *  \begin{itemize}
- *    \li \c UPNP_PACKET [1]
+ *    \item {\tt UPNP_CRITICAL [0]}
- *    \li \c UPNP_INFO [2]
+ *    \item {\tt UPNP_PACKET [1]}
- *    \li \c UPNP_ALL [3]
+ *    \item {\tt UPNP_INFO [2]}
+ *    \item {\tt UPNP_ALL [3]}
+ *  \end{itemize}
  */
+
 typedef enum Upnp_Module {
 	SSDP,
 	SOAP,
@@ -80,213 +79,256 @@ typedef enum Upnp_Module {
 	HTTP
 } Dbg_Module;
 
-/*@{*/
+/*! @{ */
 typedef enum Upnp_LogLevel_e {
 	UPNP_CRITICAL,
 	UPNP_PACKET,
 	UPNP_INFO,
 	UPNP_ALL
 } Upnp_LogLevel;
-/*@}*/
+/*! @} */
 
-/*!
+
- * Default log level : see \c Upnp_LogLevel
+/**
+ * Default log level : see {\tt Upnp_LogLevel}
  */
 #define UPNP_DEFAULT_LOG_LEVEL	UPNP_ALL
 
-/*!
+
- * \brief Initialize the log files.
+
+/***************************************************************************
+ * Function : UpnpInitLog
  *
- * \return -1 if fails or UPNP_E_SUCCESS if succeeds.
+ * Parameters:	void
- */
+ *
+ * Description:
+ *	This functions initializes the log files
+ *
+ * Returns: int
+ *	-1 : If fails
+ *	UPNP_E_SUCCESS : if success
+ ***************************************************************************/
 #ifdef DEBUG
-int UpnpInitLog(void);
+int UpnpInitLog();
 #else
-static UPNP_INLINE int UpnpInitLog(void)
+static UPNP_INLINE int UpnpInitLog() { return UPNP_E_SUCCESS; }
-{
-	return UPNP_E_SUCCESS;
-}
-#endif
-/*!
- * \brief Set the log level (see \c Upnp_LogLevel).
- */
-#ifdef DEBUG
-void UpnpSetLogLevel(
-	/*! [in] Log level. */
-	Upnp_LogLevel log_level);
-#else
-static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level)
-{
-	return;
-	log_level = log_level;
-}
 #endif
 
-/*!
+
- * \brief Closes the log files.
+/***************************************************************************
- */
+ * Function : UpnpSetLogLevel
+ *				
+ * Parameters: Upnp_LogLevel log_level
+ *
+ * Description:							
+ *	This functions set the log level (see {\tt Upnp_LogLevel}
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
-void UpnpCloseLog(void);
+void UpnpSetLogLevel(Upnp_LogLevel log_level);
 #else
-static UPNP_INLINE void UpnpCloseLog(void)
+static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
-{
-}
 #endif
 
-/*!
+
- * \brief Set the name for error and information files, respectively.
+/***************************************************************************
- */
+ * Function : UpnpCloseLog						
+ *								
+ * Parameters:	void					
+ *								
+ * Description:							
+ *	This functions closes the log files
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpCloseLog();
+#else
+static UPNP_INLINE void UpnpCloseLog() {}
+#endif
+
+
+/***************************************************************************
+ * Function : UpnpSetLogFileNames		
+ *							
+ * Parameters:						
+ *	IN const char* ErrFileName: name of the error file
+ *	IN const char *InfoFileName: name of the information file
+ *	IN int size: Size of the buffer
+ *	IN int starLength: This parameter provides the width of the banner
+ *								
+ * Description:							
+ *	This functions takes the buffer and writes the buffer in the file as 
+ *	per the requested banner	
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
 void UpnpSetLogFileNames(
-	/*! [in] Name of the error file. */
 	const char *ErrFileName,
-	/*! [in] Name of the information file. */
 	const char *InfoFileName);
 #else
-static UPNP_INLINE void UpnpSetLogFileNames(const char *ErrFileName,
+static UPNP_INLINE void UpnpSetLogFileNames(
-	const char *InfoFileName)
+	const char *ErrFileName,
-{
+	const char *InfoFileName) {}
-	return;
-	ErrFileName = ErrFileName;
-	InfoFileName = InfoFileName;
-}
 #endif
 
-/*!
+
- * \brief Check if the module is turned on for debug and returns the file
+/***************************************************************************
- * descriptor corresponding to the debug level
+ * Function : UpnpGetDebugFile		
- *
+ *						
- * \return NULL if the module is turn off for debug otheriwse returns the
+ * Parameters:					
- *	right file descriptor.
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- */
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *								
+ * Description:
+ *	This function checks if the module is turned on for debug 
+ *	and returns the file descriptor corresponding to the debug level
+ * Returns: FILE *
+ *	NULL : if the module is turn off for debug 
+ *	else returns the right file descriptor
+ ***************************************************************************/
 #ifdef DEBUG
-FILE *UpnpGetDebugFile(
+FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module);
-	/*! [in] The level of the debug logging. It will decide whether debug
-	 * statement will go to standard output, or any of the log files. */
-	Upnp_LogLevel level,
-	/*! [in] debug will go in the name of this module. */
-	Dbg_Module module);
 #else
 static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module)
 {
 	return NULL;
-	level = level;
-	module = module;
 }
 #endif
 
-/*!
+
- * \brief Returns true if debug output should be done in this module.
+/***************************************************************************
+ * Function : DebugAtThisLevel					
+ *									
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *					
+ * Description:					
+ *	This functions returns true if debug output should be done in this
+ *	module.
  *
- * \return Nonzero value if true, zero if false.
+ * Returns: int
- */
+ ***************************************************************************/
 #ifdef DEBUG
 int DebugAtThisLevel(
-	/*! [in] The level of the debug logging. It will decide whether debug
+	IN Upnp_LogLevel DLevel,
-	 * statement will go to standard output, or any of the log files. */
+	IN Dbg_Module Module);
-	Upnp_LogLevel DLevel,
-	/*! [in] Debug will go in the name of this module. */
-	Dbg_Module Module);
 #else
-static UPNP_INLINE int DebugAtThisLevel(Upnp_LogLevel DLevel, Dbg_Module Module)
+static UPNP_INLINE int DebugAtThisLevel(
-{
+	IN Upnp_LogLevel DLevel,
-	return 0;
+	IN Dbg_Module Module) { return 0; }
-	DLevel = DLevel;
-	Module = Module;
-}
 #endif
 
-/*!
+
- * \brief Prints the debug statement either on the standard output or log file
+/***************************************************************************
- * along with the information from where this debug statement is coming.
+ * Function : UpnpPrintf				
- */
+ *									
+ * Parameters:								
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *	IN char *DbgFileName: Name of the file from where debug statement is
+ *							coming
+ *	IN int DbgLineNo : Line number of the file from where debug statement 
+ *				is coming
+ *	IN char * FmtStr, ...: Variable number of arguments that will go 
+ *				in the debug statement
+ *					
+ * Description:							
+ *	This functions prints the debug statement either on the startdard 
+ *	output or log file along with the information from where this 
+ *	debug statement is coming
+ * Returns: void
+ ***************************************************************************/ 
 #ifdef DEBUG
 void UpnpPrintf(
-	/*! [in] The level of the debug logging. It will decide whether debug
-	 * statement will go to standard output, or any of the log files. */
 	Upnp_LogLevel DLevel,
-	/*! [in] debug will go in the name of this module. */
 	Dbg_Module Module,
-	/*! [in] Name of the file from where debug statement is coming. */
+	const char* DbgFileName,
-	const char *DbgFileName,
-	/*! [in] Line number of the file from where debug statement is coming. */
 	int DbgLineNo,
-	/*! [in] Printf like format specification. */
+	const char* FmtStr,
-	const char *FmtStr,
-	/*! [in] Printf like Variable number of arguments that will go in the
-	 * debug statement. */
 	...)
 #if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler. */
+	/* This enables printf like format checking by the compiler */
-	__attribute__ ((format(__printf__, 5, 6)))
+	__attribute__((format (__printf__, 5, 6)))
 #endif
-	;
+;
 #else /* DEBUG */
-static UPNP_INLINE void UpnpPrintf(Upnp_LogLevel DLevel, Dbg_Module Module,
+static UPNP_INLINE void UpnpPrintf(
-	const char *DbgFileName, int DbgLineNo, const char *FmtStr, ...)
+	Upnp_LogLevel DLevel,
-{
+	Dbg_Module Module,
-	return;
+	const char* DbgFileName,
-	DLevel = DLevel;
+	int DbgLineNo,
-	Module = Module;
+	const char* FmtStr,
-	DbgFileName = DbgFileName;
+	...) {}
-	DbgLineNo = DbgLineNo;
-	FmtStr = FmtStr;
-}
 #endif /* DEBUG */
 
-/*!
- * \brief Writes the file name and file number from where debug statement is
- * coming to the log file.
- */
-#ifdef DEBUG
-void UpnpDisplayFileAndLine(
-	/*! [in] File descriptor where line number and file name will be
-	 * written. */
-	FILE * fd,
-	/*! [in] Name of the file. */
-	const char *DbgFileName,
-	/*! [in] Line number of the file. */
-	int DbgLineNo);
-#else
-static UPNP_INLINE void UpnpDisplayFileAndLine(FILE *fd,
-	const char *DbgFileName, int DbgLineNo)
-{
-	return;
-	fd = fd;
-	DbgFileName = DbgFileName;
-	DbgLineNo = DbgLineNo;
-}
-#endif
 
-/*!
+/***************************************************************************
- * \brief Writes the buffer in the file as per the requested banner
+ * Function : UpnpDisplayBanner				
- */
+ *							
+ * Parameters:							
+ *	IN FILE *fd: file descriptor where the banner will be written
+ *	IN char **lines: The buffer that will be written
+ *	IN int size: Size of the buffer
+ *	IN int starLength: This parameter provides the width of the banner
+ *									
+ * Description:							
+ *	This functions takes the buffer and writes the buffer in the file as 
+ *	per the requested banner			
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
 void UpnpDisplayBanner(
-	/*! [in] file descriptor where the banner will be written. */
+	FILE *fd,
-	FILE * fd,
-	/*! [in] The buffer that will be written. */
 	const char **lines,
-	/*! [in] Size of the buffer. */
 	size_t size,
-	/*! [in] This parameter provides the width of the banner. */
+	int starlength);
-	size_t starlength);
 #else
-static UPNP_INLINE void UpnpDisplayBanner(FILE *fd, const char **lines,
+static UPNP_INLINE void UpnpDisplayBanner(
-	size_t size, int starlength)
+	FILE *fd,
-{
+	const char **lines,
-	return;
+	size_t size,
-	fd = fd;
+	int starlength) {}
-	lines = lines;
-	size = size;
-	starlength = starlength;
-}
 #endif
 
-/*@}*/
+
+/***************************************************************************
+ * Function : UpnpDisplayFileAndLine				
+ *								
+ * Parameters:							
+ *	IN FILE *fd: File descriptor where line number and file name will be 
+ *			written 
+ *	IN char *DbgFileName: Name of the file  
+ *	IN int DbgLineNo : Line number of the file
+ *								
+ * Description:
+ *	This function writes the file name and file number from where
+ *		debug statement is coming to the log file
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo);
+#else
+static UPNP_INLINE void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo) {}
+#endif
+
+/*! @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* UPNP_DEBUG_H */
+

upnp/inc/upnptools.h

@@ -29,262 +29,201 @@
  *
  ******************************************************************************/
 
+/** @name Optional Tool APIs
+ *  The Linux SDK for UPnP Devices contains some additional, optional 
+ *  utility APIs that can be helpful in writing applications using the 
+ *  SDK. These additional APIs can be compiled out in order to save code 
+ *  size in the SDK. Refer to the README for details.
+ */
+
+/*! @{ */
 
 #ifndef UPNP_TOOLS_H
 #define UPNP_TOOLS_H
 
-
+#include "upnp.h"
-/*!
- * \file
- *
- * \defgroup UPnPTools Optional Tool API
- *
- * \brief Additional, optional utility API that can be helpful in writing
- * applications.
- *
- * This additional API can be compiled out in order to save code size in the
- * library. Refer to the file README for details.
- *
- * @{
- */
-
-
-#include "ixml.h" /* for IXML_Document */
-#include "upnpconfig.h"	/* for UPNP_HAVE_TOOLS */
-
 
 /* Function declarations only if tools compiled into the library */
 #if UPNP_HAVE_TOOLS
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
+/** {\bf UpnpResolveURL} combines a base URL and a relative URL into
-/*!
+ *  a single absolute URL.  The memory for {\bf AbsURL} needs to be
- * \brief Converts an SDK error code into a string error message suitable for
+ *  allocated by the caller and must be large enough to hold the
- * display. The memory returned from this function should NOT be freed.
+ *  {\bf BaseURL} and {\bf RelURL} combined.
  *
- * \return An ASCII text string representation of the error message associated
+ *  @return [int] An integer representing one of the following:
- * 	with the error code or the string "Unknown error code"
+ *    \begin{itemize}
- */
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
-EXPORT_SPEC const char *UpnpGetErrorMessage(
+ *      \item {\tt UPNP_E_INVALID_PARAM}: {\bf RelURL} is {\tt NULL}.
-	/*! [in] The SDK error code to convert. */
+ *      \item {\tt UPNP_E_INVALID_URL}: The {\bf BaseURL} / {\bf RelURL} 
-	int errorcode);
-
-
-/*!
- * \brief Combines a base URL and a relative URL into a single absolute URL.
- *
- * The memory for \b AbsURL needs to be allocated by the caller and must
- * be large enough to hold the \b BaseURL and \b RelURL combined.
- *
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: \b RelURL is <tt>NULL</tt>.
- *	\li <tt>UPNP_E_INVALID_URL</tt>: The \b BaseURL / \b RelURL 
  *              combination does not form a valid URL.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to 
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
  *              complete this operation.
+ *    \end{itemize}
  */
+
 EXPORT_SPEC int UpnpResolveURL(
-	/*! [in] The base URL to combine. */
+    IN const char * BaseURL,  /** The base URL to combine. */
-	const char *BaseURL,
+    IN const char * RelURL,   /** The relative URL to {\bf BaseURL}. */
-	/*! [in] The relative URL to \b BaseURL. */
+    OUT char * AbsURL   /** A pointer to a buffer to store the 
-	const char *RelURL,
+                            absolute URL. */
-	/*! [out] A pointer to a buffer to store the absolute URL. */
+    );
-	char *AbsURL);
 
-
+/** {\bf UpnpMakeAction} creates an action request packet based on its input 
-/*!
+ *  parameters (status variable name and value pair). Any number of input 
- * \brief Combines a base URL and a relative URL into a single absolute URL.
+ *  parameters can be passed to this function but every input variable name 
- *
+ *  should have a matching value argument. 
- * The memory for \b AbsURL becomes owned by the caller and should be freed
- * later.
- *
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: \b RelURL is <tt>NULL</tt>.
- *	\li <tt>UPNP_E_INVALID_URL</tt>: The \b BaseURL / \b RelURL 
- *              combination does not form a valid URL.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to 
- *              complete this operation.
- */
-EXPORT_SPEC int UpnpResolveURL2(
-	/*! [in] The base URL to combine. */
-	const char *BaseURL,
-	/*! [in] The relative URL to \b BaseURL. */
-	const char *RelURL,
-	/*! [out] A pointer to a pointer to a buffer to store the
-	 * absolute URL. Must be freed later by the caller. */
-	char **AbsURL);
-
-
-/*!
- * \brief Creates an action request packet based on its input parameters
- * (status variable name and value pair).
- *
- * Any number of input parameters can be passed to this function but every
- * input variable name should have a matching value argument. 
- *
- * It is a wrapper function that calls makeAction() function to create the
- * action request.
- * 
- * \return The action node of \b Upnp_Document type or <tt>NULL</tt> if the
- * 	operation failed.
- */
-EXPORT_SPEC IXML_Document *UpnpMakeAction(
-	/*! [in] Name of the action request or response. */
-	const char *ActionName,
-	/*! [in] The service type. */
-	const char *ServType,
-	/*! [in] Number of argument pairs to be passed. */
-	int NumArg,
-	/*! [in] pointer to the first argument. */
-	const char *Arg,
-	/*! [in] Argument list. */
-	...);
-
-
-/*!
- * \brief Ceates an action response packet based on its output parameters
- * (status variable name and value pair).
- *
- * Any number of input parameters can be passed to this function but every
- * output variable name should have a matching value argument. 
  *   
- * It is a wrapper function that calls makeAction() function to create the
+ *  @return [IXML_Document*] The action node of {\bf Upnp_Document} type or 
- * action request.
+ *                      {\tt NULL} if the operation failed.
- * 
- * \return The action node of \b Upnp_Document type or <tt>NULL</tt> if the
- * 	operation failed.
  */
-EXPORT_SPEC IXML_Document *UpnpMakeActionResponse(
-	/*! [in] The action name. */
-	const char *ActionName,
-	/*! [in] The service type.. */
-	const char *ServType,
-	/*! [in] The number of argument pairs passed. */
-	int NumArg,
-	/*! [in] The status variable name and value pair. */
-	const char *Arg,
-	/*! [in] Other status variable name and value pairs. */
-	...);
 
+EXPORT_SPEC IXML_Document* UpnpMakeAction(
+    IN const char * ActionName, /** The action name. */
+    IN const char * ServType,   /** The service type.  */
+    IN int NumArg,              /** Number of argument pairs to be passed. */ 
+    IN const char * Arg,        /** Status variable name and value pair. */
+    IN ...                   /*  Other status variable name and value pairs. */
+    );
 
-/*!
+/** {\bf UpnpAddToAction} creates an action request packet based on its input 
- * \brief Adds the argument in the action request.
+ *  parameters (status variable name and value pair). This API is specially 
- * 
+ *  suitable inside a loop to add any number input parameters into an existing
- * This API is specially suitable inside a loop to add any number input
+ *  action. If no action document exists in the beginning then a 
- * parameters into an existing action. If no action document exists in the
+ *  {\bf Upnp_Document} variable initialized with {\tt NULL} should be passed 
- * beginning then a <b>Upnp_Document variable initialized with <tt>NULL</tt></b>
+ *  as a parameter.
- * should be passed as a parameter.
  *
- * It is a wrapper function that calls addToAction() function to add the
+ *  @return [int] An integer representing one of the following:
- * argument in the action request.
+ *    \begin{itemize}
- * 
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
- * \return An integer representing one of the following:
+ *      \item {\tt UPNP_E_INVALID_PARAM}: One or more of the parameters 
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
+ *                                        are invalid.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: One or more of the parameters are invalid.
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to
+ *              complete this operation.
- *		complete this operation.
+ *    \end{itemize}
  */
+
 EXPORT_SPEC int UpnpAddToAction(
-	/*! [in,out] A pointer to store the action document node. */
+        IN OUT IXML_Document ** ActionDoc, 
-	IXML_Document **ActionDoc,
+	                              /** A pointer to store the action 
-	/*! [in] The action name. */
+				          document node. */
-	const char *ActionName,
+        IN const char * ActionName,   /** The action name. */
-	/*! [in] The service type. */
+        IN const char * ServType,     /** The service type.  */
-	const char *ServType,
+        IN const char * ArgName,      /** The status variable name. */
-	/*! [in] The status variable name. */
+        IN const char * ArgVal        /** The status variable value.  */
-	const char *ArgName,
+        );
-	/*! [in] The status variable value. */
-	const char *ArgVal);
 
-
+/** {\bf UpnpMakeActionResponse} creates an action response packet based 
-/*!
+ *  on its output parameters (status variable name and value pair). Any  
- * \brief Creates an action response packet based on its output parameters
+ *  number of input parameters can be passed to this function but every output
- * (status variable name and value pair).
+ *  variable name should have a matching value argument. 
- *
+ *   
- * This API is especially suitable inside a loop to add any number of input
+ *  @return [IXML_Document*] The action node of {\bf Upnp_Document} type or 
- * parameters into an existing action response. If no action document exists
+ *                           {\tt NULL} if the operation failed.
- * in the beginning, a \b Upnp_Document variable initialized with <tt>NULL</tt>
- * should be passed as a parameter.
- *
- * It is a wrapper function that calls addToAction() function to add the
- * argument in the action request.
- * 
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: One or more of the parameters are invalid.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to
- *		complete this operation.
  */
+
+EXPORT_SPEC IXML_Document* UpnpMakeActionResponse(
+    IN const char * ActionName, /** The action name. */
+    IN const char * ServType,   /** The service type.  */
+    IN int NumArg,              /** The number of argument pairs passed. */  
+    IN const char * Arg,        /** The status variable name and value pair. */
+    IN ...                   /*  Other status variable name and value pairs. */
+    );
+
+/** {\bf UpnpAddToActionResponse} creates an action response
+ *  packet based on its output parameters (status variable name
+ *  and value pair). This API is especially suitable inside
+ *  a loop to add any number of input parameters into an existing action 
+ *  response. If no action document exists in the beginning, a 
+ *  {\bf Upnp_Document} variable initialized with {\tt NULL} should be passed 
+ *  as a parameter.
+ *
+ *  @return [int] An integer representing one of the following:
+ *    \begin{itemize}
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
+ *      \item {\tt UPNP_E_INVALID_PARAM}: One or more of the parameters 
+ *                                        are invalid.
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
+ *              complete this operation.
+ *    \end{itemize}
+ */
+
 EXPORT_SPEC int UpnpAddToActionResponse(
-	/*! [in,out] Pointer to a document to store the action document node. */
+        IN OUT IXML_Document ** ActionResponse, 
-        IXML_Document **ActionResponse, 
+	                                   /** Pointer to a document to 
-	/*! [in] The action name. */
+					       store the action document 
-        const char *ActionName,
+					       node. */
-	/*! [in] The service type. */
+        IN const char * ActionName,        /** The action name. */
-        const char *ServType,
+        IN const char * ServType,          /** The service type.  */
-	/*! [in] The status variable name. */
+        IN const char * ArgName,           /** The status variable name. */
-        const char *ArgName,
+        IN const char * ArgVal             /** The status variable value.  */
-	/*! [in] The status variable value. */
+        );
-        const char *ArgVal);
 
-
+/** {\bf UpnpAddToPropertySet} can be used when an application needs to 
-/*!
+ *  transfer the status of many variables at once. It can be used 
- * \brief Creates a property set message packet.
+ *  (inside a loop) to add some extra status variables into an existing
- *
+ *  property set. If the application does not already have a property
- * Any number of input parameters can be passed to this function but every
+ *  set document, the application should create a variable initialized 
- * input variable name should have a matching value input argument.
+ *  with {\tt NULL} and pass that as the first parameter.
  *  
- * \return <tt>NULL</tt> on failure, or the property-set document node.
+ *  @return [int] An integer representing one of the following:
- */
+ *    \begin{itemize}
-EXPORT_SPEC IXML_Document *UpnpCreatePropertySet(
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
-	/*! [in] The number of argument pairs passed. */
+ *      \item {\tt UPNP_E_INVALID_PARAM}: One or more of the parameters 
-	int NumArg,
+ *                                        are invalid.
-	/*! [in] The status variable name and value pair. */
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
-	const char *Arg,
+ *              complete this operation.
-	/*! [in] Variable sized list with the rest of the parameters. */
+ *    \end{itemize}
-	...);
-
-
-/*!
- * \brief Can be used when an application needs to transfer the status of many
- * variables at once.
  *
- * It can be used (inside a loop) to add some extra status variables into an
- * existing property set. If the application does not already have a property
- * set document, the application should create a variable initialized with
- * <tt>NULL</tt> and pass that as the first parameter.
- *  
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: One or more of the parameters are invalid.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to
- *		complete this operation.
  */
+
 EXPORT_SPEC int UpnpAddToPropertySet(
-	/*! [in,out] A pointer to the document containing the property set document node. */
+    IN OUT IXML_Document **PropSet,    
-	IXML_Document **PropSet,
+                                  /** A pointer to the document containing 
-	/*! [in] The status variable name. */
+				      the property set document node. */
-	const char *ArgName,
+    IN const char * ArgName,      /** The status variable name. */  
-	/*! [in] The status variable value. */
+    IN const char * ArgVal        /** The status variable value.  */
-	const char *ArgVal);
+    );
 
+/** {\bf UpnpCreatePropertySet} creates a property set  
+ *  message packet. Any number of input parameters can be passed  
+ *  to this function but every input variable name should have 
+ *  a matching value input argument.
+ *  
+ *  @return [IXML_Document*] {\tt NULL} on failure, or the property-set 
+ *                           document node.
+ *
+ */
+
+EXPORT_SPEC IXML_Document* UpnpCreatePropertySet(
+    IN int NumArg,        /** The number of argument pairs passed. */
+    IN const char* Arg,   /** The status variable name and value pair. */
+    IN ...
+    );
+
+/** {\bf UpnpGetErrorMessage} converts an SDK error code into a 
+ *  string error message suitable for display.  The memory returned
+ *  from this function should NOT be freed.
+ *
+ *  @return [char*] An ASCII text string representation of the error message 
+ *                  associated with the error code. 
+ */
+
+EXPORT_SPEC const char * UpnpGetErrorMessage(
+        int errorcode  /** The SDK error code to convert. */
+        );
+
+/*! @} */
 
 #ifdef __cplusplus
 }
 #endif
 
-
-/*! @} */
-
-
 #endif /* UPNP_HAVE_TOOLS */
 
-
 #endif /* UPNP_TOOLS_H */
 

upnp/m4/libupnp.m4

@@ -1,97 +0,0 @@
-#							-*- Autoconf -*-
-# This file is part of the aMule project.
-# This file is part of the libupnp library project.
-#
-# Copyright (c) 2003-2008 aMule Team ( admin@amule.org / http://www.amule.org )
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-#
-
-dnl --------------------------------------------------------------------------
-dnl LIBUPNP_CHECK([VERSION = 1.6.6], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-dnl Check for the libupnp library
-dnl --------------------------------------------------------------------------
-dnl
-dnl This macro sets these variables:
-dnl - LIBUPNP_VERSION
-dnl 	Something like "1.6.7"
-dnl - LIBUPNP_CPPFLAGS
-dnl 	Flags to be added to CPPFLAGS
-dnl - LIBUPNP_CFLAGS
-dnl 	Flags to be added to CFLAGS
-dnl - LIBUPNP_LDFLAGS
-dnl 	Flags to be added to LDFLAGS
-dnl - LIBUPNP_LIBS
-dnl 	Library to be added to LIBS
-dnl
-dnl The LIBUPNP_CPPFLAGS, LIBUPNP_CFLAGS, LIBUPNP_LDFLAGS and LIBUPNP_LIBS variables are also substituted.
-dnl
-AC_DEFUN([LIBUPNP_CHECK],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl
-
-dnl	Test for --with-libupnp-prefix
-	AC_ARG_WITH(
-		[libupnp-prefix],
-		[AS_HELP_STRING(
-			[--with-libupnp-prefix=PREFIX],
-			[UPnP library location])],
-		[export PKG_CONFIG_PATH=$withval/lib/pkgconfig])
-
-dnl	Check for libupnp >= MIN_LIBUPNP_VERSION
-	AS_IF([test $cross_compiling = no], [
-		AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION])
-		AS_IF([test -n "$PKG_CONFIG"], [
-			AS_IF([$PKG_CONFIG libupnp --exists], [
-				LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
-				AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [
-					result=yes
-					resultstr=" (version $LIBUPNP_VERSION)"
-					LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I`
-					LIBUPNP_CFLAGS=`$PKG_CONFIG libupnp --cflags-only-other`
-					LIBUPNP_LDFLAGS=`$PKG_CONFIG libupnp --libs-only-L`
-					LIBUPNP_LIBS=`$PKG_CONFIG libupnp --libs-only-other`
-					LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`"
-				], [
-					result=no
-					resultstr=" (version $LIBUPNP_VERSION is not new enough)"
-				])
-			], [
-				result=no
-				resultstr=" (try to use --with-libupnp-prefix=PREFIX)"
-			])
-		], [
-			result=no
-			resultstr=" (pkg-config not found)"
-		])
-		AC_MSG_RESULT([$result$resultstr])
-		libupnp_error="libupnp >= MIN_LIBUPNP_VERSION not found$resultstr"
-	], [
-dnl Currently cross-compilation with libupnp is not supported.
-		result=no
-		libupnp_error="cross compiling"
-	])
-
-dnl	Execute the right action.
-	AS_IF([test ${result:-no} = yes], [$2], [$3])
-
-dnl Exported symbols
-AC_SUBST([LIBUPNP_CPPFLAGS])dnl
-AC_SUBST([LIBUPNP_CFLAGS])dnl
-AC_SUBST([LIBUPNP_LDFLAGS])dnl
-AC_SUBST([LIBUPNP_LIBS])dnl
-m4_undefine([MIN_LIBUPNP_VERSION])dnl
-])