Whitespace fix on soaplib.h.

Adding a configure flag to disable GENA notification reordering as even
with an imillisleep(1), this mechanism consumes too much CPU on embedded
devices when there is a burst of notifications.

.gitignore

@@ -73,14 +73,6 @@ GRTAGS
 GSYMS
 GTAGS
 
-# QT-Creator files
-Makefile.am.user
-pupnp.config
-pupnp.creator
-pupnp.creator.user
-pupnp.files
-pupnp.includes
-
 *.orig
 *~
 \#*#
@@ -106,19 +98,7 @@ 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
+upnp/sample/upnp_tv_combo
+upnp/sample/upnp_tv_ctrlpt
+upnp/sample/upnp_tv_device
 
-
-/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.6.7
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -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             = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS EXCLUDE_GENA=0 EXCLUDE_DOM=0
 
 # 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

@@ -26,6 +26,7 @@ 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/stdint.h \

README

@@ -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
-sample control point "$(LIBUPNP)/upnp/tv_ctrlpt". 
+will build the sample device "$(LIBUPNP)/upnp/upnp_tv_device" and
+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
-the web directory there, giving: "$(LIBUPNP)/upnp/sample/tvdevice/web".
-To run the sample invoke from the command line as follows:
+To run the sample device, you need the "$(LIBUPNP)/upnp/sample/tvdevice/web" 
+sub-directory. Example :
 
 % 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

@@ -8,41 +8,32 @@ 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)
+- Chandra (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)
+- Hartmut Holzgraefe - hholzgra
 - Ingo Hofmann
-- Ivan Romanov (ivanromanov)
 - Jiri Zouhar
-- Jean-Francois Dockes (medoc)
 - John Dennis
 - Jonathan Casiot (no_dice)
 - Josh Carroll
-- Juergen Lock
 - Keith Brindley
 - Leuk_He
 - Loigu
@@ -52,30 +43,16 @@ exempt of errors.
 - Nektarios K. Papadopoulos (npapadop)
 - Nicholas Kraft
 - Nick Leverton (leveret)
-- Obata Akio (obache)
 - Oskar Liljeblad
 - Michael (oxygenic)
 - 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:
-  A) One client(1)
-  B) An IPv4 and IPv6 device (2)
-  NUM_HANDLE should be 3
+- replace doc++ by Doxygen for documentation generation
+
+- incorporate public patches and fix reported bugs : 
+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,434 @@
+/**************************************************************************
+ *
+ * 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 THREAD_STACK_SIZE
+ *
+ * The {\tt THREAD_STACK_SIZE} constant defines the minimum stack size (in
+ * bytes) allocated for the stack of each thread 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.  This value will not be used if it
+ * is lower than ITHREAD_STACK_MIN or greater than a system-imposed limit.
+ * This value can be used to lower memory overhead in embedded systems.
+ * The default value is 0 (so it is not used by default).
+ *
+ * @{
+ */
+#define THREAD_STACK_SIZE 0
+/* @} */
+
+
+/*! \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 WEB_SERVER_CONTENT_LANGUAGE
+ *
+ * This configuration parameter sets the value of the Content-Language
+ * header for the webserver. Thanks to this parameter, the use can advertize
+ * the language used by the device in the description (friendlyName) and
+ * presentation steps of UPnP. The default value is empty string so no
+ * Content-Language header is added.
+ *
+ * @{
+ */
+#define WEB_SERVER_CONTENT_LANGUAGE ""
+/* @} */
+
+/*!
+ * \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
+
+
+/*
+ * @}
+ */
+
+#endif /* INTERNAL_CONFIG_H */
+

build/inc/upnpconfig.h

@@ -1,35 +1,35 @@
 /* upnp/inc/upnpconfig.h.  Generated from upnpconfig.h.in by configure.  */
-/* -*- C -*- */
-/*******************************************************************************
- *
- * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
- * 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.
- *
- ******************************************************************************/
+// -*- C -*-
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
+// 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 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
- * header (i.e. configure --enable-unspecified_server) */
-/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
+#endif // UPNP_CONFIG_H
 
-/** 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 verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!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 
 !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/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 +1,217 @@
-<?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>
+<?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"
+				PreprocessorDefinitions="WIN32;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.vcproj

@@ -50,7 +50,7 @@
 				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"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -80,8 +80,8 @@
 				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
-				ImportLibrary="$(OutDir)\libupnp.lib"
+				ProgramDatabaseFile=".\Release/libupnp.pdb"
+				ImportLibrary=".\Release/libupnp.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)\libupnp.bsc"
+				OutputFile=".\Release/libupnp.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -234,10 +234,6 @@
 				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"
 				>
@@ -607,6 +603,10 @@
 				RelativePath="..\..\upnp\src\inc\upnpapi.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>

build/vc8/threadutil.vcproj

@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -80,9 +80,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -103,8 +103,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;UPNP_USE_MSVCPP"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -120,11 +118,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -134,6 +139,12 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>

build/vc8/tvcombo.vcproj

@@ -40,7 +40,7 @@
 				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"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -91,8 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -114,8 +114,6 @@
 			/>
 			<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"
@@ -132,8 +130,6 @@
 			/>
 			<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"
@@ -178,15 +174,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_combo_main.c"
+				RelativePath="..\..\upnp\sample\tvcombo\linux\upnp_tv_combo_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.c"
 				>
 			</File>
 		</Filter>

build/vc8/tvctrlpt.vcproj

@@ -40,7 +40,7 @@
 				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"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -91,8 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -114,8 +114,6 @@
 			/>
 			<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"
@@ -132,8 +130,6 @@
 			/>
 			<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"
@@ -178,11 +174,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_ctrlpt_main.c"
+				RelativePath="..\..\upnp\sample\tvctrlpt\linux\upnp_tv_ctrlpt_main.c"
 				>
 			</File>
 		</Filter>

build/vc8/tvdevice.vcproj

@@ -40,7 +40,7 @@
 				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"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -91,8 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -114,8 +114,6 @@
 			/>
 			<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"
@@ -132,8 +130,6 @@
 			/>
 			<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"
@@ -178,11 +174,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_device_main.c"
+				RelativePath="..\..\upnp\sample\tvdevice\linux\upnp_tv_device_main.c"
 				>
 			</File>
 		</Filter>

build/vc9/ixml.vcproj

@@ -11,20 +11,16 @@
 		<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)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -45,16 +41,12 @@
 				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"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -67,75 +59,6 @@
 			/>
 			<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"
@@ -155,12 +78,11 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -180,19 +102,13 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -205,354 +121,6 @@
 			/>
 			<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"

build/vc9/libupnp.sln

@@ -28,112 +28,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj",
 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

build/vc9/libupnp.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="libupnp"
 	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
 	RootNamespace="libupnp"
@@ -11,22 +11,19 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -52,23 +49,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\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"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\pthreads\include,..\ixml\src\inc,..\ixml\inc,..\threadutil\inc,..\upnp\inc,..\upnp\src\inc,.\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
+				PrecompiledHeaderFile=".\Release/libupnp.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,20 +76,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib threadutil.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib"
+				OutputFile=".\Release/libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
+				ProgramDatabaseFile=".\Release/libupnp.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(TargetName).lib"
+				ImportLibrary=".\Release/libupnp.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -123,116 +110,12 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/libupnp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\inc&quot;;&quot;$(SolutionDir)\..\msvc&quot;;&quot;$(SolutionDir)\..\..\upnp\inc&quot;;&quot;$(SolutionDir)\..\..\upnp\src\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\src\inc&quot;;&quot;$(SolutionDir)\..\..\threadutil\inc&quot;;&quot;$(SolutionDir)\..\..\pthreads&quot;;&quot;$(SolutionDir)\..\..\pthreads\include&quot;"
-				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)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib threadutil.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(TargetName).lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/libupnp.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="0"
@@ -261,20 +144,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\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"
+				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
+				PrecompiledHeaderFile="$(OutDir)\libupnp.pch"
+				AssemblerListingLocation="$(OutDir)\"
+				ObjectFile="$(OutDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -289,17 +171,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib threadutil.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib $(TargetDir)..\ixml\ixml.lib"
+				OutputFile="$(OutDir)\libupnp.dll"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="2"
+				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(TargetName).lib"
+				ImportLibrary="$(OutDir)\libupnp.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -326,436 +206,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/libupnp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\inc&quot;;&quot;$(SolutionDir)\..\msvc&quot;;&quot;$(SolutionDir)\..\..\upnp\inc&quot;;&quot;$(SolutionDir)\..\..\upnp\src\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\src\inc&quot;;&quot;$(SolutionDir)\..\..\threadutil\inc&quot;;&quot;$(SolutionDir)\..\..\pthreads&quot;;&quot;$(SolutionDir)\..\..\pthreads\include&quot;"
-				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)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib threadutil.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)$(TargetName).lib"
-				TargetMachine="17"
-			/>
-			<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="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<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="..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include"
-				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"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)\libupnp.bsc"
-			/>
-			<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"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/libupnp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\inc&quot;;&quot;$(SolutionDir)\..\msvc&quot;;&quot;$(SolutionDir)\..\..\upnp\inc&quot;;&quot;$(SolutionDir)\..\..\upnp\src\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\src\inc&quot;;&quot;$(SolutionDir)\..\..\threadutil\inc&quot;;&quot;$(SolutionDir)\..\..\pthreads&quot;;&quot;$(SolutionDir)\..\..\pthreads\include&quot;"
-				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"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)\libupnp.bsc"
-			/>
-			<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"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<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="0"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\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"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/libupnp.bsc"
-			/>
-			<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"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/libupnp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\inc&quot;;&quot;$(SolutionDir)\..\msvc&quot;;&quot;$(SolutionDir)\..\..\upnp\inc&quot;;&quot;$(SolutionDir)\..\..\upnp\src\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\inc&quot;;&quot;$(SolutionDir)\..\..\ixml\src\inc&quot;;&quot;$(SolutionDir)\..\..\threadutil\inc&quot;;&quot;$(SolutionDir)\..\..\pthreads&quot;;&quot;$(SolutionDir)\..\..\pthreads\include&quot;"
-				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)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/libupnp.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -780,10 +230,6 @@
 				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"
 				>
@@ -832,6 +278,10 @@
 				RelativePath="..\..\upnp\src\genlib\net\http\httpreadwrite.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\inet_pton.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\ixml.c"
 				>
@@ -1001,14 +451,6 @@
 				RelativePath="..\..\upnp\inc\ActionRequest.h"
 				>
 			</File>
-			<File
-				RelativePath="..\inc\autoconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\Callback.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\client_table.h"
 				>
@@ -1053,6 +495,10 @@
 				RelativePath="..\..\upnp\src\inc\gmtdate.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\http_client.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\httpparser.h"
 				>
@@ -1062,7 +508,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\msvc\inttypes.h"
+				RelativePath="..\..\upnp\src\inc\inet_pton.h"
 				>
 			</File>
 			<File
@@ -1125,10 +571,6 @@
 				RelativePath="..\..\upnp\src\inc\statuscodes.h"
 				>
 			</File>
-			<File
-				RelativePath="..\msvc\stdint.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\strintmap.h"
 				>
@@ -1141,18 +583,6 @@
 				RelativePath="..\..\upnp\src\inc\sysdep.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\TemplateInclude.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\TemplateSource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\TemplateUndef.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\unixutil.h"
 				>
@@ -1170,29 +600,13 @@
 				>
 			</File>
 			<File
-				RelativePath="..\inc\upnpconfig.h"
+				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpGlobal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpInet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpIntTypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpStdInt.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\inc\UpnpString.h"
 				>
@@ -1201,14 +615,6 @@
 				RelativePath="..\..\upnp\inc\upnptools.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpUniStd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\upnputil.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\uri.h"
 				>
@@ -1218,11 +624,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\src\inc\uuid.h"
+				RelativePath="..\..\upnp\src\inc\util.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\src\inc\VirtualDir.h"
+				RelativePath="..\..\upnp\src\inc\utilall.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\uuid.h"
 				>
 			</File>
 			<File
@@ -1230,6 +640,10 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath="..\..\..\..\libupnp_win32.patch"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

build/vc9/threadutil.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="threadutil"
 	ProjectGUID="{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
 	RootNamespace="threadutil"
@@ -11,17 +11,14 @@
 		<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)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="0"
 			>
@@ -43,15 +40,13 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
 			<Tool
@@ -65,73 +60,8 @@
 			/>
 			<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"
+				AdditionalDependencies="pthreadVC2.lib"
+				AdditionalLibraryDirectories="..\..\pthreads\lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -151,9 +81,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
-			ConfigurationType="4"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -175,15 +105,11 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
@@ -198,12 +124,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -214,341 +146,7 @@
 				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"
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -606,6 +204,12 @@
 				>
 			</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>

build/vc9/tvcombo.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="tvcombo"
 	ProjectGUID="{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
 	RootNamespace="tvcombo"
@@ -11,19 +11,16 @@
 		<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)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -43,15 +40,13 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
+				PreprocessorDefinitions="DEBUG;WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
 			<Tool
@@ -65,12 +60,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib $(TargetDir)..\libupnp\libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(TargetDir)..\ixml&quot;;&quot;$(TargetDir)..\threadutil&quot;;&quot;$(TargetDir)..\libupnp&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,90 +87,12 @@
 				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)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
-			CharacterSet="0"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -200,13 +114,8 @@
 				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"
@@ -222,12 +131,7 @@
 			/>
 			<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"
@@ -254,406 +158,6 @@
 				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>
@@ -668,18 +172,24 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_combo_main.c"
+				RelativePath="..\..\upnp\sample\tvcombo\linux\upnp_tv_combo_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.c"
 				>
 			</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>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
@@ -690,11 +200,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.h"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.h"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.h"
 				>
 			</File>
 		</Filter>

build/vc9/tvctrlpt.vcproj

@@ -11,17 +11,14 @@
 		<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)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -43,16 +40,13 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,12 +59,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,88 +86,10 @@
 				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)\"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -200,16 +113,10 @@
 				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"
@@ -222,12 +129,7 @@
 			/>
 			<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"
@@ -254,406 +156,6 @@
 				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>
@@ -668,11 +170,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_ctrlpt_main.c"
+				RelativePath="..\..\upnp\sample\tvctrlpt\linux\upnp_tv_ctrlpt_main.c"
 				>
 			</File>
 		</Filter>
@@ -686,10 +188,16 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.h"
+				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>

build/vc9/tvdevice.vcproj

@@ -11,17 +11,14 @@
 		<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)\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -43,16 +40,13 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,12 +59,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,88 +86,10 @@
 				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)\"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -200,16 +113,10 @@
 				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"
@@ -222,12 +129,7 @@
 			/>
 			<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"
@@ -254,406 +156,6 @@
 				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>
@@ -668,11 +170,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_device_main.c"
+				RelativePath="..\..\upnp\sample\tvdevice\linux\upnp_tv_device_main.c"
 				>
 			</File>
 		</Filter>
@@ -686,10 +188,16 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.h"
+				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>

configure.ac

@@ -9,7 +9,7 @@
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.8.0], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.7], [mroberto@users.sourceforge.net])
 dnl ############################################################################
 dnl # *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:
@@ -147,195 +147,22 @@ 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 # - Code has changed in threadutil
+dnl #	revision: 3 -> 4
 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 #	current: 4 -> 5
+dnl #   revision: 4 -> 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])
+AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [5:0:2])
+AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
 dnl ############################################################################
 dnl # Repeating the algorithm to place it closer to the modificatin place:
 dnl # 	- library code modified:		revision++
@@ -423,29 +250,6 @@ 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
@@ -457,31 +261,11 @@ 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])
 
@@ -523,7 +307,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 +326,10 @@ 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,
-		# but only if CFLAGS was not previously set.
+		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
 		#:
 		# Use -O0 in debug so that variables do not get optimized out
-		AX_CFLAGS_GCC_OPTION([-O0, -g])
+		AX_CFLAGS_GCC_OPTION([-O0])
 	else
 		# add optimise for size
 		AX_CFLAGS_GCC_OPTION([-Os])
@@ -648,10 +430,7 @@ fi
 #
 AC_FUNC_VPRINTF
 AC_FUNC_FSEEKO
-AC_CHECK_FUNC(strnlen,
-	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]))
+AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])
 #
 # Solaris needs -lsocket -lnsl -lrt
 AC_SEARCH_LIBS([bind],           [socket])
@@ -706,7 +485,6 @@ AC_CONFIG_FILES([
 	upnp/Makefile
 	upnp/doc/Makefile
 	upnp/sample/Makefile
-	upnp/unittest/Makefile
 	docs/dist/Makefile
 	libupnp.pc
 	])
@@ -714,12 +492,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
-

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<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS 		= doc
 
-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
-                          -I$(top_srcdir)/upnp/inc
+AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
 AM_CFLAGS		= 
 
 LDADD			= libixml.la
@@ -19,10 +18,6 @@ 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) \

ixml/inc/ixml.h

@@ -158,13 +158,6 @@ typedef struct _IXML_Document *Docptr;
 
 typedef struct _IXML_Node     *Nodeptr;
 
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-/*!
- * \brief Signature for GC support method, called before a node is freed.
- */
-typedef void (*IXML_BeforeFreeNode_t) (Nodeptr obj);
-#endif
-
 
 /*!
  * \brief Data structure common to all types of nodes.
@@ -185,9 +178,6 @@ typedef struct _IXML_Node
 	Nodeptr           nextSibling;
 	Nodeptr           firstAttr;
 	Docptr            ownerDocument;
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-	void*             ctag;			/* custom tag */
-#endif
 } IXML_Node;
 
 
@@ -273,8 +263,6 @@ extern "C" {
  * The \b Node interface forms the primary datatype for all other DOM 
  * objects. Every other interface is derived from this interface, inheriting 
  * its functionality. For more information, refer to DOM2-Core page 34.
- * (Note: within the IXML library the NamedNodeMap and NodeList interfaces are
- * the only interfaces that are not DOM objects and hence do not inherit from Node)
  *
  * @{
  */
@@ -326,8 +314,7 @@ EXPORT_SPEC int ixmlNode_setNodeValue(
 
 
 /*!
- * \brief Retrieves the type of a \b Node. Note that not all possible 
- * return values are actually implemented.
+ * \brief Retrieves the type of a \b Node.
  *
  *  \return An enum IXML_NODE_TYPE representing the type of the \b Node.
  */
@@ -638,29 +625,9 @@ EXPORT_SPEC BOOL ixmlNode_hasAttributes(
  * \brief Frees a \b Node and all \b Nodes in its subtree.
  */
 EXPORT_SPEC void ixmlNode_free(
-	/*! [in] The \b Node tree to free. Before it is freed, the handler
-	 * set by \b ixmlSetBeforeFree will be called, the order will be
-	 * top-down.
-	 */
+	/*! [in] The \b Node tree to free. */
 	IXML_Node *nodeptr);
 
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-/*!
- * \brief Sets the custom tag for the node.
- */
-EXPORT_SPEC void ixmlNode_setCTag(
-	/*! [in] The \b Node to which to attach the tag. */
-	IXML_Node *nodeptr,
-	/*! [in] The \b tag to attach. */
-	void *ctag);
-
-/*!
- * \brief Gets the custom tag for the node.
- */
-EXPORT_SPEC void* ixmlNode_getCTag(
-	/*! [in] The \b Node from which to get the tag. */
-	IXML_Node *nodeptr);
-#endif
 /* @} Interface Node */
 
 
@@ -771,7 +738,7 @@ EXPORT_SPEC int ixmlDocument_createDocumentEx(
  * \return A pointer to the new \b Document object with the nodeName set to
  *  	"#document" or \c NULL on failure.
  */
-EXPORT_SPEC IXML_Document *ixmlDocument_createDocument(void);
+EXPORT_SPEC IXML_Document *ixmlDocument_createDocument();
 
 
 /*!
@@ -904,7 +871,7 @@ EXPORT_SPEC IXML_Attr *ixmlDocument_createAttribute(
 	/*! [in] The owner \b Document of the new node. */
 	IXML_Document *doc,  
 	/*! [in] The name of the new attribute. */
-	const DOMString name);
+	const char *name);
 
 
 /*!
@@ -925,7 +892,7 @@ EXPORT_SPEC int ixmlDocument_createAttributeEx(
 	/*! [in] The owner \b Document of the new node. */
 	IXML_Document *doc,
 	/*! [in] The name of the new attribute. */
-	const DOMString name,      
+	const char *name,      
 	/*! [out] A pointer to a \b Attr where the new object will be stored. */
 	IXML_Attr **attrNode);
 
@@ -1770,18 +1737,6 @@ EXPORT_SPEC void ixmlRelaxParser(
 	 */
 	char errorChar);
 
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-/*!
- * \brief Sets the handler to call before a node is freed.
- */
-EXPORT_SPEC void ixmlSetBeforeFree(
-	/*! [in] 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.
-	 */
-	IXML_BeforeFreeNode_t hndlr);
-#endif
 
 /*!
  * \brief Parses an XML text buffer converting it into an IXML DOM representation.

ixml/inc/ixmldebug.h

@@ -5,7 +5,6 @@
 
 
 #include "UpnpGlobal.h"
-#include "ixml.h"
 
 
 /*!
@@ -21,13 +20,6 @@
  */ 
 #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
@@ -35,38 +27,15 @@ void IxmlPrintf(
 	...)
 #if (__GNUC__ >= 3)
 	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 4, 5)))
+	__attribute__((format (__printf__, 1, 2)))
 #endif
 ;
 #else /* DEBUG */
 static UPNP_INLINE void IxmlPrintf(
-	const char *FmtStr,
-	...)
-{
-	FmtStr = FmtStr;
-}
+	const char* 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

@@ -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: 

ixml/src/document.c

@@ -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: 
@@ -140,11 +139,10 @@ int ixmlDocument_createElementEx(
 		errCode = IXML_INSUFFICIENT_MEMORY;
 		goto ErrorHandler;
 	}
-	/* set the node fields */
+	// set the node fields 
 	newElement->n.nodeType = eELEMENT_NODE;
 	newElement->n.nodeName = strdup(tagName);
 	if (newElement->n.nodeName == NULL) {
-		free(newElement->tagName);
 		ixmlElement_free(newElement);
 		newElement = NULL;
 		errCode = IXML_INSUFFICIENT_MEMORY;
@@ -165,14 +163,8 @@ IXML_Element *ixmlDocument_createElement(
 	const DOMString tagName)
 {
 	IXML_Element *newElement = NULL;
-	int ret = IXML_SUCCESS;
 
-	ret = ixmlDocument_createElementEx(doc, tagName, &newElement);
-	if (ret != IXML_SUCCESS) {
-                IxmlPrintf(__FILE__, __LINE__, "ixmlDocument_createElement",
-			"Error %d\n", ret);
-		return NULL;
-        }
+	ixmlDocument_createElementEx(doc, tagName, &newElement);
 	return newElement;
 }
 
@@ -191,7 +183,7 @@ int ixmlDocument_createDocumentEx(IXML_Document **rtDoc)
 
 	ixmlDocument_init(doc);
 
-	doc->n.nodeName = strdup((const char*)DOCUMENTNODENAME);
+	doc->n.nodeName = strdup(DOCUMENTNODENAME);
 	if (doc->n.nodeName == NULL) {
 		ixmlDocument_free(doc);
 		doc = NULL;
@@ -237,17 +229,17 @@ int ixmlDocument_createTextNodeEx(
 		rc = IXML_INSUFFICIENT_MEMORY;
 		goto ErrorHandler;
 	}
-	/* initialize the node */
+	// initialize the node
 	ixmlNode_init(returnNode);
 
-	returnNode->nodeName = strdup((const char*)TEXTNODENAME);
+	returnNode->nodeName = strdup(TEXTNODENAME);
 	if (returnNode->nodeName == NULL) {
 		ixmlNode_free(returnNode);
 		returnNode = NULL;
 		rc = IXML_INSUFFICIENT_MEMORY;
 		goto ErrorHandler;
 	}
-	/* add in node value */
+	// add in node value
 	if (data != NULL) {
 		returnNode->nodeValue = strdup(data);
 		if (returnNode->nodeValue == NULL) {
@@ -281,7 +273,7 @@ IXML_Node *ixmlDocument_createTextNode(
 
 int ixmlDocument_createAttributeEx(
 	IXML_Document *doc,
-	const DOMString name,
+	const char *name,
 	IXML_Attr **rtAttr)
 {
 	IXML_Attr *attrNode = NULL;
@@ -303,7 +295,7 @@ int ixmlDocument_createAttributeEx(
 	ixmlAttr_init(attrNode);
 	attrNode->n.nodeType = eATTRIBUTE_NODE;
 
-	/* set the node fields */
+	// set the node fields
 	attrNode->n.nodeName = strdup(name);
 	if (attrNode->n.nodeName == NULL) {
 		ixmlAttr_free(attrNode);
@@ -322,12 +314,11 @@ ErrorHandler:
 
 IXML_Attr *ixmlDocument_createAttribute(
 	IXML_Document *doc,
-	const DOMString name)
+	const char *name)
 {
 	IXML_Attr *attrNode = NULL;
 
-	if(ixmlDocument_createAttributeEx(doc, name, &attrNode) != IXML_SUCCESS)
-		return NULL;
+	ixmlDocument_createAttributeEx(doc, name, &attrNode);
 
 	return attrNode;
 }
@@ -352,7 +343,7 @@ int ixmlDocument_createAttributeNSEx(
 	if (errCode != IXML_SUCCESS) {
 		goto ErrorHandler;
 	}
-	/* set the namespaceURI field */
+	// set the namespaceURI field 
 	attrNode->n.namespaceURI = strdup(namespaceURI);
 	if (attrNode->n.namespaceURI == NULL) {
 		ixmlAttr_free(attrNode);
@@ -360,7 +351,7 @@ int ixmlDocument_createAttributeNSEx(
 		errCode = IXML_INSUFFICIENT_MEMORY;
 		goto ErrorHandler;
 	}
-	/* set the localName and prefix */
+	// set the localName and prefix 
 	errCode =
 		ixmlNode_setNodeName((IXML_Node *)attrNode, qualifiedName);
 	if (errCode != IXML_SUCCESS) {
@@ -410,7 +401,7 @@ int ixmlDocument_createCDATASectionEx(
 
 	ixmlCDATASection_init(cDSectionNode);
 	cDSectionNode->n.nodeType = eCDATA_SECTION_NODE;
-	cDSectionNode->n.nodeName = strdup((const char*)CDATANODENAME);
+	cDSectionNode->n.nodeName = strdup(CDATANODENAME);
 	if (cDSectionNode->n.nodeName == NULL) {
 		ixmlCDATASection_free(cDSectionNode);
 		cDSectionNode = NULL;
@@ -453,36 +444,36 @@ int ixmlDocument_createElementNSEx(
 	IXML_Element **rtElement)
 {
 	IXML_Element *newElement = NULL;
-	int ret = IXML_SUCCESS;
+	int errCode = IXML_SUCCESS;
 	int line = 0;
 
 	if (doc == NULL || namespaceURI == NULL || qualifiedName == NULL) {
 		line = __LINE__;
-		ret = IXML_INVALID_PARAMETER;
+		errCode = IXML_INVALID_PARAMETER;
 		goto ErrorHandler;
 	}
 
-	ret = ixmlDocument_createElementEx(doc, qualifiedName, &newElement);
-	if (ret != IXML_SUCCESS) {
+	errCode = ixmlDocument_createElementEx(doc, qualifiedName, &newElement);
+	if (errCode != IXML_SUCCESS) {
 		line = __LINE__;
 		goto ErrorHandler;
 	}
-	/* set the namespaceURI field */
+	// set the namespaceURI field 
 	newElement->n.namespaceURI = strdup(namespaceURI);
 	if (newElement->n.namespaceURI == NULL) {
 		line = __LINE__;
 		ixmlElement_free(newElement);
 		newElement = NULL;
-		ret = IXML_INSUFFICIENT_MEMORY;
+		errCode = IXML_INSUFFICIENT_MEMORY;
 		goto ErrorHandler;
 	}
-	/* set the localName and prefix */
-	ret = ixmlNode_setNodeName((IXML_Node *)newElement, qualifiedName);
-	if (ret != IXML_SUCCESS) {
+	// set the localName and prefix 
+	errCode = ixmlNode_setNodeName((IXML_Node *)newElement, qualifiedName);
+	if (errCode != IXML_SUCCESS) {
 		line = __LINE__;
 		ixmlElement_free(newElement);
 		newElement = NULL;
-		ret = IXML_INSUFFICIENT_MEMORY;
+		errCode = IXML_INSUFFICIENT_MEMORY;
 		goto ErrorHandler;
 	}
 
@@ -490,11 +481,12 @@ int ixmlDocument_createElementNSEx(
 
 ErrorHandler:
 	*rtElement = newElement;
-	if (ret != IXML_SUCCESS) {
-		IxmlPrintf(__FILE__, line, "ixmlDocument_createElementNSEx", "Error %d\n", ret);
+	if (errCode != IXML_SUCCESS) {
+		IxmlPrintf("(%s::ixmlDocument_createElementNSEx): Error %d, line %d\n",
+			__FILE__, errCode, line);
 	}
 
-	return ret;
+	return errCode;
 }
 
 

ixml/src/element.c

@@ -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: 
@@ -111,7 +110,7 @@ int ixmlElement_setAttribute(
 {
 	IXML_Node *attrNode;
 	IXML_Attr *newAttrNode;
-	int errCode = IXML_SUCCESS;
+	short errCode = IXML_SUCCESS;
 
 	if (element == NULL || name == NULL || value == NULL) {
 		errCode = IXML_INVALID_PARAMETER;
@@ -209,8 +208,7 @@ IXML_Attr *ixmlElement_getAttributeNode(IXML_Element *element, const DOMString n
 
 	attrNode = element->n.firstAttr;
 	while (attrNode != NULL) {
-		if (strcmp(attrNode->nodeName, name) == 0) {
-			/* found it */
+		if (strcmp(attrNode->nodeName, name) == 0) { // found it
 			break;
 		} else {
 			attrNode = attrNode->nextSibling;
@@ -233,42 +231,53 @@ int ixmlElement_setAttributeNode(
 	IXML_Node *preSib = NULL;
 	IXML_Node *nextSib = NULL;
 
-	if (!element || !newAttr)
+	if (element == NULL || newAttr == NULL) {
 		return IXML_INVALID_PARAMETER;
-	if (newAttr->n.ownerDocument != element->n.ownerDocument)
+	}
+
+	if (newAttr->n.ownerDocument != element->n.ownerDocument) {
 		return IXML_WRONG_DOCUMENT_ERR;
-	if (newAttr->ownerElement)
+	}
+
+	if (newAttr->ownerElement != NULL) {
 		return IXML_INUSE_ATTRIBUTE_ERR;
+	}
+
 	newAttr->ownerElement = element;
 	node = (IXML_Node *)newAttr;
+
 	attrNode = element->n.firstAttr;
-	while (attrNode) {
-		if (!strcmp(attrNode->nodeName, node->nodeName))
+	while (attrNode != NULL) {
+		if (strcmp(attrNode->nodeName, node->nodeName) == 0) {
 			/* Found it */
 			break;
-		else
+		} else {
 			attrNode = attrNode->nextSibling;
+		}
 	}
-	if (attrNode) {
+
+	if (attrNode != NULL) {
 		/* Already present, will replace by newAttr */
 		preSib = attrNode->prevSibling;
 		nextSib = attrNode->nextSibling;
-		if (preSib)
+		if (preSib != NULL) {
 			preSib->nextSibling = node;
-		if (nextSib)
+		}
+		if (nextSib != NULL) {
 			nextSib->prevSibling = node;
-		if (element->n.firstAttr == attrNode)
+		}
+		if (element->n.firstAttr == attrNode) {
 			element->n.firstAttr = node;
-		if (rtAttr)
+		}
+		if (rtAttr != NULL) {
 			*rtAttr = (IXML_Attr *)attrNode;
-		else
-			ixmlAttr_free((IXML_Attr *)attrNode);
+		}
 	} else {
 		/* Add this attribute */
-		if (element->n.firstAttr) {
+		if (element->n.firstAttr != NULL) {
 			prevAttr = element->n.firstAttr;
 			nextAttr = prevAttr->nextSibling;
-			while (nextAttr) {
+			while (nextAttr != NULL) {
 				prevAttr = nextAttr;
 				nextAttr = prevAttr->nextSibling;
 			}
@@ -280,8 +289,10 @@ int ixmlElement_setAttributeNode(
 			node->prevSibling = NULL;
 			node->nextSibling = NULL;
 		}
-		if (rtAttr)
+
+		if (rtAttr != NULL) {
 			*rtAttr = NULL;
+		}
 	}
 
 	return IXML_SUCCESS;
@@ -431,7 +442,7 @@ int ixmlElement_setAttributeNS(
 
 	/* see DOM 2 spec page 59 */
 	if ((newAttrNode.prefix != NULL && namespaceURI == NULL) ||
-	    (newAttrNode.prefix != NULL && strcmp(newAttrNode.prefix, "xml") == 0 &&
+	    (strcmp(newAttrNode.prefix, "xml") == 0 &&
 	     strcmp(namespaceURI, "http://www.w3.org/XML/1998/namespace") != 0) ||
 	    (strcmp(qualifiedName, "xmlns") == 0 &&
 	     strcmp(namespaceURI, "http://www.w3.org/2000/xmlns/") != 0)) {
@@ -455,14 +466,11 @@ int ixmlElement_setAttributeNS(
 			free(attrNode->prefix);
 		}
 		/* replace it with the new prefix */
-		if (newAttrNode.prefix != NULL) {
-			attrNode->prefix = strdup( newAttrNode.prefix );
-			if (attrNode->prefix == NULL) {
-				Parser_freeNodeContent(&newAttrNode);
-				return IXML_INSUFFICIENT_MEMORY;
-			}
-		} else
-			attrNode->prefix = newAttrNode.prefix;
+		attrNode->prefix = strdup( newAttrNode.prefix );
+		if (attrNode->prefix == NULL) {
+			Parser_freeNodeContent(&newAttrNode);
+			return IXML_INSUFFICIENT_MEMORY;
+		}
 
 		if (attrNode->nodeValue != NULL) {
 			free(attrNode->nodeValue);
@@ -481,18 +489,15 @@ int ixmlElement_setAttributeNS(
 			qualifiedName,
 			&newAttr);
 		if (rc != IXML_SUCCESS) {
-			Parser_freeNodeContent(&newAttrNode);
 			return rc;
 		}
 		newAttr->n.nodeValue = strdup(value);
 		if (newAttr->n.nodeValue == NULL) {
 			ixmlAttr_free(newAttr);
-			Parser_freeNodeContent(&newAttrNode);
 			return IXML_INSUFFICIENT_MEMORY;
 		}
-		if (ixmlElement_setAttributeNodeNS(element, newAttr, &newAttr) != IXML_SUCCESS) {
+		if (ixmlElement_setAttributeNodeNS(element, newAttr, NULL) != IXML_SUCCESS) {
 			ixmlAttr_free(newAttr);
-			Parser_freeNodeContent(&newAttrNode);
 			return IXML_FAILED;
 		}
 	}
@@ -550,8 +555,8 @@ IXML_Attr *ixmlElement_getAttributeNodeNS(
 	while (attrNode != NULL) {
 		if (strcmp(attrNode->localName, localName) == 0 &&
 		    strcmp(attrNode->namespaceURI, namespaceURI) == 0) {
-			/* found it */
-			break;
+			// found it
+		break;
 		} else {
 			attrNode = attrNode->nextSibling;
 		}

ixml/src/inc/ixmlmembuf.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: 
@@ -50,7 +49,7 @@
 #define MAXVAL(a, b) ( (a) > (b) ? (a) : (b) )
 
 
-#define MEMBUF_DEF_SIZE_INC 20u
+#define MEMBUF_DEF_SIZE_INC 20
 
 
 /*!
@@ -167,7 +166,7 @@ int ixml_membuf_insert(
 	size_t buf_len,
 	/*! [in] The point of insertion relative to the beggining of the
 	 * ixml_membuf internal buffer. */
-	size_t index);
+	int index);
 
 
 #endif /* IXML_MEMBUF_H */

ixml/src/inc/ixmlparser.h

@@ -120,25 +120,6 @@ void Parser_setErrorChar(
 	/*! [in] The character to become the error character. */
 	char c);
 
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-/*!
- * \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);
-
-/*!
- * \brief Gets the handler to call before a node is freed.
- */
-IXML_BeforeFreeNode_t Parser_getBeforeFree();
-#endif
-
 
 /*!
  * \brief Fees a node contents.

ixml/src/ixml.c

@@ -54,29 +54,37 @@ static void copy_with_escape(
 	/*! [in] The string to copy from. */
 	const char *p)
 {
-	size_t i;
-	size_t plen;
+	int i;
+	int plen;
 
-	if (p == NULL)
+	if (p == NULL) {
 		return;
-	plen = strlen(p);
-	for (i = (size_t)0; i < plen; ++i) {
+	}
+
+	plen = strlen( p );
+
+	for (i = 0; i < plen; i++) {
 		switch (p[i]) {
 		case '<':
 			ixml_membuf_append_str(buf, "&lt;");
 			break;
+
 		case '>':
 			ixml_membuf_append_str(buf, "&gt;");
 			break;
+
 		case '&':
 			ixml_membuf_append_str(buf, "&amp;");
 			break;
+
 		case '\'':
 			ixml_membuf_append_str(buf, "&apos;");
 			break;
+
 		case '\"':
 			ixml_membuf_append_str(buf, "&quot;");
 			break;
+
 		default:
 			ixml_membuf_append(buf, &p[i]);
 			break;
@@ -153,11 +161,11 @@ static void ixmlPrintDomTreeRecursive(
 			} else {
 				ixml_membuf_append_str(buf, ">");
 			}
-			/* output the children */
+			//  output the children
 			ixmlPrintDomTreeRecursive(
 				ixmlNode_getFirstChild(nodeptr), buf);
 
-			/* Done with children.  Output the end tag. */
+			// Done with children.  Output the end tag.
 			ixml_membuf_append_str(buf, "</");
 			ixml_membuf_append_str(buf, nodeName);
 
@@ -173,9 +181,9 @@ static void ixmlPrintDomTreeRecursive(
 			break;
 
 		default:
-			IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTreeRecursive",
+			IxmlPrintf("(%s::ixmlPrintDomTreeRecursive) line %d: "
 				"Warning, unknown node type %d\n",
-				(int)ixmlNode_getNodeType(nodeptr));
+				__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
 			break;
 		}
 	}
@@ -234,20 +242,20 @@ static void ixmlPrintDomTree(
 			ixml_membuf_append_str(buf, ">");
 		}
 
-		/* output the children */
+		// output the children
 		ixmlPrintDomTreeRecursive(
 			ixmlNode_getFirstChild(nodeptr), buf);
 
-		/* Done with children. Output the end tag. */
+		// 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",
+		IxmlPrintf("(%s::ixmlPrintDomTree) line %d: "
 			"Warning, unknown node type %d\n",
-			(int)ixmlNode_getNodeType(nodeptr));
+			__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
 		break;
 	}
 }
@@ -306,19 +314,19 @@ static void ixmlDomTreetoString(
 			ixml_membuf_append_str(buf, ">");
 		}
 
-		/* output the children */
+		//  output the children
 		ixmlPrintDomTreeRecursive(ixmlNode_getFirstChild(nodeptr), buf);
 
-		/* Done with children. Output the end tag. */
+		// 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",
+		IxmlPrintf("(%s::ixmlDomTreetoString) line %d: "
 			"Warning, unknown node type %d\n",
-			(int)ixmlNode_getNodeType(nodeptr));
+			__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
 		break;
 	}
 }
@@ -417,13 +425,6 @@ 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)
 {

ixml/src/ixmldebug.c

@@ -17,54 +17,15 @@
 
 #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");
-	}
+	va_start(ArgList, FmtStr);
+	vfprintf(stdout, FmtStr, ArgList);
+	fflush(stdout);
+	va_end(ArgList);
 }
-
-
-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

@@ -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: 
@@ -76,10 +75,10 @@ static int ixml_membuf_set_size(
 		diff = new_length - m->length;
 		alloc_len = MAXVAL(m->size_inc, diff) + m->capacity;
 	} else {
-		/* decrease length */
+		// decrease 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) {
 			return 0;
 		}
@@ -88,11 +87,11 @@ static int ixml_membuf_set_size(
 
 	assert(alloc_len >= new_length);
 
-	temp_buf = realloc(m->buf, alloc_len + (size_t)1);
+	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 + (size_t)1);
+		temp_buf = realloc(m->buf, alloc_len + 1);
 		if (temp_buf == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
 		}
@@ -111,8 +110,8 @@ void ixml_membuf_init(ixml_membuf *m)
 
 	m->size_inc = MEMBUF_DEF_SIZE_INC;
 	m->buf = NULL;
-	m->length = (size_t)0;
-	m->capacity = (size_t)0;
+	m->length = 0;
+	m->capacity = 0;
 }
 
 
@@ -136,21 +135,21 @@ int ixml_membuf_assign(
 
 	assert(m != NULL);
 
-	/* set value to null */
+	// set value to null
 	if (buf == NULL) {
 		ixml_membuf_destroy(m);
 		return IXML_SUCCESS;
 	}
-	/* alloc mem */
+	// alloc mem
 	return_code = ixml_membuf_set_size(m, buf_len);
 	if (return_code != 0) {
 		return return_code;
 	}
 
-	/* copy */
+	// copy
 	memcpy(m->buf, buf, buf_len);
 
-	/* null-terminate */
+	// null-terminate
 	m->buf[buf_len] = 0;
 	m->length = buf_len;
 
@@ -172,7 +171,7 @@ int ixml_membuf_append(
 {
 	assert(m != NULL);
 
-	return ixml_membuf_insert(m, buf, (size_t)1, m->length);
+	return ixml_membuf_insert(m, buf, 1, m->length);
 }
 
 
@@ -188,17 +187,17 @@ int ixml_membuf_insert(
 	INOUT ixml_membuf *m,
 	IN const void *buf,
 	IN size_t buf_len,
-	size_t index)
+	int index)
 {
 	int return_code = 0;
 
 	assert(m != NULL);
 
-	if (index > m->length) {
+	if (index < 0 || index > (int)m->length) {
 		return IXML_INDEX_SIZE_ERR;
 	}
 
-	if (buf == NULL || buf_len == (size_t)0) {
+	if (buf == NULL || buf_len == 0) {
 		return 0;
 	}
 	/* alloc mem */

ixml/src/namedNodeMap.c

@@ -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: 
@@ -54,11 +53,11 @@ static unsigned long ixmlNamedNodeMap_getItemNumber(
 	IN const char *name)
 {
 	IXML_Node *tempNode;
-	unsigned long returnItemNo = 0lu;
+	unsigned long returnItemNo = 0;
 
 	assert(nnMap != NULL && name != NULL);
 	if (nnMap == NULL || name == NULL) {
-		return (unsigned long)IXML_INVALID_ITEM_NUMBER;
+		return IXML_INVALID_ITEM_NUMBER;
 	}
 
 	tempNode = nnMap->nodeItem;
@@ -70,7 +69,7 @@ static unsigned long ixmlNamedNodeMap_getItemNumber(
 		returnItemNo++;
 	}
 
-	return (unsigned long)IXML_INVALID_ITEM_NUMBER;
+	return IXML_INVALID_ITEM_NUMBER;
 }
 
 
@@ -86,17 +85,17 @@ IXML_Node *ixmlNamedNodeMap_getNamedItem(
 	IXML_NamedNodeMap *nnMap,
 	const DOMString name)
 {
-	unsigned long index;
+	long index;
 
 	if (nnMap == NULL || name == NULL) {
 		return NULL;
 	}
 
 	index = ixmlNamedNodeMap_getItemNumber(nnMap, name);
-	if (index == (unsigned long)IXML_INVALID_ITEM_NUMBER) {
+	if (index == IXML_INVALID_ITEM_NUMBER) {
 		return NULL;
 	} else {
-		return ixmlNamedNodeMap_item(nnMap, index);
+		return ixmlNamedNodeMap_item(nnMap, (unsigned long)index);
 	}
 }
 
@@ -112,12 +111,12 @@ IXML_Node *ixmlNamedNodeMap_item(
 		return NULL;
 	}
 
-	if (index > ixmlNamedNodeMap_getLength(nnMap) - 1lu) {
+	if (index > ixmlNamedNodeMap_getLength(nnMap) - 1) {
 		return NULL;
 	}
 
 	tempNode = nnMap->nodeItem;
-	for (i = 0u; i < index && tempNode != NULL; ++i) {
+	for (i = 0; i < index && tempNode != NULL; ++i) {
 		tempNode = tempNode->nextSibling;
 	}
 
@@ -128,11 +127,11 @@ IXML_Node *ixmlNamedNodeMap_item(
 unsigned long ixmlNamedNodeMap_getLength(IXML_NamedNodeMap *nnMap)
 {
 	IXML_Node *tempNode;
-	unsigned long length = 0lu;
+	unsigned long length = 0;
 
 	if (nnMap != NULL) {
 		tempNode = nnMap->nodeItem;
-		for (length = 0lu; tempNode != NULL; ++length) {
+		for (length = 0; tempNode != NULL; ++length) {
 			tempNode = tempNode->nextSibling;
 		}
 	}
@@ -166,7 +165,7 @@ int ixmlNamedNodeMap_addToNamedNodeMap(
 	}
 
 	if (*nnMap == NULL) {
-		/* nodelist is empty */
+		// nodelist is empty
 		*nnMap = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
 		if (*nnMap == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;

ixml/src/node.c

@@ -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: 
@@ -91,13 +90,9 @@ static void ixmlNode_freeSingleNode(
 		if (nodeptr->localName != NULL) {
 			free(nodeptr->localName);
 		}
-		switch (nodeptr->nodeType ) {
-		case eELEMENT_NODE:
+		if (nodeptr->nodeType == eELEMENT_NODE) {
 			element = (IXML_Element *)nodeptr;
 			free(element->tagName);
-			break;
-		default:
-			break;
 		}
 		free(nodeptr);
 	}
@@ -107,10 +102,6 @@ static void ixmlNode_freeSingleNode(
 void ixmlNode_free(IXML_Node *nodeptr)
 {
 	if (nodeptr != NULL) {
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-		IXML_BeforeFreeNode_t hndlr = Parser_getBeforeFree();
-		if (hndlr != NULL) hndlr(nodeptr);
-#endif
 		ixmlNode_free(nodeptr->firstChild);
 		ixmlNode_free(nodeptr->nextSibling);
 		ixmlNode_free(nodeptr->firstAttr);
@@ -289,7 +280,7 @@ unsigned short ixmlNode_getNodeType(IXML_Node *nodeptr)
 	if (nodeptr != NULL) {
 		return nodeptr->nodeType;
 	} else {
-		return (unsigned short)eINVALID_NODE;
+		return eINVALID_NODE;
 	}
 }
 
@@ -406,8 +397,7 @@ static BOOL ixmlNode_isParent(
 
 	assert(nodeptr != NULL && toFind != NULL);
 
-	if (nodeptr != NULL && toFind != NULL)
-		found = toFind->parentNode == nodeptr;
+	found = toFind->parentNode == nodeptr;
 
 	return found;
 }
@@ -432,22 +422,17 @@ static BOOL ixmlNode_allowChildren(
 	case eTEXT_NODE:
 	case eCDATA_SECTION_NODE:
 		return FALSE;
+		break;
 
 	case eELEMENT_NODE:
-		switch (newChild->nodeType) {
-		case eATTRIBUTE_NODE:
-		case eDOCUMENT_NODE:
+		if (newChild->nodeType == eATTRIBUTE_NODE ||
+		    newChild->nodeType == eDOCUMENT_NODE) {
 			return FALSE;
-		default:
-			break;
 		}
 	break;
 
 	case eDOCUMENT_NODE:
-		switch (newChild->nodeType) {
-		case eELEMENT_NODE:
-			break;
-		default:
+		if (newChild->nodeType != eELEMENT_NODE) {
 			return FALSE;
 		}
 
@@ -515,7 +500,7 @@ int ixmlNode_insertBefore(
 
 	if (refChild != NULL) {
 		if (ixmlNode_isParent(nodeptr, newChild) == TRUE) {
-			ixmlNode_removeChild(nodeptr, newChild, &newChild);
+			ixmlNode_removeChild(nodeptr, newChild, NULL);
 			newChild->nextSibling = NULL;
 			newChild->prevSibling = NULL;
 		}
@@ -557,11 +542,11 @@ int ixmlNode_replaceChild(
 	if (ixmlNode_allowChildren(nodeptr, newChild) == FALSE) {
 		return IXML_HIERARCHY_REQUEST_ERR;
 	}
-	/* if newChild was created from a different document */
+	// if newChild was created from a different document 
 	if (nodeptr->ownerDocument != newChild->ownerDocument) {
 		return IXML_WRONG_DOCUMENT_ERR;
 	}
-	/* if refChild is not a child of nodeptr */
+	// if refChild is not a child of nodeptr
 	if (ixmlNode_isParent(nodeptr, oldChild) != TRUE) {
 		return IXML_NOT_FOUND_ERR;
 	}
@@ -581,23 +566,29 @@ int ixmlNode_removeChild(
 	IXML_Node *oldChild,
 	IXML_Node **returnNode)
 {
-	if (!nodeptr || !oldChild)
+	if (nodeptr == NULL || oldChild == NULL) {
 		return IXML_INVALID_PARAMETER;
-	if (!ixmlNode_isParent(nodeptr, oldChild))
+	}
+
+	if (ixmlNode_isParent(nodeptr, oldChild) == FALSE ) {
 		return IXML_NOT_FOUND_ERR;
-	if (oldChild->prevSibling)
+	}
+
+	if (oldChild->prevSibling != NULL) {
 		oldChild->prevSibling->nextSibling = oldChild->nextSibling;
-	if (nodeptr->firstChild == oldChild)
+	}
+	if (nodeptr->firstChild == oldChild) {
 		nodeptr->firstChild = oldChild->nextSibling;
-	if (oldChild->nextSibling)
+	}
+	if (oldChild->nextSibling != NULL) {
 		oldChild->nextSibling->prevSibling = oldChild->prevSibling;
+	}
 	oldChild->nextSibling = NULL;
 	oldChild->prevSibling = NULL;
 	oldChild->parentNode = NULL;
-	if (returnNode)
+	if (returnNode != NULL) {
 		*returnNode = oldChild;
-	else
-		ixmlNode_free(oldChild);
+	}
 
 	return IXML_SUCCESS;
 }
@@ -626,7 +617,7 @@ int ixmlNode_appendChild(IXML_Node *nodeptr, IXML_Node *newChild)
 	}
 
 	if (ixmlNode_isParent(nodeptr, newChild) == TRUE ) {
-		ixmlNode_removeChild(nodeptr, newChild, &newChild);
+		ixmlNode_removeChild(nodeptr, newChild, NULL);
 	}
 	/* set the parent node pointer */
 	newChild->parentNode = nodeptr;
@@ -659,7 +650,6 @@ static IXML_Node *ixmlNode_cloneTextNode(
 	IXML_Node *nodeptr)
 {
 	IXML_Node *newNode = NULL;
-	int rc;
 
 	assert(nodeptr != NULL);
 
@@ -668,16 +658,8 @@ static IXML_Node *ixmlNode_cloneTextNode(
 		return NULL;
 	} else {
 		ixmlNode_init(newNode);
-		rc = ixmlNode_setNodeName(newNode, nodeptr->nodeName);
-		if (rc != IXML_SUCCESS) {
-			ixmlNode_free(newNode);
-			return NULL;
-		}
-		rc = ixmlNode_setNodeValue(newNode, nodeptr->nodeValue);
-		if (rc != IXML_SUCCESS) {
-			ixmlNode_free(newNode);
-			return NULL;
-		}
+		ixmlNode_setNodeName(newNode, nodeptr->nodeName);
+		ixmlNode_setNodeValue(newNode, nodeptr->nodeValue);
 		newNode->nodeType = eTEXT_NODE;
 	}
 
@@ -696,24 +678,15 @@ static IXML_CDATASection *ixmlNode_cloneCDATASect(
 	IXML_CDATASection *newCDATA = NULL;
 	IXML_Node *newNode;
 	IXML_Node *srcNode;
-	int rc;
 
 	assert(nodeptr != NULL);
 	newCDATA = (IXML_CDATASection *)malloc(sizeof (IXML_CDATASection));
 	if (newCDATA != NULL) {
 		newNode = (IXML_Node *)newCDATA;
-		ixmlCDATASection_init(newCDATA);
+		ixmlNode_init(newNode);
 		srcNode = (IXML_Node *)nodeptr;
-		rc = ixmlNode_setNodeName(newNode, srcNode->nodeName);
-		if (rc != IXML_SUCCESS) {
-			ixmlCDATASection_free(newCDATA);
-			return NULL;
-		}
-		rc = ixmlNode_setNodeValue(newNode, srcNode->nodeValue);
-		if (rc != IXML_SUCCESS) {
-			ixmlCDATASection_free(newCDATA);
-			return NULL;
-		}
+		ixmlNode_setNodeName(newNode, srcNode->nodeName);
+		ixmlNode_setNodeValue(newNode, srcNode->nodeValue);
 		newNode->nodeType = eCDATA_SECTION_NODE;
 	}
 
@@ -788,29 +761,34 @@ static IXML_Element *ixmlNode_cloneElement(
 
 
 /*!
- * \brief Returns a new document node.
+ * \brief Returns a clone of a document node.
  *
- * Currently, the IXML_Document struct is just a node, so this function
- * just mallocs the IXML_Document, sets the node type and name.
- *
- * \return A new document node.
+ * \return A clone of a document node.
  */
-static IXML_Document *ixmlNode_newDoc(void)
+static IXML_Document *ixmlNode_cloneDoc(
+	/*! [in] The \b Node to clone. */
+	IXML_Document *nodeptr)
 {
 	IXML_Document *newDoc;
 	IXML_Node *docNode;
 	int rc;
 
+	assert(nodeptr != NULL);
+
 	newDoc = (IXML_Document *)malloc(sizeof (IXML_Document));
-	if (!newDoc)
+	if (newDoc == NULL) {
 		return NULL;
+	}
+
 	ixmlDocument_init(newDoc);
-	docNode = (IXML_Node *)newDoc;
+	docNode = (IXML_Node *) newDoc;
+
 	rc = ixmlNode_setNodeName(docNode, DOCUMENTNODENAME);
 	if (rc != IXML_SUCCESS) {
 		ixmlDocument_free(newDoc);
 		return NULL;
 	}
+
 	newDoc->n.nodeType = eDOCUMENT_NODE;
 
 	return newDoc;
@@ -938,8 +916,6 @@ static IXML_Node *ixmlNode_cloneNodeTreeRecursive(
 		switch (nodeptr->nodeType) {
 		case eELEMENT_NODE:
 			newElement = ixmlNode_cloneElement((IXML_Element *)nodeptr);
-			if (newElement == NULL)
-				return NULL;
 			newElement->n.firstAttr = ixmlNode_cloneNodeTreeRecursive(
 				nodeptr->firstAttr, deep);
 			if (deep) {
@@ -960,8 +936,6 @@ static IXML_Node *ixmlNode_cloneNodeTreeRecursive(
 
 		case eATTRIBUTE_NODE:
 			newAttr = ixmlNode_cloneAttr((IXML_Attr *)nodeptr);
-			if (newAttr == NULL)
-				return NULL;
 			nextSib = ixmlNode_cloneNodeTreeRecursive(nodeptr->nextSibling, deep);
 			newAttr->n.nextSibling = nextSib;
 			if (nextSib != NULL) {
@@ -980,9 +954,7 @@ static IXML_Node *ixmlNode_cloneNodeTreeRecursive(
 			break;
 
 		case eDOCUMENT_NODE:
-			newDoc = ixmlNode_newDoc();
-			if (newDoc == NULL)
-				return NULL;
+			newDoc = ixmlNode_cloneDoc((IXML_Document *)nodeptr);
 			newNode = (IXML_Node *)newDoc;
 			if (deep) {
 				newNode->firstChild = ixmlNode_cloneNodeTreeRecursive(
@@ -1029,8 +1001,6 @@ static IXML_Node *ixmlNode_cloneNodeTree(
 	switch (nodeptr->nodeType) {
 	case eELEMENT_NODE:
 		newElement = ixmlNode_cloneElement((IXML_Element *)nodeptr);
-		if (newElement == NULL)
-			return NULL;
 		newElement->n.firstAttr = ixmlNode_cloneNodeTreeRecursive(nodeptr->firstAttr, deep);
 		if (deep) {
 			newElement->n.firstChild = ixmlNode_cloneNodeTreeRecursive(
@@ -1071,8 +1041,7 @@ static IXML_Node *ixmlNode_cloneNodeTree(
 	}
 
 	/* by spec, the duplicate node has no parent */
-	if (newNode != NULL)
-		newNode->parentNode = NULL;
+	newNode->parentNode = NULL;
 
 	return newNode;
 }
@@ -1143,8 +1112,7 @@ IXML_NamedNodeMap *ixmlNode_getAttributes(IXML_Node *nodeptr)
 		return NULL;
 	}
 
-	switch(nodeptr->nodeType) {
-	case eELEMENT_NODE:
+	if(nodeptr->nodeType == eELEMENT_NODE) {
 		returnNamedNodeMap = (IXML_NamedNodeMap *)malloc(sizeof(IXML_NamedNodeMap));
 		if(returnNamedNodeMap == NULL) {
 			return NULL;
@@ -1162,7 +1130,7 @@ IXML_NamedNodeMap *ixmlNode_getAttributes(IXML_Node *nodeptr)
 			tempNode = tempNode->nextSibling;
 		}
 		return returnNamedNodeMap;
-	default:
+	} else {
 		/* if not an ELEMENT_NODE */
 		return NULL;
 	}
@@ -1182,13 +1150,8 @@ BOOL ixmlNode_hasChildNodes(IXML_Node *nodeptr)
 BOOL ixmlNode_hasAttributes(IXML_Node *nodeptr)
 {
 	if (nodeptr != NULL) {
-		switch (nodeptr->nodeType) {
-		case eELEMENT_NODE:
-			if (nodeptr->firstAttr != NULL)
-				return TRUE;
-			break;
-		default:
-			break;
+		if (nodeptr->nodeType == eELEMENT_NODE && nodeptr->firstAttr != NULL) {
+			return TRUE;
 		}
 	}
 
@@ -1343,10 +1306,7 @@ int ixmlNode_setNodeProperties(
 {
 	int rc;
 
-	assert(destNode != NULL && src != NULL);
-	if(destNode == NULL || src == NULL) {
-		return IXML_INVALID_PARAMETER;
-	}
+	assert(destNode != NULL || src != NULL);
 
 	rc = ixmlNode_setNodeValue(destNode, src->nodeValue);
 	if(rc != IXML_SUCCESS) {
@@ -1384,17 +1344,3 @@ ErrorHandler:
 	return IXML_INSUFFICIENT_MEMORY;
 }
 
-#ifdef IXML_HAVE_SCRIPTSUPPORT
-void ixmlNode_setCTag(IXML_Node *nodeptr, void *ctag)
-{
-	if (nodeptr != NULL) nodeptr->ctag = ctag;
-}
-
-void* ixmlNode_getCTag(IXML_Node *nodeptr)
-{
-	if (nodeptr != NULL)
-		return nodeptr->ctag;
-	else
-		return NULL;
-}
-#endif

ixml/src/nodeList.c

@@ -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: 
@@ -58,17 +57,17 @@ IXML_Node *ixmlNodeList_item(
 	IXML_NodeList *next;
 	unsigned int i;
 
-	/* if the list ptr is NULL */
+	// if the list ptr is NULL
 	if (nList == NULL) {
 		return NULL;
 	}
-	/* if index is more than list length */
-	if (index > ixmlNodeList_length(nList) - 1lu) {
+	// if index is more than list length
+	if (index > ixmlNodeList_length(nList) - 1) {
 		return NULL;
 	}
 
 	next = nList;
-	for (i = 0u; i < index && next != NULL; ++i) {
+	for (i = 0; i < index && next != NULL; ++i) {
 		next = next->next;
 	}
 
@@ -94,7 +93,7 @@ int ixmlNodeList_addToNodeList(
 	}
 
 	if (*nList == NULL) {
-		/* nodelist is empty */
+		// nodelist is empty
 		*nList = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
 		if (*nList == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
@@ -128,7 +127,7 @@ int ixmlNodeList_addToNodeList(
 unsigned long ixmlNodeList_length(IXML_NodeList *nList)
 {
 	IXML_NodeList *list;
-	unsigned long length = 0lu;
+	unsigned long length = 0;
 
 	list = nList;
 	while (list != NULL) {

libupnp.spec

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

threadutil/Makefile.am

@@ -1,11 +1,11 @@
+# $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 \
-                          -I$(top_srcdir)/upnp/inc
+AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
 
 if ENABLE_DEBUG
     AM_CPPFLAGS		+= -DDEBUG -DSTATS
@@ -19,16 +19,12 @@ lib_LTLIBRARIES		= libthreadutil.la
 libthreadutil_la_LDFLAGS = -version-info $(LT_VERSION_THREADUTIL)
 
 libthreadutil_la_SOURCES = \
-			inc/FreeList.h \
-			src/FreeList.c \
-			inc/LinkedList.h \
-			src/LinkedList.c \
-			inc/ThreadPool.h \
-			src/ThreadPool.c \
-			inc/TimerThread.h \
-			src/TimerThread.c
+			src/FreeList.c src/LinkedList.c \
+			src/ThreadPool.c src/TimerThread.c
 
 upnpincludedir		= $(includedir)/upnp
 upnpinclude_HEADERS	= \
+			inc/FreeList.h inc/LinkedList.h \
+			inc/ThreadPool.h inc/TimerThread.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.
- * Memory for node is borrowed from allocated items.
- * \internal
- */
+/****************************************************************************
+ * Name: FreeListNode
+ *
+ *  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.
- *
- * \return:
- *	\li \c 0 on success.
- *	\li \c EINVAL on failure.
- */
-int FreeListInit(
-	/*! Must be valid, non null, pointer to a linked list. */
-	FreeList *free_list,
-	/*! Size of elements to store in free list. */
-	size_t elementSize,
-	/*! Max size that the free list can grow to before returning
-	 * memory to O.S. */
-	int maxFreeListLength);
+ *  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 maxFreeListSize);
 
-/*!
- * \brief Allocates chunk of set size.
+/****************************************************************************
+ * Function: FreeListAlloc
  *
- * If a free item is available in the list, returnes the stored item,
- * otherwise calls the O.S. to allocate memory.
- *
- * \return Non NULL on success. NULL on failure.
- */
-void *FreeListAlloc(
-	/*! Must be valid, non null, pointer to a linked list. */
-	FreeList *free_list);
+ *  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);
 
-/*!
- * \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
- * free list, otherwise returns the item to the O.S.
- *
- * \return:
- *	\li \c 0 on success.
- *	\li \c EINVAL on failure.
- */
-int FreeListFree(
-	/*! Must be valid, non null, pointer to a free list. */
-	FreeList *free_list,
-	/*! Must be a pointer allocated by FreeListAlloc. */
-	void *element);
+ *  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 linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int FreeListFree (FreeList *free_list,void * element);
 
-/*!
- * \brief Releases the resources stored with the free list.
+/****************************************************************************
+ * Function: FreeListDestroy
  *
- * \return:
- *	\li \c 0 on success.
- *	\li \c EINVAL on failure.
- */
-int FreeListDestroy(
-	/*! Must be valid, non null, pointer to a linked list. */
-	FreeList *free_list);
+ *  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);
+
 
 #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 *next;
-	void *item;
+  struct LISTNODE *prev;
+  struct LISTNODE *next;
+  void *item;
 } ListNode;
 
-/*!
- * Linked list (no protection).
+/****************************************************************************
+ * Name: LinkedList
  *
- * Because this is for internal use, parameters are NOT checked for validity.
- * 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:
+ *  Description:
+ *      linked list (no protection). Internal Use Only.
+ *      Because this is for internal use, parameters are NOT checked for 
+ *      validity.
+ *      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;
- *	ListNode *temp = NULL;
- *	for (temp = ListHead(g);temp!=NULL;temp = ListNext(g,temp)) {
- *	}
+ *       LinkedList g;
+ *       ListNode *temp = NULL;
+ *       for (temp = ListHead(g);temp!=NULL;temp = ListNext(g,temp))
+ *       {
+ *        }
  *
- * \internal
- */
+ *****************************************************************************/
 typedef struct LINKEDLIST
 {
-	/*! head, first item is stored at: head->next */
-	ListNode head;
-	/*! tail, last item is stored at: tail->prev  */
-	ListNode tail;
-	/*! size of list */
-	long size;
-	/*! free list to use */
-	FreeList freeNodeList;
-	/*! free function to use */
-	free_function free_func;
-	/*! compare function to use */
-	cmp_routine cmp_func;
+  ListNode head; /* head, first item is stored at: head->next */
+  ListNode tail; /* tail, last item is stored at: tail->prev  */
+  long size;     /* size of list */
+  FreeList freeNodeList;   /* free list to use */
+  free_function free_func; /* free function to use */
+  cmp_routine cmp_func;    /* compare function to use */
 } LinkedList;
 
-/*!
- * \brief Initializes LinkedList. Must be called first and only once for List.
- * 
- *  \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.
+/****************************************************************************
+ * 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);
+
+/****************************************************************************
+ * 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(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item);
+ *****************************************************************************/
+ListNode *ListAddHead(LinkedList *list, void *item);
 
-/*!
- * \brief Adds a node to the tail of the list. Node gets added immediately
- * before list.tail.
+/****************************************************************************
+ * Function: ListAddTail
  *
- * Precondition: The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddTail(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item);
+ *  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);
 
-/*!
- * \brief Adds a node after the specified node. Node gets added immediately
- * after bnode.
+/****************************************************************************
+ * Function: ListAddAfter
  *
- *  Precondition: The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddAfter(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item,
-	/*! Node to add after. */
-	ListNode *bnode);
+ *  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);
 
-/*!
- * \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.
- *
- * \return The pointer to the item stored in the node or NULL if the item
- * is freed.
- */
-void *ListDelNode(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Node to delete. */
-	ListNode *dnode,
-	/*! if !0 then item is freed using free function. If 0 (or free
-	 * function is NULL) then item is not freed. */
-	int freeItem);
+ *  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);
 
-/*!
- * \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.
- *
- * \return The head of the list. NULL if list is empty.
- */
-ListNode *ListHead(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list);
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      freeItem - if !0 then items are freed using the free_function.
+ *                 if 0 (or free function is NULL) then items are not freed.
+ *  Returns:
+ *      0 on success. Always returns 0.
+ *  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.
- *
- * \return The tail of the list. NULL if list is empty.
- */
-ListNode *ListTail(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *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);
 
-/*!
- * \brief Returns the next item in the list.
+/****************************************************************************
+ * Function: ListTail
+ *
+ *  Description:
+ *      Returns the tail of the list.
  *    
- * Precondition: The list has been initialized.
- *
- * \return The next item in the list. NULL if there are no more items in list.
- */
-ListNode *ListNext(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Node from the list. */
-	ListNode *node);
+ *  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);
 
-/*!
- * \brief Returns the previous item in the list.
+/****************************************************************************
+ * Function: ListNext
+ *
+ *  Description:
+ *      Returns the next item in the list.
  *    
- * Precondition: The list has been initialized.
- *
- * \return The previous item in the list. NULL if there are no more items in list.
- */
-ListNode *ListPrev(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Node from the list. */
-	ListNode *node);
+ *  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);
 
-/*!
- * \brief Finds the specified item in the list.
+/****************************************************************************
+ * Function: ListPrev
  *
- * Uses the compare function specified in ListInit. If compare function
- * is NULL then compares items as pointers.
- *
- * Precondition: The list has been initialized.
- *
- * \return The node containing the item. NULL if no node contains the item.
- */
-ListNode* ListFind(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! The node to start from, NULL if to start from beginning. */
-	ListNode *start,
-	/*! The item to search for. */
-	void *item);
+ *  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);
 
-/*!
- * \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.
- */
-long ListSize(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList* list);
+ *  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);
+
 
 #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: 
@@ -30,21 +29,26 @@
  *
  ******************************************************************************/
 
+
 #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
@@ -59,63 +63,82 @@
 	#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 */
 #define JOBFREELISTSIZE 100
 
+
 #define INFINITE_THREADS -1
 
+
 #define EMAXTHREADS (-8 & 1<<29)
 
+
 /*! Invalid Policy */
 #define INVALID_POLICY (-9 & 1<<29)
 
+
 /*! Invalid JOB Id */
 #define INVALID_JOB_ID (-2 & 1<<29)
 
+
 typedef enum duration {
 	SHORT_TERM,
 	PERSISTENT
 } Duration;
 
+
 typedef enum priority {
 	LOW_PRIORITY,
 	MED_PRIORITY,
 	HIGH_PRIORITY
 } ThreadPriority;
 
+
 /*! default priority used by TPJobInit */
 #define DEFAULT_PRIORITY MED_PRIORITY
 
+
 /*! default minimum used by TPAttrInit */
 #define DEFAULT_MIN_THREADS 1
 
+
 /*! default max used by TPAttrInit */
 #define DEFAULT_MAX_THREADS 10
 
+
 /*! default stack size used by TPAttrInit */
-#define DEFAULT_STACK_SIZE 0u
+#define DEFAULT_STACK_SIZE 0
+
 
 /*! default jobs per thread used by TPAttrInit */
 #define DEFAULT_JOBS_PER_THREAD 10
 
+
 /*! default starvation time used by TPAttrInit */
 #define DEFAULT_STARVATION_TIME	500
 
+
 /*! 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.
  *
@@ -123,54 +146,88 @@ typedef enum priority {
  */
 #define STATS 1
 
+
 #ifdef _DEBUG
 	#define DEBUG 1
 #endif
 
+
 typedef int PolicyType;
 
+
 #define DEFAULT_POLICY SCHED_OTHER
 
-/*! 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
- * pool. */
+/****************************************************************************
+ * Name: ThreadPoolAttr
+ *
+ *  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. */
+	/* minThreads, ThreadPool will always maintain at least this many threads */
 	int minThreads;
-	/*! ThreadPool will never have more than this number of threads. */
+
+	/* maxThreads, ThreadPool will never have more than this number of threads */
 	int maxThreads;
-	/*! This is the minimum stack size allocated for each thread. */
+
+	/* stackSize (in bytes), this is the minimum stack size allocated for each
+	 * thread */
 	size_t stackSize;
-	/*! This is the maximum time a thread will
-	 * remain idle before dying (in milliseconds). */
+
+	/* maxIdleTime (in milliseconds) this is the maximum time a thread will
+	 * remain idle before dying */
 	int maxIdleTime;
-	/*! Jobs per thread to maintain. */
+
+	/* jobs per thread to maintain */
 	int jobsPerThread;
-	/*! Maximum number of jobs that can be queued totally. */
+
+	/* maximum number of jobs that can be queued totally. */
 	int maxJobsTotal;
-	/*! the time a low priority or med priority job waits before getting
-	 * bumped up a priority (in milliseconds). */
+
+	/* the time a low priority or med priority job waits before getting bumped
+	 * up a priority (in milliseconds) */
 	int starvationTime;
-	/*! scheduling policy to use. */
+
+	/* scheduling policy to use */
 	PolicyType schedPolicy;
 } ThreadPoolAttr;
 
-/*! Internal ThreadPool Job. */
+
+/****************************************************************************
+ * Name: ThreadPool
+ *
+ *  Description:
+ *     Internal ThreadPool Job
+ *****************************************************************************/
 typedef struct THREADPOOLJOB
 {
 	start_routine func;
 	void *arg;
 	free_routine free_func;
 	struct timeval requestTime;
-	ThreadPriority priority;
+	int priority;
 	int jobId;
 } ThreadPoolJob;
 
-/*! Structure to hold statistics. */
+
+/****************************************************************************
+ * Name: ThreadPoolStats
+ *
+ *  Description:
+ *     Structure to hold statistics
+ *****************************************************************************/
 typedef struct TPOOLSTATS
 {
 	double totalTimeHQ;
@@ -194,6 +251,7 @@ typedef struct TPOOLSTATS
 	int currentJobsMQ;
 } ThreadPoolStats;
 
+
 /*!
  * \brief A thread pool similar to the thread pool in the UPnP SDK.
  *
@@ -211,326 +269,374 @@ typedef struct TPOOLSTATS
  */
 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 */
+	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 busyThreads;		/* number of threads that are currently executing jobs */
+	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 */
+
+	/* 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.
+/****************************************************************************
+ * Function: ThreadPoolInit
  *
- * Job will be run as soon as possible. Call will block until job is scheduled.
+ *  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.
  * 
- * \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);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: ThreadPoolGetAttr
  *
- * \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);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: ThreadPoolSetAttr
  *
- * \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);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: ThreadPoolAdd
  *
- * \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);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: ThreadPoolRemove
  *
- * \return Always returns 0.
- */
-int TPJobSetFreeFunction(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! value to set. */
-	free_routine func);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: ThreadPoolShutdown
  *
- * \return Always returns 0.
- */
-int TPAttrSetMinThreads(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	int minThreads);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: TPJobInit
  *
- * \return Always returns 0.
- */
-int TPAttrSetIdleTime(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! . */
-	int idleTime);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: TPJobSetPriority
  *
- * \return Always returns 0.
- */
-int TPAttrSetStarvationTime(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! milliseconds. */
-	int starvationTime);
+ *  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);
 
-/*!
- * \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.
+/****************************************************************************
+ * Function: TPJobSetFreeFunction
  *
- * \return Always returns 0.
- */
-int TPAttrSetMaxJobsTotal(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! maximum number of jobs. */
-	int maxJobsTotal);
+ *  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);
 
-/*!
- * \brief Returns various statistics about the thread pool.
+
+/****************************************************************************
+ * Function: TPAttrInit
  *
- * Only valid if STATS has been defined.
+ *  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
  *
- * \return Always returns 0.
- */
+ *  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: TPAttrSetStackSize
+ *
+ *  Description:
+ *      Sets the stack size for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.
+ *      stackSize - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetStackSize(ThreadPoolAttr *attr, size_t stackSize);
+
+
+/****************************************************************************
+ * 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_SPEC int ThreadPoolGetStats(
-		/*! Valid initialized threadpool. */
-		ThreadPool *tp,
-		/*! Valid stats, out parameter. */
-		ThreadPoolStats *stats);
+	EXPORT_SPEC int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
+
+	EXPORT_SPEC void ThreadPoolPrintStats(ThreadPoolStats *stats);
 #else
-	static UPNP_INLINE int ThreadPoolGetStats(
-		/*! Valid initialized threadpool. */
-		ThreadPool *tp,
-		/*! Valid stats, out parameter. */
-		ThreadPoolStats *stats) {}
+	static UPNP_INLINE int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats) {}
+
+	static UPNP_INLINE void ThreadPoolPrintStats(ThreadPoolStats *stats) {}
 #endif
 
-/*!
- * \brief
- */
-#ifdef STATS
-	EXPORT_SPEC void ThreadPoolPrintStats(
-		/*! . */
-		ThreadPoolStats *stats);
-#else
-	static UPNP_INLINE void ThreadPoolPrintStats(
-		/*! . */
-		ThreadPoolStats *stats) {}
-#endif
 
 #ifdef __cplusplus
 }
 #endif
 
+
 #endif /* THREADPOOL_H */
 

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. */
-typedef enum timeoutType {
-	/*! seconds from Jan 1, 1970. */
-	ABS_SEC,
-	/*! seconds from current time. */
-	REL_SEC
-} TimeoutType;
+/* Timeout Types */
+/* absolute means in seconds from Jan 1, 1970 */
+/* relative means in seconds from current time */
+typedef enum timeoutType {ABS_SEC,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.
- *
- * Because the timer thread uses the thread pool there is no 
- * gurantee of timing, only approximate timing.
- *
- * Uses ThreadPool, Mutex, Condition, Thread.
- */
+
+/****************************************************************************
+ * Name: TimerThread
+ * 
+ *   Description:
+ *     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
+ *     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_cond_t condition;
-	int lastEventId;
-	LinkedList eventQ;
-	int shutdown;
-	FreeList freeEvents;
-	ThreadPool *tp;
+  ithread_mutex_t mutex;
+  ithread_cond_t condition;
+  int lastEventId;
+  LinkedList eventQ;
+  int shutdown;
+  FreeList freeEvents;
+  ThreadPool *tp;
 } TimerThread;
 
-/*!
- * Struct to contain information for a timer event.
- *
- * Internal to the TimerThread.
- */
+
+/****************************************************************************
+ * Name: TimerEvent
+ * 
+ *   Description:
+ *     
+ *     Struct to contain information for a timer event.
+ *     Internal to the TimerThread
+ *   
+ *****************************************************************************/
 typedef struct TIMEREVENT
 {
-	ThreadPoolJob job;
-	/*! [in] Absolute time for event in seconds since Jan 1, 1970. */
-	time_t eventTime;
-	/*! [in] Long term or short term job. */
-	Duration persistent;
-	int id;
+  ThreadPoolJob job;
+  time_t eventTime; /* absolute time for event in seconds since Jan 1, 1970 */
+  Duration persistent;  /* long term or short term job */
+  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.
- */
-int TimerThreadShutdown(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer);
+ *  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.
+ *             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/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,43 @@
  *
  ******************************************************************************/
 
+
+#ifndef ITHREAD_H
+#define ITHREAD_H
+
+
 /*!
  * \file
  */
 
+
 #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>
+#ifdef WIN32
+	/* Do not #include <unistd.h> */
+#else
+	#include <unistd.h>
+#endif
+
+
+#if defined(BSD)
 	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif
 
 
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#ifdef PTHREAD_MUTEX_RECURSIVE
 	/* This system has SuS2-compliant mutex attributes.
 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
 	 */
@@ -77,8 +87,7 @@ extern "C" {
 
 
 #define ITHREAD_STACK_MIN PTHREAD_STACK_MIN
-#define ITHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED
-#define ITHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE
+
 
 /***************************************************************************
  * Name: ithread_t
@@ -179,10 +188,7 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
  *      Internal Use Only
  ***************************************************************************/
 #if UPNP_USE_RWLOCK
-	typedef pthread_rwlock_t ithread_rwlock_t;
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	typedef ithread_mutex_t ithread_rwlock_t;
+typedef pthread_rwlock_t ithread_rwlock_t;
 #endif /* UPNP_USE_RWLOCK */
 
 
@@ -200,6 +206,10 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
 static UPNP_INLINE int ithread_initialize_library(void) {
 	int ret = 0;
 
+#if defined(WIN32) && defined(PTW32_STATIC_LIB)
+	ret = !pthread_win32_process_attach_np();
+#endif
+
 	return ret;
 }
 
@@ -218,6 +228,10 @@ static UPNP_INLINE int ithread_initialize_library(void) {
 static UPNP_INLINE int ithread_cleanup_library(void) {
 	int ret = 0;
 
+#if defined(WIN32) && defined(PTW32_STATIC_LIB)
+	ret = !pthread_win32_process_detach_np();
+#endif
+
 	return ret;
 }
 
@@ -319,11 +333,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 +358,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
 
   
 /****************************************************************************
@@ -522,10 +536,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *****************************************************************************/
 #if UPNP_USE_RWLOCK
 	#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
+#endif /* UPNP_USE_RWLOCK */
+
 
 /****************************************************************************
  * Function: ithread_rwlock_rdlock
@@ -543,11 +555,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *****************************************************************************/
 #if UPNP_USE_RWLOCK
 	#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
  *
@@ -564,9 +574,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *****************************************************************************/
 #if UPNP_USE_RWLOCK
 	#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 */
 
 
@@ -587,9 +594,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *****************************************************************************/
 #if UPNP_USE_RWLOCK
 	#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 */
 
 
@@ -611,9 +615,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *****************************************************************************/
 #if UPNP_USE_RWLOCK
 	#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 */
 
 
@@ -772,22 +773,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #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
    *
@@ -932,8 +917,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #endif
 
 
-#if !defined(PTHREAD_MUTEX_RECURSIVE) && !defined(__DragonFly__) && !defined(UPNP_USE_MSVCPP)
-/* !defined(UPNP_USE_MSVCPP) should probably also have pthreads version check - but it's not clear if that is possible */
+#ifndef PTHREAD_MUTEX_RECURSIVE
 /* NK: Added for satisfying the gcc compiler */
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
 #endif

threadutil/src/FreeList.c

@@ -1,111 +1,177 @@
-/**************************************************************************
- *
- * 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.
- *
- **************************************************************************/
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 "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)
-		return EINVAL;
-	free_list->element_size = elementSize;
-	free_list->maxFreeListLength = maxFreeListLength;
-	free_list->head = NULL;
-	free_list->freeListLength = 0;
+    if( free_list == NULL )
+        return EINVAL;
 
-	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)
-		return NULL;
+    if( free_list == NULL )
+        return NULL;
 
-	if (free_list->head) {
-		ret = free_list->head;
-		free_list->head = free_list->head->next;
-		free_list->freeListLength--;
-	} else {
-		ret = malloc(free_list->element_size);
-	}
+    if( free_list->head ) {
+        ret = free_list->head;
+        free_list->head = free_list->head->next;
+        free_list->freeListLength--;
+    } else {
+        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)
-		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);
-	}
+    assert( free_list != NULL );
 
-	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;
-	int i = 0;
+    FreeListNode *temp = NULL;
+    int i = 0;
 
-	assert(free_list != NULL);
+    assert( free_list != NULL );
 
-	if (!free_list)
-		return EINVAL;
-	while (free_list->head) {
-		i++;
-		temp = free_list->head->next;
-		free(free_list->head);
-		free_list->head = temp;
-	}
-	free_list->freeListLength = 0;
+    if( free_list == NULL )
+        return EINVAL;
 
-	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,537 @@
-/**************************************************************************
- *
- * 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: 
- *
- * - 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.
- *
- **************************************************************************/
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 "LinkedList.h"
-
-#ifdef WIN32
-	/* Do not #include <sys/param.h> */
-#else
+#ifndef WIN32
 	#include <sys/param.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(
-	/*! the item to store. */
-	void *item,
-	/*! The list to add it to. */
-	LinkedList *list)
+ *****************************************************************************/
+static ListNode *
+CreateListNode( void *item,
+                LinkedList * list )
 {
-	ListNode *temp = NULL;
 
-	assert(list != NULL);
+    ListNode *temp = NULL;
 
-	temp = (ListNode *)FreeListAlloc(&list->freeNodeList);
-	if (temp) {
-		temp->prev = NULL;
-		temp->next = NULL;
-		temp->item = item;
-	}
+    assert( list != NULL );
 
-	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)
-		return EINVAL;
-	list->size = 0;
-	list->cmp_func = cmp_func;
-	list->free_func = free_func;
-	retCode = FreeListInit(&list->freeNodeList, sizeof(ListNode), FREELISTSIZE);
+    assert( list != NULL );
 
-	assert(retCode == 0);
+    if( list == NULL )
+        return EINVAL;
 
-	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;
+    list->size = 0;
+    list->cmp_func = cmp_func;
+    list->free_func = free_func;
 
-	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)
-	return NULL;
+    if( list == 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)
-		return NULL;
+    if( list == 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)
-		return NULL;
-	newNode = CreateListNode(item, list);
-	if (newNode) {
-		ListNode *temp = bnode->next;
+    if( ( list == NULL ) || ( bnode == NULL ) )
+        return NULL;
 
-		bnode->next = newNode;
-		newNode->prev = bnode;
-		newNode->next = temp;
-		temp->prev = newNode;
-		list->size++;
+    newNode = CreateListNode( item, list );
+    if( newNode ) {
+        ListNode *temp = bnode->next;
 
-		return newNode;
-	}
-
-	return NULL;
+        bnode->next = newNode;
+        newNode->prev = bnode;
+        newNode->next = temp;
+        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)
-		return NULL;
-	newNode = CreateListNode(item, list);
-	if (newNode) {
-		ListNode *temp = anode->prev;
+    if( ( list == NULL ) || ( anode == NULL ) )
+        return NULL;
 
-		anode->prev = newNode;
-		newNode->next = anode;
-		newNode->prev = temp;
-		temp->next = newNode;
-		list->size++;
+    newNode = CreateListNode( item, list );
 
-		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(dnode != &list->head);
-	assert(dnode != &list->tail);
+    assert( list != NULL );
+    assert( dnode != &list->head );
+    assert( dnode != &list->tail );
 
-	if (!list || dnode == &list->head || dnode == &list->tail || !dnode)
-		return NULL;
-	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;
-	}
+    if( ( list == NULL ) ||
+        ( dnode == &list->head ) ||
+        ( dnode == &list->tail ) || ( dnode == NULL ) ) {
+        return 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 *temp = NULL;
+    ListNode *dnode = NULL;
+    ListNode *temp = NULL;
 
-	if(!list)
-		return EINVAL;
+    if( list == NULL )
+        return EINVAL;
 
-	for (dnode = list->head.next; dnode != &list->tail; ) {
-		temp = dnode->next;
-		ListDelNode(list, dnode, freeItem);
-		dnode = temp;
-	}
-	list->size = 0;
-	FreeListDestroy(&list->freeNodeList);
+    for( dnode = list->head.next; dnode != &list->tail; ) {
+        temp = dnode->next;
+        ListDelNode( list, dnode, freeItem );
+        dnode = temp;
+    }
 
-	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)
-		return NULL;
+    if( list == NULL )
+        return NULL;
 
-	if (!list->size)
-		return NULL;
-	else
-		return list->head.next;
+    if( list->size == 0 )
+        return NULL;
+    else
+        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)
-		return NULL;
+    if( list == NULL )
+        return NULL;
 
-	if (!list->size)
-		return NULL;
-	else
-		return list->tail.prev;
+    if( list->size == 0 )
+        return NULL;
+    else
+        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(node != NULL);
+    assert( list != NULL );
+    assert( node != NULL );
 
-	if (!list || !node)
-		return NULL;
-	if (node->next == &list->tail)
-		return NULL;
-	else
-		return node->next;
+    if( ( list == NULL ) || ( node == NULL ) )
+        return NULL;
+
+    if( node->next == &list->tail )
+        return NULL;
+    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(node != NULL);
+    assert( list != NULL );
+    assert( node != NULL );
 
-	if (!list || !node)
-		return NULL;
+    if( ( list == NULL ) || ( node == NULL ) )
+        return NULL;
 
-	if (node->prev == &list->head)
-		return NULL;
-	else
-		return node->prev;
+    if( node->prev == &list->head )
+        return NULL;
+    else
+        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)
-		return NULL;
-	if (!start)
-		start = &list->head;
+    ListNode *finger = NULL;
 
-	assert(start);
+    if( list == NULL )
+        return NULL;
 
-	finger = start->next;
+    if( start == NULL )
+        start = &list->head;
 
-	assert(finger);
+    assert( start );
 
-	while (finger != &list->tail) {
-		if (list->cmp_func) {
-			if (list->cmp_func(item, finger->item))
-				return finger;
-		} else {
-			if (item == finger->item)
-				return finger;
-		}
-		finger = finger->next;
-	}
+    finger = start->next;
+
+    assert( finger );
+
+    while( finger != &list->tail ) {
+        if( list->cmp_func ) {
+            if( list->cmp_func( item, finger->item ) )
+                return finger;
+        } 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)
-		return EINVAL;
+    if( list == NULL )
+        return EINVAL;
 
-	return list->size;
+    return list->size;
 }
 

threadutil/src/TimerThread.c

@@ -1,173 +1,203 @@
-/*******************************************************************************
- *
- * 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: 
- *
- * - 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.
- *
- ******************************************************************************/
-
-/*!
- * \file
- */
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 "TimerThread.h"
-
 #include <assert.h>
 
-/*!
- * \brief Deallocates a dynamically allocated TimerEvent.
- */
-static void FreeTimerEvent(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] Must be allocated with CreateTimerEvent*/
-	TimerEvent *event)
+/****************************************************************************
+ * Function: FreeTimerEvent
+ *
+ *  Description:
+ *      Deallocates a dynamically allocated TimerEvent.
+ *  Parameters:
+ *      TimerEvent *event - must be allocated with CreateTimerEvent
+ *****************************************************************************/
+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.
- */
-static void *TimerThreadWorker(
-	/*! [in] arg is cast to (TimerThread *). */
-	void *arg)
+ *  Description:
+ *      Implements timer thread.
+ *      Waits for next event to occur and schedules
+ *      associated job into threadpool.
+ *      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 */
-	/* Check for shutdown. */
-        if (timer->shutdown) {
+
+    while( 1 )
+    {
+
+        //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. */
-        if (nextEvent && currentTime >= nextEventTime) {
+
+        currentTime = time( NULL );
+
+        //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) {
-				nextEvent->job.free_func(nextEvent->job.arg);
-			}
-		}
+
+                ThreadPoolAddPersistent( timer->tp, &nextEvent->job,
+                                         &tempId );
             } else {
-                if (ThreadPoolAdd( timer->tp, &nextEvent->job, &tempId ) != 0) {
-			if (nextEvent->job.arg != NULL && nextEvent->job.free_func != NULL) {
-				nextEvent->job.free_func(nextEvent->job.arg);
-			}
-		}
+
+                ThreadPoolAdd( timer->tp, &nextEvent->job, &tempId );
             }
+
             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 );
         }
+
     }
 }
 
-
-/*!
- * \brief Calculates the appropriate timeout in absolute seconds
- * since Jan 1, 1970.
+/****************************************************************************
+ * Function: CalculateEventTime
  *
- * \return 
- */
-static int CalculateEventTime(
-	/*! [in] Timeout. */
-	time_t *timeout,
-	/*! [in] Timeout type. */
-	TimeoutType type)
+ *  Description:
+ *      Calculates the appropriate timeout in absolute seconds since
+ *      Jan 1, 1970
+ *      Internal Only.
+ *  Parameters:
+ *      time_t *timeout - timeout
+ *      
+ *****************************************************************************/
+static int
+CalculateEventTime( time_t * timeout,
+                    TimeoutType type )
 {
     time_t now;
 
     assert( timeout != NULL );
 
-    switch (type) {
-    case ABS_SEC:
+    if( type == ABS_SEC )
         return 0;
-    default: /* REL_SEC) */
-        time(&now);
+    else if( type == REL_SEC ) {
+        time( &now );
         ( *timeout ) += now;
         return 0;
     }
 
     return -1;
+
 }
 
-/*!
- * \brief Creates a Timer Event. (Dynamically allocated).
+/****************************************************************************
+ * Function: CreateTimerEvent
  *
- * \return (TimerEvent *) on success, NULL on failure.
- */
-static TimerEvent *CreateTimerEvent(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] . */
-	ThreadPoolJob *job,
-	/*! [in] . */
-	Duration persistent,
-	/*! [in] The absoule time of the event in seconds from Jan, 1970. */
-	time_t eventTime,
-	/*! [in] Id of job. */
-	int id)
+ *  Description:
+ *      Creates a Timer Event. (Dynamically allocated)
+ *      Internal to timer thread.
+ *  Parameters:
+ *      func - thread function to run.
+ *      arg - argument to function.
+ *      priority - priority of job.
+ *      eventTime - the absoule time of the event
+ *                  in seconds from Jan, 1970
+ *      id - id of job
+ *      
+ *  Returns:
+ *      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,
-	time_t timeout,
-	TimeoutType type,
-	ThreadPoolJob *job,
-	Duration duration,
-	int *id)
+/************************************************************************
+ * Function: TimerThreadSchedule
+ * 
+ *  Description:
+ *     Schedules an event to run at a specified time.
+ *
+ *  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
-     * the next event. */
+    //add job to Q
+    //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 (ListAddBefore( &timer->eventQ, newEvent, tempNode))
+        if( temp->eventTime >= timeout )
+        {
+
+            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,
-	int id,
-	ThreadPoolJob *out)
+/************************************************************************
+ * 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.
+ *             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) {
-	/* wait for timer thread to shutdown. */
+    while( timer->shutdown )    //wait for timer thread to shutdown
+    {
         ithread_cond_wait( &timer->condition, &timer->mutex );
     }
-    ithread_mutex_unlock(&timer->mutex);
 
-    /* destroy condition. */
-    while(ithread_cond_destroy(&timer->condition) != 0) {
+    ithread_mutex_unlock( &timer->mutex );
+
+    //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;
 }
-

upnp/Makefile.am

@@ -4,7 +4,7 @@
 # Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
-SUBDIRS = doc . sample unittest
+SUBDIRS = doc . sample
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/inc \
@@ -19,29 +19,11 @@ 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/UpnpGlobal.h \
-	inc/UpnpInet.h \
-	inc/UpnpIntTypes.h \
-	inc/UpnpStdInt.h \
-	inc/UpnpUniStd.h
+	inc/UpnpInet.h
 
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
@@ -62,7 +44,6 @@ 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 \
@@ -86,42 +67,37 @@ 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,24 +107,13 @@ 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 += \
-	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
 
@@ -162,12 +127,10 @@ endif
 
 
 # uuid
-if ENABLE_UUID
 libupnp_la_SOURCES += \
 	src/uuid/md5.c \
 	src/uuid/sysdep.c \
 	src/uuid/uuid.c
-endif
 
 
 # urlconfig
@@ -181,10 +144,9 @@ libupnp_la_SOURCES += \
 
 
 # check / distcheck tests
-check_PROGRAMS = test_init test_url
-TESTS = test_init test_url
+check_PROGRAMS = test_init
+TESTS = test_init
 test_init_SOURCES = test/test_init.c
-test_url_SOURCES = test/test_url.c
 
 
 EXTRA_DIST = \

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,19 +1,24 @@
+
+
 #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
+#endif 
+
 
 #ifdef WIN32
 	/*
@@ -31,23 +36,21 @@
 		#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
+		#define UPNP_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
@@ -55,20 +58,18 @@
 		#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
 	/*! 
@@ -87,12 +88,8 @@
 	 * 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
-
+	#define UPNP_INLINE inline
+	
 	/*!
 	 * \brief Supply the PRId64 printf() macro.
 	 *
@@ -101,17 +98,16 @@
 	/* #define PRId64 PRId64 */
 
 	/*!
-	 * \brief Supply the PRIz* printf() macros.
+	 * \brief Supply the PRIzu printf() macro.
 	 *
-	 * These macros were invented so that we can live a little longer with
+	 * This macro was 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
@@ -119,4 +115,6 @@
  */
 /*#define inline*/
 
+
 #endif /* UPNPGLOBAL_H */
+

upnp/inc/UpnpInet.h

@@ -1,67 +1,30 @@
+
+
 #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 <Ws2tcpip.h>
+#else
 	#include <sys/param.h>
-	#if defined(__sun)
-		#include <fcntl.h>
-		#include <sys/sockio.h>
-	#elif (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
+	#if (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>
+#endif
 
-	/*! 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

@@ -17,7 +17,7 @@
  *
  * \file
  *
- * \brief UpnpString object declaration.
+ * \brief UpnpString object declarartion.
  */
 
 

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,26 +86,6 @@
 #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
@@ -127,13 +94,5 @@
  *  (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,59 +1,64 @@
 /*******************************************************************************
  *
- * Copyright (c) 2000-2003 Intel Corporation
- * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
- * All rights reserved.
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
+ * All rights reserved. 
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * 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
+ * - 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
+ * 
+ * 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
+ * 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 
+
 
 /*!
  * \file
  */
 
+
 #include "ThreadPool.h"
 #include "upnpconfig.h"
-#include "UpnpGlobal.h"		/* for UPNP_INLINE */
+#include "UpnpGlobal.h" /* for UPNP_INLINE */
+
 
 #include <stdio.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*! \name Other debugging features
+
+/** \name Other debugging features
  *
  * The UPnP SDK contains other features to aid in debugging.
  */
 /*@{*/
 
-/*! \name Upnp_LogLevel
+/** \name Upnp_LogLevel
  *  The user has the option to select 4 different types of debugging levels,
  *  see \c UpnpSetLogLevel. 
  *  The critical level will show only those messages 
@@ -80,6 +85,7 @@ typedef enum Upnp_Module {
 	HTTP
 } Dbg_Module;
 
+
 /*@{*/
 typedef enum Upnp_LogLevel_e {
 	UPNP_CRITICAL,
@@ -89,11 +95,14 @@ typedef enum Upnp_LogLevel_e {
 } Upnp_LogLevel;
 /*@}*/
 
-/*!
+
+/**
  * Default log level : see \c Upnp_LogLevel
  */
 #define UPNP_DEFAULT_LOG_LEVEL	UPNP_ALL
 
+
+
 /*!
  * \brief Initialize the log files.
  *
@@ -107,6 +116,8 @@ static UPNP_INLINE int UpnpInitLog(void)
 	return UPNP_E_SUCCESS;
 }
 #endif
+
+
 /*!
  * \brief Set the log level (see \c Upnp_LogLevel).
  */
@@ -115,24 +126,20 @@ void UpnpSetLogLevel(
 	/*! [in] Log level. */
 	Upnp_LogLevel log_level);
 #else
-static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level)
-{
-	return;
-	log_level = log_level;
-}
+static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
 #endif
 
+
 /*!
  * \brief Closes the log files.
  */
 #ifdef DEBUG
 void UpnpCloseLog(void);
 #else
-static UPNP_INLINE void UpnpCloseLog(void)
-{
-}
+static UPNP_INLINE void UpnpCloseLog(void) {}
 #endif
 
+
 /*!
  * \brief Set the name for error and information files, respectively.
  */
@@ -143,15 +150,12 @@ void UpnpSetLogFileNames(
 	/*! [in] Name of the information file. */
 	const char *InfoFileName);
 #else
-static UPNP_INLINE void UpnpSetLogFileNames(const char *ErrFileName,
-	const char *InfoFileName)
-{
-	return;
-	ErrFileName = ErrFileName;
-	InfoFileName = InfoFileName;
-}
+static UPNP_INLINE void UpnpSetLogFileNames(
+	const char *ErrFileName,
+	const char *InfoFileName) {}
 #endif
 
+
 /*!
  * \brief Check if the module is turned on for debug and returns the file
  * descriptor corresponding to the debug level
@@ -170,11 +174,10 @@ FILE *UpnpGetDebugFile(
 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.
  *
@@ -188,18 +191,19 @@ int DebugAtThisLevel(
 	/*! [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(
+	Upnp_LogLevel DLevel,
+	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.
- */
+ */ 
 #ifdef DEBUG
 void UpnpPrintf(
 	/*! [in] The level of the debug logging. It will decide whether debug
@@ -208,81 +212,116 @@ void UpnpPrintf(
 	/*! [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,
-	/*! [in] Printf like Variable number of arguments that will go in the
-	 * debug statement. */
+	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__, 5, 6)))
+	/* This enables printf like format checking by the compiler */
+	__attribute__((format (__printf__, 5, 6)))
 #endif
-	;
+;
 #else /* DEBUG */
-static UPNP_INLINE void UpnpPrintf(Upnp_LogLevel DLevel, Dbg_Module Module,
-	const char *DbgFileName, int DbgLineNo, const char *FmtStr, ...)
+static UPNP_INLINE void UpnpPrintf(
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	const char* DbgFileName,
+	int DbgLineNo,
+	const char* FmtStr,
+	...)
 {
-	return;
-	DLevel = DLevel;
-	Module = Module;
-	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] 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;
-}
+static UPNP_INLINE void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo) {}
 #endif
 
+
 /*!
  * \brief Writes the buffer in the file as per the requested banner
  */
 #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. */
-	size_t starlength);
+	int starlength);
 #else
-static UPNP_INLINE void UpnpDisplayBanner(FILE *fd, const char **lines,
-	size_t size, int starlength)
+static UPNP_INLINE void UpnpDisplayBanner(
+	FILE *fd,
+	const char **lines,
+	size_t size,
+	int starlength) {}
+#endif
+
+
+/*!
+ * \brief Prints thread pool statistics.
+ */
+#ifdef DEBUG
+void PrintThreadPoolStats(
+	/*! [in] The thread pool. */
+	ThreadPool *tp, 
+	/*! [in] The file name that called this function, use the macro __FILE__. */
+	const char *DbgFileName,
+	/*! [in] The line number that the function was called, use the macro __LINE__. */
+	int DbgLineNo,
+	/*! [in] The message. */
+	const char *msg);
+#else
+static UPNP_INLINE void PrintThreadPoolStats(
+	ThreadPool *tp, 
+	const char *DbgFileName,
+	int DbgLineNo,
+	const char *msg)
 {
-	return;
-	fd = fd;
-	lines = lines;
-	size = size;
-	starlength = starlength;
 }
 #endif
 
+
+/*!
+ * \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)
+{
+}
+#endif
+
+
 /*@}*/
 
 #ifdef __cplusplus
@@ -290,3 +329,4 @@ static UPNP_INLINE void UpnpDisplayBanner(FILE *fd, const char **lines,
 #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
 
-
-/*!
- * \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 */
-
+#include "upnp.h"
 
 /* Function declarations only if tools compiled into the library */
 #if UPNP_HAVE_TOOLS
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-/*!
- * \brief Converts an SDK error code into a string error message suitable for
- * display. The memory returned from this function should NOT be freed.
+/** {\bf UpnpResolveURL} combines a base URL and a relative URL into
+ *  a single absolute URL.  The memory for {\bf AbsURL} needs to be
+ *  allocated by the caller and must be large enough to hold the
+ *  {\bf BaseURL} and {\bf RelURL} combined.
  *
- * \return An ASCII text string representation of the error message associated
- * 	with the error code or the string "Unknown error code"
- */
-EXPORT_SPEC const char *UpnpGetErrorMessage(
-	/*! [in] The SDK error code to convert. */
-	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 
+ *  @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}: {\bf RelURL} is {\tt NULL}.
+ *      \item {\tt UPNP_E_INVALID_URL}: The {\bf BaseURL} / {\bf 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. */
-	const char *BaseURL,
-	/*! [in] The relative URL to \b BaseURL. */
-	const char *RelURL,
-	/*! [out] A pointer to a buffer to store the absolute URL. */
-	char *AbsURL);
+    IN const char * BaseURL,  /** The base URL to combine. */
+    IN const char * RelURL,   /** The relative URL to {\bf BaseURL}. */
+    OUT char * AbsURL   /** A pointer to a buffer to store the 
+                            absolute URL. */
+    );
 
-
-/*!
- * \brief Combines a base URL and a relative URL into a single absolute URL.
- *
- * 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. 
+/** {\bf UpnpMakeAction} 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.
+ *  @return [IXML_Document*] The action node of {\bf Upnp_Document} type or 
+ *                      {\tt NULL} 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. */
+    );
 
-/*!
- * \brief Adds the argument in the action request.
- * 
- * This API is specially suitable inside a loop to add any number input
- * parameters into an existing action. If no action document exists in the
- * beginning then a <b>Upnp_Document variable initialized with <tt>NULL</tt></b>
- * should be passed as a parameter.
+/** {\bf UpnpAddToAction} creates an action request packet based on its input 
+ *  parameters (status variable name and value pair). This API is specially 
+ *  suitable inside a loop to add any number input parameters into an existing
+ *  action. If no action document exists in the beginning then a 
+ *  {\bf Upnp_Document} variable initialized with {\tt NULL} 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.
+ *  @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 UpnpAddToAction(
-	/*! [in,out] A pointer to store the action document node. */
-	IXML_Document **ActionDoc,
-	/*! [in] The action name. */
-	const char *ActionName,
-	/*! [in] The service type. */
-	const char *ServType,
-	/*! [in] The status variable name. */
-	const char *ArgName,
-	/*! [in] The status variable value. */
-	const char *ArgVal);
+        IN OUT IXML_Document ** ActionDoc, 
+	                              /** A pointer to store the action 
+				          document node. */
+        IN const char * ActionName,   /** The action name. */
+        IN const char * ServType,     /** The service type.  */
+        IN const char * ArgName,      /** The status variable name. */
+        IN const char * ArgVal        /** The status variable value.  */
+        );
 
-
-/*!
- * \brief 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 \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.
+/** {\bf UpnpMakeActionResponse} creates 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. 
+ *   
+ *  @return [IXML_Document*] The action node of {\bf Upnp_Document} type or 
+ *                           {\tt NULL} if the operation failed.
  */
+
+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. */
-        IXML_Document **ActionResponse, 
-	/*! [in] The action name. */
-        const char *ActionName,
-	/*! [in] The service type. */
-        const char *ServType,
-	/*! [in] The status variable name. */
-        const char *ArgName,
-	/*! [in] The status variable value. */
-        const char *ArgVal);
+        IN OUT IXML_Document ** ActionResponse, 
+	                                   /** Pointer to a document to 
+					       store the action document 
+					       node. */
+        IN const char * ActionName,        /** The action name. */
+        IN const char * ServType,          /** The service type.  */
+        IN const char * ArgName,           /** The status variable name. */
+        IN const char * ArgVal             /** The status variable value.  */
+        );
 
-
-/*!
- * \brief 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.
+/** {\bf UpnpAddToPropertySet} 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} and pass that as the first parameter.
  *  
- * \return <tt>NULL</tt> on failure, or the property-set document node.
- */
-EXPORT_SPEC IXML_Document *UpnpCreatePropertySet(
-	/*! [in] The number of argument pairs passed. */
-	int NumArg,
-	/*! [in] The status variable name and value pair. */
-	const char *Arg,
-	/*! [in] Variable sized list with the rest of the parameters. */
-	...);
-
-
-/*!
- * \brief Can be used when an application needs to transfer the status of many
- * variables at once.
+ *  @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}
  *
- * 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. */
-	IXML_Document **PropSet,
-	/*! [in] The status variable name. */
-	const char *ArgName,
-	/*! [in] The status variable value. */
-	const char *ArgVal);
+    IN OUT IXML_Document **PropSet,    
+                                  /** A pointer to the document containing 
+				      the property set document node. */
+    IN const char * ArgName,      /** The status variable name. */  
+    IN const char * ArgVal        /** The status variable value.  */
+    );
 
+/** {\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/sample/Makefile.am

@@ -14,61 +14,67 @@ LDADD = \
 	$(top_builddir)/threadutil/libthreadutil.la \
 	$(top_builddir)/ixml/libixml.la
 
+
 # samples
 noinst_PROGRAMS =
 if ENABLE_SAMPLES
 if ENABLE_CLIENT
-noinst_PROGRAMS += tv_ctrlpt
-tv_ctrlpt_CPPFLAGS = \
+noinst_PROGRAMS += upnp_tv_ctrlpt
+upnp_tv_ctrlpt_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvctrlpt
 if ENABLE_DEVICE
-noinst_PROGRAMS += tv_combo
-tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
+noinst_PROGRAMS += upnp_tv_combo
+upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvcombo
 endif
 endif
 if ENABLE_DEVICE
-noinst_PROGRAMS += tv_device
-tv_device_CPPFLAGS = \
+noinst_PROGRAMS += upnp_tv_device
+upnp_tv_device_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvdevice
 endif
 endif
 
-tv_device_SOURCES = \
-	common/sample_util.c \
-	common/sample_util.h \
-	common/tv_device.c \
-	common/tv_device.h \
-	linux/tv_device_main.c
 
-tv_ctrlpt_SOURCES = \
+upnp_tv_device_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	common/tv_ctrlpt.c \
-	common/tv_ctrlpt.h \
-	linux/tv_ctrlpt_main.c
+	tvdevice/upnp_tv_device.c \
+	tvdevice/upnp_tv_device.h \
+	tvdevice/linux/upnp_tv_device_main.c
 
-tv_combo_SOURCES = \
+
+upnp_tv_ctrlpt_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	common/tv_ctrlpt.c \
-	common/tv_ctrlpt.h \
-	common/tv_device.c \
-	common/tv_device.h \
-	linux/tv_combo_main.c
+	tvctrlpt/upnp_tv_ctrlpt.c \
+	tvctrlpt/upnp_tv_ctrlpt.h \
+	tvctrlpt/linux/upnp_tv_ctrlpt_main.c
+
+upnp_tv_combo_SOURCES = \
+	common/sample_util.c \
+	common/sample_util.h \
+	tvcombo/upnp_tv_ctrlpt.c \
+	tvcombo/upnp_tv_ctrlpt.h \
+	tvcombo/upnp_tv_device.c \
+	tvcombo/upnp_tv_device.h \
+	tvcombo/linux/upnp_tv_combo_main.c
+
 
 if WITH_DOCUMENTATION
 examplesdir = $(docdir)/examples
 examples_DATA = \
-	$(tv_ctrlpt_SOURCES) \
-	$(tv_device_SOURCES)
+		$(sort \
+			$(upnp_tv_ctrlpt_SOURCES) \
+			$(upnp_tv_device_SOURCES))
 endif
 
+
 EXTRA_DIST = \
 	web/tvcombodesc.xml \
 	web/tvcontrolSCPD.xml \

upnp/sample/common/sample_util.c

@@ -29,25 +29,20 @@
  *
  ******************************************************************************/
 
-/*!
- * \addtogroup UpnpSamples
- *
- * @{
- *
- * \file
- */
-
-#define SAMPLE_UTIL_C
 
 #include "sample_util.h"
 
+
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 
+
 #if !UPNP_HAVE_TOOLS
 #	error "Need upnptools.h to compile samples ; try ./configure --enable-tools"
 #endif
 
+
 static int initialize_init = 1;
 static int initialize_register = 1;
 
@@ -59,6 +54,18 @@ state_update gStateUpdateFun = NULL;
 /*! mutex to control displaying of events */
 ithread_mutex_t display_mutex;
 
+/*******************************************************************************
+ * SampleUtil_Initialize
+ *
+ * Description: 
+ *     Initializes the sample util. Must be called before any sample util 
+ *     functions. May be called multiple times.
+ *     But the initialization is done only once.
+ *
+ * Parameters:
+ *   print_function - print function to use in SampleUtil_Print
+ *
+ ******************************************************************************/
 int SampleUtil_Initialize(print_string print_function)
 {
 	if (initialize_init) {
@@ -68,17 +75,29 @@ int SampleUtil_Initialize(print_string print_function)
 		ithread_mutexattr_setkind_np(&attr, ITHREAD_MUTEX_RECURSIVE_NP);
 		ithread_mutex_init(&display_mutex, &attr);
 		ithread_mutexattr_destroy(&attr);
+
 		/* To shut up valgrind mutex warning. */
 		ithread_mutex_lock(&display_mutex);
 		gPrintFun = print_function;
 		ithread_mutex_unlock(&display_mutex);
-		/* Finished initializing. */
+
 		initialize_init = 0;
+	} else {
+		SampleUtil_Print("***** SampleUtil_Initialize was called multiple times!\n");
+		abort();
 	}
 
 	return UPNP_E_SUCCESS;
 }
 
+/*******************************************************************************
+ * SampleUtil_RegisterUpdateFunction
+ *
+ * Description: 
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 int SampleUtil_RegisterUpdateFunction(state_update update_function)
 {
 	if (initialize_register) {
@@ -89,6 +108,15 @@ int SampleUtil_RegisterUpdateFunction(state_update update_function)
 	return UPNP_E_SUCCESS;
 }
 
+/*******************************************************************************
+ * SampleUtil_Finish
+ *
+ * Description: 
+ *     Releases Resources held by sample util.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 int SampleUtil_Finish()
 {
 	ithread_mutex_destroy(&display_mutex);
@@ -100,64 +128,90 @@ int SampleUtil_Finish()
 	return UPNP_E_SUCCESS;
 }
 
-char *SampleUtil_GetElementValue(IXML_Element *element)
+/*******************************************************************************
+ * SampleUtil_GetElementValue
+ *
+ * Description: 
+ *       Given a DOM node such as <Channel>11</Channel>, this routine
+ *       extracts the value (e.g., 11) from the node and returns it as 
+ *       a string. The string must be freed by the caller using 
+ *       free.
+ *
+ * Parameters:
+ *   node -- The DOM node from which to extract the value
+ *
+ ******************************************************************************/
+
+char *SampleUtil_GetElementValue(IN IXML_Element *element)
 {
 	IXML_Node *child = ixmlNode_getFirstChild((IXML_Node *)element);
 	char *temp = NULL;
 
-	if (child != 0 && ixmlNode_getNodeType(child) == eTEXT_NODE)
+	if (child != 0 && ixmlNode_getNodeType(child) == eTEXT_NODE) {
 		temp = strdup(ixmlNode_getNodeValue(child));
+	}
 
 	return temp;
 }
 
-IXML_NodeList *SampleUtil_GetFirstServiceList(IXML_Document *doc)
+/*******************************************************************************
+ * SampleUtil_GetFirstServiceList
+ *
+ * Description: 
+ *       Given a DOM node representing a UPnP Device Description Document,
+ *       this routine parses the document and finds the first service list
+ *       (i.e., the service list for the root device).  The service list
+ *       is returned as a DOM node list.
+ *
+ * Parameters:
+ *   node -- The DOM node from which to extract the service list
+ *
+ ******************************************************************************/
+IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document *doc)
 {
 	IXML_NodeList *ServiceList = NULL;
 	IXML_NodeList *servlistnodelist = NULL;
 	IXML_Node *servlistnode = NULL;
 
 	servlistnodelist =
-		ixmlDocument_getElementsByTagName(doc, "serviceList");
+		ixmlDocument_getElementsByTagName( doc, "serviceList" );
 	if (servlistnodelist && ixmlNodeList_length(servlistnodelist)) {
 		/* we only care about the first service list, from the root
 		 * device */
 		servlistnode = ixmlNodeList_item(servlistnodelist, 0);
+
 		/* create as list of DOM nodes */
 		ServiceList = ixmlElement_getElementsByTagName(
 			(IXML_Element *)servlistnode, "service");
 	}
-	if (servlistnodelist)
+	if (servlistnodelist) {
 		ixmlNodeList_free(servlistnodelist);
+	}
 
 	return ServiceList;
 }
 
-#define OLD_FIND_SERVICE_CODE
-#ifdef OLD_FIND_SERVICE_CODE
-#else
 /*
  * Obtain the service list 
  *    n == 0 the first
  *    n == 1 the next in the device list, etc..
+ * 
  */
-static IXML_NodeList *SampleUtil_GetNthServiceList(
-	/*! [in] . */
-	IXML_Document *doc,
-	/*! [in] . */
-	unsigned int n)
+IXML_NodeList *SampleUtil_GetNthServiceList(IN IXML_Document *doc , int n)
 {
 	IXML_NodeList *ServiceList = NULL;
 	IXML_NodeList *servlistnodelist = NULL;
 	IXML_Node *servlistnode = NULL;
 
-	/*  ixmlDocument_getElementsByTagName()
+	/*  
+	 *  ixmlDocument_getElementsByTagName()
 	 *  Returns a NodeList of all Elements that match the given
 	 *  tag name in the order in which they were encountered in a preorder
 	 *  traversal of the Document tree.  
 	 *
 	 *  return (NodeList*) A pointer to a NodeList containing the 
-	 *                      matching items or NULL on an error. 	 */
+	 *                      matching items or NULL on an error.
+	 */
 	SampleUtil_Print("SampleUtil_GetNthServiceList called : n = %d\n", n);
 	servlistnodelist =
 		ixmlDocument_getElementsByTagName(doc, "serviceList");
@@ -172,24 +226,38 @@ static IXML_NodeList *SampleUtil_GetNthServiceList(
 		 *  numerical index.
 		 *
 		 *  return (Node*) A pointer to a Node or NULL if there was an 
-		 *                  error. */
+		 *                  error.
+		 */
 		servlistnode = ixmlNodeList_item(servlistnodelist, n);
-		if (!servlistnode) {
-			/* create as list of DOM nodes */
-			ServiceList = ixmlElement_getElementsByTagName(
-				(IXML_Element *)servlistnode, "service");
-		} else
-			SampleUtil_Print("%s(%d): ixmlNodeList_item(nodeList, n) returned NULL\n",
-				__FILE__, __LINE__);
+
+		assert(servlistnode != 0);
+
+		/* create as list of DOM nodes */
+		ServiceList = ixmlElement_getElementsByTagName(
+			(IXML_Element *)servlistnode, "service");
 	}
-	if (servlistnodelist)
+
+	if (servlistnodelist) {
 		ixmlNodeList_free(servlistnodelist);
+	}
 
 	return ServiceList;
 }
-#endif
 
-char *SampleUtil_GetFirstDocumentItem(IXML_Document *doc, const char *item)
+/*******************************************************************************
+ * SampleUtil_GetFirstDocumentItem
+ *
+ * Description: 
+ *       Given a document node, this routine searches for the first element
+ *       named by the input string item, and returns its value as a string.
+ *       String must be freed by caller using free.
+ * Parameters:
+ *   doc -- The DOM document from which to extract the value
+ *   item -- The item to search for
+ *
+ ******************************************************************************/
+char *SampleUtil_GetFirstDocumentItem(
+	IN IXML_Document *doc, IN const char *item)
 {
 	IXML_NodeList *nodeList = NULL;
 	IXML_Node *textNode = NULL;
@@ -202,32 +270,52 @@ char *SampleUtil_GetFirstDocumentItem(IXML_Document *doc, const char *item)
 		if (tmpNode) {
 			textNode = ixmlNode_getFirstChild(tmpNode);
 			if (!textNode) {
-				SampleUtil_Print("%s(%d): (BUG) ixmlNode_getFirstChild(tmpNode) returned NULL\n",
-					__FILE__, __LINE__); 
+				SampleUtil_Print("sample_util.c: (bug) "
+					"ixmlNode_getFirstChild(tmpNode) "
+					"returned NULL\n"); 
 				ret = strdup("");
 				goto epilogue;
 			}
-			ret = strdup(ixmlNode_getNodeValue(textNode));
-			if (!ret) {
-				SampleUtil_Print("%s(%d): ixmlNode_getNodeValue returned NULL\n",
-					__FILE__, __LINE__); 
+			if (!ixmlNode_getNodeValue(textNode)) {
+				SampleUtil_Print("ixmlNode_getNodeValue "
+					"returned NULL\n"); 
 				ret = strdup("");
+				goto epilogue;
+			} else {
+				ret = strdup(ixmlNode_getNodeValue(textNode));
 			}
-		} else
-			SampleUtil_Print("%s(%d): ixmlNodeList_item(nodeList, 0) returned NULL\n",
-				__FILE__, __LINE__);
-	} else
-		SampleUtil_Print("%s(%d): Error finding %s in XML Node\n",
-			__FILE__, __LINE__, item);
+		} else {
+			SampleUtil_Print("ixmlNode_getFirstChild(tmpNode) "
+				"returned NULL\n");
+			goto epilogue;
+		}
+	} else {
+		SampleUtil_Print("Error finding %s in XML Node\n", item);
+		goto epilogue;
+	}
 
 epilogue:
-	if (nodeList)
+	if (nodeList) {
 		ixmlNodeList_free(nodeList);
+	}
 
 	return ret;
 }
 
-char *SampleUtil_GetFirstElementItem(IXML_Element *element, const char *item)
+/*******************************************************************************
+ * SampleUtil_GetFirstElementItem
+ *
+ * Description: 
+ *       Given a DOM element, this routine searches for the first element
+ *       named by the input string item, and returns its value as a string.
+ *       The string must be freed using free.
+ * Parameters:
+ *   node -- The DOM element from which to extract the value
+ *   item -- The item to search for
+ *
+ ******************************************************************************/
+char *SampleUtil_GetFirstElementItem(
+	IN IXML_Element *element, IN const char *item)
 {
 	IXML_NodeList *nodeList = NULL;
 	IXML_Node *textNode = NULL;
@@ -236,23 +324,24 @@ char *SampleUtil_GetFirstElementItem(IXML_Element *element, const char *item)
 
 	nodeList = ixmlElement_getElementsByTagName(element, (char *)item);
 	if (nodeList == NULL) {
-		SampleUtil_Print("%s(%d): Error finding %s in XML Node\n",
-			__FILE__, __LINE__, item);
+		SampleUtil_Print( "Error finding %s in XML Node\n", item);
+
 		return NULL;
 	}
 	tmpNode = ixmlNodeList_item(nodeList, 0);
-	if (!tmpNode) {
-		SampleUtil_Print("%s(%d): Error finding %s value in XML Node\n",
-			__FILE__, __LINE__, item);
+	if (tmpNode) {
+		SampleUtil_Print("Error finding %s value in XML Node\n", item);
 		ixmlNodeList_free(nodeList);
+
 		return NULL;
 	}
 	textNode = ixmlNode_getFirstChild(tmpNode);
 	ret = strdup(ixmlNode_getNodeValue(textNode));
 	if (!ret) {
-		SampleUtil_Print("%s(%d): Error allocating memory for %s in XML Node\n",
-			__FILE__, __LINE__, item);
+		SampleUtil_Print("Error allocating memory for %s in XML Node\n",
+			item);
 		ixmlNodeList_free(nodeList);
+
 		return NULL;
 	}
 	ixmlNodeList_free(nodeList);
@@ -260,7 +349,17 @@ char *SampleUtil_GetFirstElementItem(IXML_Element *element, const char *item)
 	return ret;
 }
 
-void SampleUtil_PrintEventType(Upnp_EventType S)
+/*******************************************************************************
+ * SampleUtil_PrintEventType
+ *
+ * Description: 
+ *       Prints a callback event type as a string.
+ *
+ * Parameters:
+ *   S -- The callback event
+ *
+ ******************************************************************************/
+void SampleUtil_PrintEventType(IN Upnp_EventType S)
 {
 	switch (S) {
 	/* Discovery */
@@ -314,41 +413,41 @@ void SampleUtil_PrintEventType(Upnp_EventType S)
 	}
 }
 
-int SampleUtil_PrintEvent(Upnp_EventType EventType, const void *Event)
+/*******************************************************************************
+ * SampleUtil_PrintEvent
+ *
+ * Description: 
+ *       Prints callback event structure details.
+ *
+ * Parameters:
+ *   EventType -- The type of callback event
+ *   Event -- The callback event structure
+ *
+ ******************************************************************************/
+int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 {
 	ithread_mutex_lock(&display_mutex);
 
-	SampleUtil_Print(
-		"======================================================================\n"
-		"----------------------------------------------------------------------\n");
+	SampleUtil_Print("======================================================================\n");
+	SampleUtil_Print("----------------------------------------------------------------------\n");
 	SampleUtil_PrintEventType(EventType);
 	switch (EventType) {
 	/* SSDP */
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
 	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
-		SampleUtil_Print(
-		"ErrCode     =  %d\n"
-		"Expires     =  %d\n"
-		"DeviceId    =  %s\n"
-		"DeviceType  =  %s\n"
-		"ServiceType =  %s\n"
-		"ServiceVer  =  %s\n"
-		"Location    =  %s\n"
-		"OS          =  %s\n"
-		"Date        =  %s\n"
-		"Ext         =  %s\n",
-		UpnpDiscovery_get_ErrCode(d_event),
-		UpnpDiscovery_get_Expires(d_event),
-		UpnpString_get_String(UpnpDiscovery_get_DeviceID(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_DeviceType(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_ServiceType(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_ServiceVer(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Location(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Os(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Date(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Ext(d_event)));
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
+
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(d_event->ErrCode), d_event->ErrCode);
+		SampleUtil_Print("Expires     =  %d\n",  d_event->Expires);
+		SampleUtil_Print("DeviceId    =  %s\n",  d_event->DeviceId);
+		SampleUtil_Print("DeviceType  =  %s\n",  d_event->DeviceType);
+		SampleUtil_Print("ServiceType =  %s\n",  d_event->ServiceType);
+		SampleUtil_Print("ServiceVer  =  %s\n",  d_event->ServiceVer);
+		SampleUtil_Print("Location    =  %s\n",  d_event->Location);
+		SampleUtil_Print("OS          =  %s\n",  d_event->Os);
+		SampleUtil_Print("Ext         =  %s\n",  d_event->Ext);
 		break;
 	}
 	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
@@ -356,26 +455,19 @@ int SampleUtil_PrintEvent(Upnp_EventType EventType, const void *Event)
 		break;
 	/* SOAP */
 	case UPNP_CONTROL_ACTION_REQUEST: {
-		UpnpActionRequest *a_event = (UpnpActionRequest *)Event;
-		IXML_Document *actionRequestDoc = NULL;
-		IXML_Document *actionResultDoc = NULL;
+		struct Upnp_Action_Request *a_event =
+			(struct Upnp_Action_Request *)Event;
 		char *xmlbuff = NULL;
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"ErrStr      =  %s\n"
-			"ActionName  =  %s\n"
-			"UDN         =  %s\n"
-			"ServiceID   =  %s\n",
-			UpnpActionRequest_get_ErrCode(a_event),
-			UpnpString_get_String(UpnpActionRequest_get_ErrStr(a_event)),
-			UpnpString_get_String(UpnpActionRequest_get_ActionName(a_event)),
-			UpnpString_get_String(UpnpActionRequest_get_DevUDN(a_event)),
-			UpnpString_get_String(UpnpActionRequest_get_ServiceID(a_event)));
-		actionRequestDoc = UpnpActionRequest_get_ActionRequest(a_event);
-		if (actionRequestDoc) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionRequestDoc);
-			if (xmlbuff) {
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(a_event->ErrCode), a_event->ErrCode);
+		SampleUtil_Print("ErrStr      =  %s\n", a_event->ErrStr);
+		SampleUtil_Print("ActionName  =  %s\n", a_event->ActionName);
+		SampleUtil_Print("UDN         =  %s\n", a_event->DevUDN);
+		SampleUtil_Print("ServiceID   =  %s\n", a_event->ServiceID);
+		if (a_event->ActionRequest) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionRequest);
+			if ( xmlbuff ) {
 				SampleUtil_Print("ActRequest  =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
 			}
@@ -383,9 +475,8 @@ int SampleUtil_PrintEvent(Upnp_EventType EventType, const void *Event)
 		} else {
 			SampleUtil_Print("ActRequest  =  (null)\n");
 		}
-		actionResultDoc = UpnpActionRequest_get_ActionResult(a_event);
-		if (actionResultDoc) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionResultDoc);
+		if (a_event->ActionResult) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionResult);
 			if (xmlbuff) {
 				SampleUtil_Print("ActResult   =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -397,22 +488,15 @@ int SampleUtil_PrintEvent(Upnp_EventType EventType, const void *Event)
 		break;
 	}
 	case UPNP_CONTROL_ACTION_COMPLETE: {
-		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
+		struct Upnp_Action_Complete *a_event =
+			(struct Upnp_Action_Complete *)Event;
 		char *xmlbuff = NULL;
-		int errCode = UpnpActionComplete_get_ErrCode(a_event);
-		const char *ctrlURL = UpnpString_get_String(
-			UpnpActionComplete_get_CtrlUrl(a_event));
-		IXML_Document *actionRequest =
-			UpnpActionComplete_get_ActionRequest(a_event);
-		IXML_Document *actionResult =
-			UpnpActionComplete_get_ActionResult(a_event);
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"CtrlUrl     =  %s\n",
-			errCode, ctrlURL);
-		if (actionRequest) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionRequest);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",  
+			UpnpGetErrorMessage(a_event->ErrCode), a_event->ErrCode);
+		SampleUtil_Print("CtrlUrl     =  %s\n", a_event->CtrlUrl);
+		if (a_event->ActionRequest) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionRequest);
 			if (xmlbuff) {
 				SampleUtil_Print("ActRequest  =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -421,8 +505,8 @@ int SampleUtil_PrintEvent(Upnp_EventType EventType, const void *Event)
 		} else {
 			SampleUtil_Print("ActRequest  =  (null)\n");
 		}
-		if (actionResult) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionResult);
+		if (a_event->ActionResult) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionResult);
 			if (xmlbuff) {
 				SampleUtil_Print("ActResult   =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -434,130 +518,120 @@ int SampleUtil_PrintEvent(Upnp_EventType EventType, const void *Event)
 		break;
 	}
 	case UPNP_CONTROL_GET_VAR_REQUEST: {
-		UpnpStateVarRequest *sv_event = (UpnpStateVarRequest *)Event;
+		struct Upnp_State_Var_Request *sv_event =
+			(struct Upnp_State_Var_Request *)Event;
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"ErrStr      =  %s\n"
-			"UDN         =  %s\n"
-			"ServiceID   =  %s\n"
-			"StateVarName=  %s\n"
-			"CurrentVal  =  %s\n",
-			UpnpStateVarRequest_get_ErrCode(sv_event),
-			UpnpString_get_String(UpnpStateVarRequest_get_ErrStr(sv_event)),
-			UpnpString_get_String(UpnpStateVarRequest_get_DevUDN(sv_event)),
-			UpnpString_get_String(UpnpStateVarRequest_get_ServiceID(sv_event)),
-			UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(sv_event)),
-			UpnpStateVarRequest_get_CurrentVal(sv_event));
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(sv_event->ErrCode), sv_event->ErrCode);
+		SampleUtil_Print("ErrStr      =  %s\n", sv_event->ErrStr);
+		SampleUtil_Print("UDN         =  %s\n", sv_event->DevUDN);
+		SampleUtil_Print("ServiceID   =  %s\n", sv_event->ServiceID);
+		SampleUtil_Print("StateVarName=  %s\n", sv_event->StateVarName);
+		SampleUtil_Print("CurrentVal  =  %s\n", sv_event->CurrentVal);
 		break;
 	}
 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
-		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
+		struct Upnp_State_Var_Complete *sv_event =
+			(struct Upnp_State_Var_Complete *)Event;
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"CtrlUrl     =  %s\n"
-			"StateVarName=  %s\n"
-			"CurrentVal  =  %s\n",
-			UpnpStateVarComplete_get_ErrCode(sv_event),
-			UpnpString_get_String(UpnpStateVarComplete_get_CtrlUrl(sv_event)),
-			UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(sv_event)),
-			UpnpStateVarComplete_get_CurrentVal(sv_event));
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(sv_event->ErrCode), sv_event->ErrCode);
+		SampleUtil_Print("CtrlUrl     =  %s\n", sv_event->CtrlUrl);
+		SampleUtil_Print("StateVarName=  %s\n", sv_event->StateVarName);
+		SampleUtil_Print("CurrentVal  =  %s\n", sv_event->CurrentVal);
 		break;
 	}
 	/* GENA */
 	case UPNP_EVENT_SUBSCRIPTION_REQUEST: {
-		UpnpSubscriptionRequest *sr_event = (UpnpSubscriptionRequest *)Event;
+		struct Upnp_Subscription_Request *sr_event =
+			(struct Upnp_Subscription_Request *)Event;
 
-		SampleUtil_Print(
-			"ServiceID   =  %s\n"
-			"UDN         =  %s\n"
-			"SID         =  %s\n",
-			UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(sr_event)),
-			UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(sr_event)),
-			UpnpString_get_String(UpnpSubscriptionRequest_get_SID(sr_event)));
+		SampleUtil_Print("ServiceID   =  %s\n", sr_event->ServiceId);
+		SampleUtil_Print("UDN         =  %s\n", sr_event->UDN);
+		SampleUtil_Print("SID         =  %s\n", sr_event->Sid);
 		break;
 	}
 	case UPNP_EVENT_RECEIVED: {
-		UpnpEvent *e_event = (UpnpEvent *)Event;
+		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
 		char *xmlbuff = NULL;
 
-		xmlbuff = ixmlPrintNode(
-			(IXML_Node *)UpnpEvent_get_ChangedVariables(e_event));
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"EventKey    =  %d\n"
-			"ChangedVars =  %s\n",
-			UpnpString_get_String(UpnpEvent_get_SID(e_event)),
-			UpnpEvent_get_EventKey(e_event),
-			xmlbuff);
+		SampleUtil_Print("SID         =  %s\n", e_event->Sid);
+		SampleUtil_Print("EventKey    =  %d\n",	e_event->EventKey);
+		xmlbuff = ixmlPrintNode((IXML_Node *)e_event->ChangedVariables);
+		SampleUtil_Print("ChangedVars =  %s\n", xmlbuff);
 		ixmlFreeDOMString(xmlbuff);
+		xmlbuff = NULL;
 		break;
 	}
 	case UPNP_EVENT_RENEWAL_COMPLETE: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event =
+			(struct Upnp_Event_Subscribe *)Event;
 
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"ErrCode     =  %d\n"
-			"TimeOut     =  %d\n",
-			UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-			UpnpEventSubscribe_get_ErrCode(es_event),
-			UpnpEventSubscribe_get_TimeOut(es_event));
+		SampleUtil_Print("SID         =  %s\n", es_event->Sid);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
+		SampleUtil_Print("TimeOut     =  %d\n", es_event->TimeOut);
 		break;
 	}
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
 	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event =
+			(struct Upnp_Event_Subscribe *)Event;
 
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"ErrCode     =  %d\n"
-			"PublisherURL=  %s\n"
-			"TimeOut     =  %d\n",
-			UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-			UpnpEventSubscribe_get_ErrCode(es_event),
-			UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
-			UpnpEventSubscribe_get_TimeOut(es_event));
+		SampleUtil_Print("SID         =  %s\n", es_event->Sid);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
+		SampleUtil_Print("PublisherURL=  %s\n", es_event->PublisherUrl);
+		SampleUtil_Print("TimeOut     =  %d\n", es_event->TimeOut);
 		break;
 	}
+
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
 	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event =
+			(struct Upnp_Event_Subscribe *)Event;
 
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"ErrCode     =  %d\n"
-			"PublisherURL=  %s\n"
-			"TimeOut     =  %d\n",
-			UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-			UpnpEventSubscribe_get_ErrCode(es_event),
-			UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
-			UpnpEventSubscribe_get_TimeOut(es_event));
+		SampleUtil_Print("SID         =  %s\n", es_event->Sid);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",  
+			UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
+		SampleUtil_Print("PublisherURL=  %s\n", es_event->PublisherUrl);
+		SampleUtil_Print("TimeOut     =  %d\n", es_event->TimeOut);
 		break;
 	}
 	}
-	SampleUtil_Print(
-		"----------------------------------------------------------------------\n"
-		"======================================================================\n"
-		"\n\n\n");
+	SampleUtil_Print("----------------------------------------------------------------------\n");
+	SampleUtil_Print("======================================================================\n");
 
 	ithread_mutex_unlock(&display_mutex);
 
 	return 0;
 }
 
-int SampleUtil_FindAndParseService(IXML_Document *DescDoc, const char *location,
-	const char *serviceType, char **serviceId, char **eventURL, char **controlURL)
+/*******************************************************************************
+ * SampleUtil_FindAndParseService
+ *
+ * Description: 
+ *       This routine finds the first occurance of a service in a DOM representation
+ *       of a description document and parses it.  
+ *
+ * Parameters:
+ *   DescDoc -- The DOM description document
+ *   location -- The location of the description document
+ *   serviceSearchType -- The type of service to search for
+ *   serviceId -- OUT -- The service ID
+ *   eventURL -- OUT -- The event URL for the service
+ *   controlURL -- OUT -- The control URL for the service
+ *
+ ******************************************************************************/
+int SampleUtil_FindAndParseService(
+	IN IXML_Document *DescDoc, IN const char *location, IN char *serviceType,
+	OUT char **serviceId, OUT char **eventURL, OUT char **controlURL)
 {
-	unsigned int i;
-	unsigned long length;
+	int i;
+	int length;
 	int found = 0;
 	int ret;
-#ifdef OLD_FIND_SERVICE_CODE
-#else /* OLD_FIND_SERVICE_CODE */
-	unsigned int sindex = 0;
-#endif /* OLD_FIND_SERVICE_CODE */
+	int sindex = 0;
 	char *tempServiceType = NULL;
 	char *baseURL = NULL;
 	const char *base = NULL;
@@ -567,45 +641,53 @@ int SampleUtil_FindAndParseService(IXML_Document *DescDoc, const char *location,
 	IXML_Element *service = NULL;
 
 	baseURL = SampleUtil_GetFirstDocumentItem(DescDoc, "URLBase");
-	if (baseURL)
+	if (baseURL) {
 		base = baseURL;
-	else
+	} else {
 		base = location;
-#ifdef OLD_FIND_SERVICE_CODE
-	serviceList = SampleUtil_GetFirstServiceList(DescDoc);
-#else /* OLD_FIND_SERVICE_CODE */
+	}
+
+	/* Top level */
 	for (sindex = 0;
 	     (serviceList = SampleUtil_GetNthServiceList(DescDoc , sindex)) != NULL;
-	     sindex++) {
+	     sindex ++) {
 		tempServiceType = NULL;
 		relcontrolURL = NULL;
 		releventURL = NULL;
 		service = NULL;
-#endif /* OLD_FIND_SERVICE_CODE */
+
+		/* serviceList = SampleUtil_GetFirstServiceList( DescDoc ); */
 		length = ixmlNodeList_length(serviceList);
 		for (i = 0; i < length; i++) {
 			service = (IXML_Element *)ixmlNodeList_item(serviceList, i);
-			tempServiceType = SampleUtil_GetFirstElementItem(
-				(IXML_Element *)service, "serviceType");
-			if (tempServiceType && strcmp(tempServiceType, serviceType) == 0) {
+			tempServiceType =
+				SampleUtil_GetFirstElementItem(
+					(IXML_Element *)service, "serviceType");
+			if (strcmp(tempServiceType, serviceType) == 0) {
 				SampleUtil_Print("Found service: %s\n", serviceType);
-				*serviceId = SampleUtil_GetFirstElementItem(service, "serviceId");
+				*serviceId =
+					SampleUtil_GetFirstElementItem(service, "serviceId");
 				SampleUtil_Print("serviceId: %s\n", *serviceId);
-				relcontrolURL = SampleUtil_GetFirstElementItem(service, "controlURL");
-				releventURL = SampleUtil_GetFirstElementItem(service, "eventSubURL");
-				*controlURL = malloc(strlen(base) + strlen(relcontrolURL) + 1);
+				relcontrolURL =
+					SampleUtil_GetFirstElementItem(service, "controlURL");
+				releventURL =
+					SampleUtil_GetFirstElementItem(service, "eventSubURL");
+				*controlURL =
+					malloc(strlen(base) + strlen(relcontrolURL)+1);
 				if (*controlURL) {
 					ret = UpnpResolveURL(base, relcontrolURL, *controlURL);
-					if (ret != UPNP_E_SUCCESS)
+					if (ret != UPNP_E_SUCCESS) {
 						SampleUtil_Print("Error generating controlURL from %s + %s\n",
 							base, relcontrolURL);
+					}
 				}
-				*eventURL = malloc(strlen(base) + strlen(releventURL) + 1);
+				*eventURL = malloc(strlen(base) + strlen(releventURL)+1);
 				if (*eventURL) {
 					ret = UpnpResolveURL(base, releventURL, *eventURL);
-					if (ret != UPNP_E_SUCCESS)
+					if (ret != UPNP_E_SUCCESS) {
 						SampleUtil_Print("Error generating eventURL from %s + %s\n",
 							base, releventURL);
+					}
 				}
 				free(relcontrolURL);
 				free(releventURL);
@@ -619,19 +701,30 @@ int SampleUtil_FindAndParseService(IXML_Document *DescDoc, const char *location,
 		}
 		free(tempServiceType);
 		tempServiceType = NULL;
-		if (serviceList)
+		if (serviceList) {
 			ixmlNodeList_free(serviceList);
+		}
 		serviceList = NULL;
-#ifdef OLD_FIND_SERVICE_CODE
-#else /* OLD_FIND_SERVICE_CODE */
 	}
-#endif /* OLD_FIND_SERVICE_CODE */
 	free(baseURL);
 
 	return found;
 }
 
-int SampleUtil_Print(const char *fmt, ...)
+/*******************************************************************************
+ * SampleUtil_Print
+ *
+ * Description: 
+ *      Provides platform-specific print functionality.  This function should be
+ *      called when you want to print content suitable for console output (i.e.,
+ *      in a large text box or on a screen).  If your device/operating system is 
+ *      not supported here, you should add a port.
+ *
+ * Parameters:
+ *		Same as printf()
+ *
+ ******************************************************************************/
+int SampleUtil_Print(char *fmt, ...)
 {
 #define MAX_BUF (8 * 1024)
 	va_list ap;
@@ -644,33 +737,30 @@ int SampleUtil_Print(const char *fmt, ...)
 	va_start(ap, fmt);
 	rc = vsnprintf(buf, MAX_BUF, fmt, ap);
 	va_end(ap);
-	if (gPrintFun)
-		gPrintFun("%s", buf);
+
+	if (gPrintFun) {
+		gPrintFun(buf);
+	}
 
 	ithread_mutex_unlock(&display_mutex);
 
 	return rc;
 }
 
+/*******************************************************************************
+ * SampleUtil_StateUpdate
+ *
+ * Description: 
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void SampleUtil_StateUpdate(const char *varName, const char *varValue,
 	const char *UDN, eventType type)
 {
 	/* TBD: Add mutex here? */
-	if (gStateUpdateFun)
+	if (gStateUpdateFun) {
 		gStateUpdateFun(varName, varValue, UDN, type);
+	}
 }
 
-/*!
- * \brief Prints a string to standard out.
- */
-void linux_print(const char *format, ...)
-{
-	va_list argList;
-
-	va_start(argList, format);
-	vfprintf(stdout, format, argList);
-	fflush(stdout);
-	va_end(argList);
-}
-
-/*! @} UpnpSamples */

upnp/sample/common/sample_util.h

@@ -1,70 +1,54 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 SAMPLE_UTIL_H
 #define SAMPLE_UTIL_H
 
-/*******************************************************************************
- *
- * 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.
- *
- ******************************************************************************/
-
-/*!
- * \defgroup UpnpSamples Sample Code
- *
- * @{
- *
- * \file
- */
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include "ithread.h"
-#include "ixml.h" /* for IXML_Document, IXML_Element */
-#include "upnp.h" /* for Upnp_EventType */
-#include "upnptools.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef SAMPLE_UTIL_C
-	/*! Service types for tv services. */
-	const char *TvServiceType[] = {
-		"urn:schemas-upnp-org:service:tvcontrol:1",
-		"urn:schemas-upnp-org:service:tvpicture:1"
-	};
-#else /* SAMPLE_UTIL_C */
-	extern const char *TvServiceType[];
-#endif /* SAMPLE_UTIL_C */
+#include "ithread.h"
+#include "ixml.h"
+#include "upnptools.h"
 
-/* mutex to control displaying of events */
+
+// mutex to control displaying of events
 extern ithread_mutex_t display_mutex;
 
+
 typedef enum {
 	STATE_UPDATE = 0,
 	DEVICE_ADDED = 1,
@@ -72,198 +56,233 @@ typedef enum {
 	GET_VAR_COMPLETE = 3
 } eventType;
 
-/*!
- * \brief Given a DOM node such as <Channel>11</Channel>, this routine
- * extracts the value (e.g., 11) from the node and returns it as 
- * a string. The string must be freed by the caller using free.
+
+/********************************************************************************
+ * SampleUtil_GetElementValue
  *
- * \return The DOM node as a string.
- */
-char *SampleUtil_GetElementValue(
-	/*! [in] The DOM node from which to extract the value. */
-	IXML_Element *element);
-
-/*!
- * \brief Given a DOM node representing a UPnP Device Description Document,
- * this routine parses the document and finds the first service list
- * (i.e., the service list for the root device).  The service list
- * is returned as a DOM node list. The NodeList must be freed using
- * NodeList_free.
+ * Description: 
+ *       Given a DOM node such as <Channel>11</Channel>, this routine
+ *       extracts the value (e.g., 11) from the node and returns it as 
+ *       a string. The string must be freed by the caller using 
+ *       free.
  *
- * \return The service list is returned as a DOM node list.
- */
-IXML_NodeList *SampleUtil_GetFirstServiceList(
-	/*! [in] The DOM node from which to extract the service list. */
-	IXML_Document *doc); 
+ * Parameters:
+ *   node -- The DOM node from which to extract the value
+ *
+ ********************************************************************************/
+char *SampleUtil_GetElementValue(IN IXML_Element *element);
 
-/*!
- * \brief Given a document node, this routine searches for the first element
- * named by the input string item, and returns its value as a string.
- * String must be freed by caller using free.
- */
-char *SampleUtil_GetFirstDocumentItem(
-	/*! [in] The DOM document from which to extract the value. */
-	IXML_Document *doc,
-	/*! [in] The item to search for. */
-	const char *item); 
+/********************************************************************************
+ * SampleUtil_GetFirstServiceList
+ *
+ * Description: 
+ *       Given a DOM node representing a UPnP Device Description Document,
+ *       this routine parses the document and finds the first service list
+ *       (i.e., the service list for the root device).  The service list
+ *       is returned as a DOM node list. The NodeList must be freed using
+ *       NodeList_free.
+ *
+ * Parameters:
+ *   node -- The DOM node from which to extract the service list
+ *
+ ********************************************************************************/
 
-/*!
- * \brief Given a DOM element, this routine searches for the first element
- * named by the input string item, and returns its value as a string.
- * The string must be freed using free.
- */
-char *SampleUtil_GetFirstElementItem(
-	/*! [in] The DOM element from which to extract the value. */
-	IXML_Element *element,
-	/*! [in] The item to search for. */
-	const char *item); 
+IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document *doc); 
 
-/*!
- * \brief Prints a callback event type as a string.
- */
-void SampleUtil_PrintEventType(
-	/*! [in] The callback event. */
-	Upnp_EventType S);
 
-/*!
- * \brief Prints callback event structure details.
- */
-int SampleUtil_PrintEvent(
-	/*! [in] The type of callback event. */
-	Upnp_EventType EventType, 
-	/*! [in] The callback event structure. */
-	const void *Event);
+/********************************************************************************
+ * SampleUtil_GetFirstDocumentItem
+ *
+ * Description: 
+ *       Given a document node, this routine searches for the first element
+ *       named by the input string item, and returns its value as a string.
+ *       String must be freed by caller using free.
+ * Parameters:
+ *   doc -- The DOM document from which to extract the value
+ *   item -- The item to search for
+ *
+ ********************************************************************************/
+char *SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *item); 
 
-/*!
- * \brief This routine finds the first occurance of a service in a DOM
- * representation of a description document and parses it.  Note that this
- * function currently assumes that the eventURL and controlURL values in
- * the service definitions are full URLs.  Relative URLs are not handled here.
- */
+
+
+/********************************************************************************
+ * SampleUtil_GetFirstElementItem
+ *
+ * Description: 
+ *       Given a DOM element, this routine searches for the first element
+ *       named by the input string item, and returns its value as a string.
+ *       The string must be freed using free.
+ * Parameters:
+ *   node -- The DOM element from which to extract the value
+ *   item -- The item to search for
+ *
+ ********************************************************************************/
+char *SampleUtil_GetFirstElementItem(IN IXML_Element *element, IN const char *item); 
+
+/********************************************************************************
+ * SampleUtil_PrintEventType
+ *
+ * Description: 
+ *       Prints a callback event type as a string.
+ *
+ * Parameters:
+ *   S -- The callback event
+ *
+ ********************************************************************************/
+void SampleUtil_PrintEventType(IN Upnp_EventType S);
+
+/********************************************************************************
+ * SampleUtil_PrintEvent
+ *
+ * Description: 
+ *       Prints callback event structure details.
+ *
+ * Parameters:
+ *   EventType -- The type of callback event
+ *   Event -- The callback event structure
+ *
+ ********************************************************************************/
+int SampleUtil_PrintEvent(IN Upnp_EventType EventType, 
+			  IN void *Event);
+
+/********************************************************************************
+ * SampleUtil_FindAndParseService
+ *
+ * Description: 
+ *       This routine finds the first occurance of a service in a DOM representation
+ *       of a description document and parses it.  Note that this function currently
+ *       assumes that the eventURL and controlURL values in the service definitions
+ *       are full URLs.  Relative URLs are not handled here.
+ *
+ * Parameters:
+ *   DescDoc -- The DOM description document
+ *   location -- The location of the description document
+ *   serviceSearchType -- The type of service to search for
+ *   serviceId -- OUT -- The service ID
+ *   eventURL -- OUT -- The event URL for the service
+ *   controlURL -- OUT -- The control URL for the service
+ *
+ ********************************************************************************/
 int SampleUtil_FindAndParseService (
-	/*! [in] The DOM description document. */
-	IXML_Document *DescDoc,
-	/*! [in] The location of the description document. */
-	const char *location, 
-	/*! [in] The type of service to search for. */
-	const char *serviceType,
-	/*! [out] The service ID. */
-	char **serviceId, 
-	/*! [out] The event URL for the service. */
-	char **eventURL,
-	/*! [out] The control URL for the service. */
-	char **controlURL);
+	IN IXML_Document *DescDoc,
+	IN const char *location,
+	IN char *serviceType,
+	OUT char **serviceId, 
+	OUT char **eventURL,
+	OUT char **controlURL);
 
-/*!
- * \brief Prototype for displaying strings. All printing done by the device,
- * control point, and sample util, ultimately use this to display strings 
- * to the user.
- */
-typedef void (*print_string)(
-	/*! [in] Format. */
-	const char *string,
-	/*! [in] Arguments. */
-	...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 1, 2)))
-#endif
-;
 
-/*! global print function used by sample util */
+/********************************************************************************
+ * print_string
+ *
+ * Description: 
+ *       Prototype for displaying strings. All printing done by the device,
+ *       control point, and sample util, ultimately use this to display strings 
+ *       to the user.
+ *
+ * Parameters:
+ *   const char * string.
+ *
+ ********************************************************************************/
+typedef void (*print_string)(const char *string);
+
+//global print function used by sample util
 extern print_string gPrintFun;
 
-/*!
- * \brief Prototype for passing back state changes.
- */
+/********************************************************************************
+ * state_update
+ *
+ * Description: 
+ *     Prototype for passing back state changes
+ *
+ * Parameters:
+ *   const char * varName
+ *   const char * varValue
+ *   const char * UDN
+ *   int          newDevice
+ ********************************************************************************/
 typedef void (*state_update)(
-	/*! [in] . */
 	const char *varName,
-	/*! [in] . */
 	const char *varValue,
-	/*! [in] . */
 	const char *UDN,
-	/*! [in] . */
 	eventType type);
 
-/*! global state update function used by smaple util */
+//global state update function used by smaple util
 extern state_update gStateUpdateFun;
 
-/*!
- * \brief Initializes the sample util. Must be called before any sample util
- * functions. May be called multiple times.
- */
-int SampleUtil_Initialize(
-	/*! [in] Print function to use in SampleUtil_Print. */
-	print_string print_function);
+/********************************************************************************
+ * SampleUtil_Initialize
+ *
+ * Description: 
+ *     Initializes the sample util. Must be called before any sample util 
+ *     functions. May be called multiple times.
+ *
+ * Parameters:
+ *   print_function - print function to use in SampleUtil_Print
+ *
+ ********************************************************************************/
+int SampleUtil_Initialize(print_string print_function);
 
-/*!
- * \brief Releases Resources held by sample util.
- */
+/********************************************************************************
+ * SampleUtil_Finish
+ *
+ * Description: 
+ *     Releases Resources held by sample util.
+ *
+ * Parameters:
+ *
+ ********************************************************************************/
 int SampleUtil_Finish();
 
-/*!
- * \brief Function emulating printf that ultimately calls the registered print
- * function with the formatted string.
+/********************************************************************************
+ * SampleUtil_Print
  *
- * Provides platform-specific print functionality.  This function should be
- * called when you want to print content suitable for console output (i.e.,
- * in a large text box or on a screen).  If your device/operating system is 
- * not supported here, you should add a port.
+ * Description: 
+ *     Function emulating printf that ultimately calls the registered print 
+ *     function with the formatted string.
  *
- * \return The same as printf.
- */
-int SampleUtil_Print(
-	/*! [in] Format (see printf). */
-	const char *fmt,
-	/*! [in] Format data. */
-	...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 1, 2)))
-#endif
-;
+ * Parameters:
+ *   fmt - format (see printf)
+ *   . . .  - variable number of args. (see printf)
+ *
+ ********************************************************************************/
+int SampleUtil_Print(char *fmt, ...);
 
-/*!
- * \brief
- */
-int SampleUtil_RegisterUpdateFunction(
-	/*! [in] . */
-	state_update update_function);
+/********************************************************************************
+ * SampleUtil_RegisterUpdateFunction
+ *
+ * Description: 
+ *
+ * Parameters:
+ *
+ ********************************************************************************/
+int SampleUtil_RegisterUpdateFunction(state_update update_function);
 
-/*!
- * \brief
- */
+/********************************************************************************
+ * SampleUtil_StateUpdate
+ *
+ * Description: 
+ *
+ * Parameters:
+ *
+ ********************************************************************************/
 void SampleUtil_StateUpdate(
-	/*! [in] . */
 	const char *varName,
-	/*! [in] . */
 	const char *varValue,
-	/*! [in] . */
 	const char *UDN,
-	/*! [in] . */
 	eventType type);
 
-/*!
- * \brief Prints a string to standard out.
- */
-void linux_print(const char *format, ...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 1, 2)))
-#endif
-;
-
 #ifdef __cplusplus
 };
 #endif /* __cplusplus */
 
+
 #ifdef WIN32
 	#define snprintf	_snprintf
 	#define strcasecmp	stricmp
 #endif
 
-/*! @} UpnpSamples */
 
 #endif /* SAMPLE_UTIL_H */
 

upnp/sample/common/tv_device.h

@@ -1,571 +0,0 @@
-#ifndef UPNP_TV_DEVICE_H
-#define UPNP_TV_DEVICE_H
-
-/**************************************************************************
- *
- * 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.
- *
- **************************************************************************/
-
-/*!
- * \addtogroup UpnpSamples
- *
- * @{
- *
- * \name Device Sample API
- *
- * @{
- *
- * \file
- */
-
-#include <stdio.h>
-#include <signal.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "sample_util.h"
-
-#include "ithread.h"
-#include "upnp.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-/*! Color constants */
-#define MAX_COLOR 10
-#define MIN_COLOR 1
-
-/*! Brightness constants */
-#define MAX_BRIGHTNESS 10
-#define MIN_BRIGHTNESS 1
-
-/*! Power constants */
-#define POWER_ON 1
-#define POWER_OFF 0
-
-/*! Tint constants */
-#define MAX_TINT 10
-#define MIN_TINT 1
-
-/*! Volume constants */
-#define MAX_VOLUME 10
-#define MIN_VOLUME 1
-
-/*! Contrast constants */
-#define MAX_CONTRAST 10
-#define MIN_CONTRAST 1
-
-/*! Channel constants */
-#define MAX_CHANNEL 100
-#define MIN_CHANNEL 1
-
-/*! Number of services. */
-#define TV_SERVICE_SERVCOUNT  2
-
-/*! Index of control service */
-#define TV_SERVICE_CONTROL    0
-
-/*! Index of picture service */
-#define TV_SERVICE_PICTURE    1
-
-/*! Number of control variables */
-#define TV_CONTROL_VARCOUNT   3
-
-/*! Index of power variable */
-#define TV_CONTROL_POWER      0
-
-/*! Index of channel variable */
-#define TV_CONTROL_CHANNEL    1
-
-/*! Index of volume variable */
-#define TV_CONTROL_VOLUME     2
-
-/*! Number of picture variables */
-#define TV_PICTURE_VARCOUNT   4
-
-/*! Index of color variable */
-#define TV_PICTURE_COLOR      0
-
-/*! Index of tint variable */
-#define TV_PICTURE_TINT       1
-
-/*! Index of contrast variable */
-#define TV_PICTURE_CONTRAST   2
-
-/*! Index of brightness variable */
-#define TV_PICTURE_BRIGHTNESS 3
-
-/*! Max value length */
-#define TV_MAX_VAL_LEN 5
-
-/*! Max actions */
-#define TV_MAXACTIONS 12
-
-/*! This should be the maximum VARCOUNT from above */
-#define TV_MAXVARS TV_PICTURE_VARCOUNT
-
-/*!
- * \brief Prototype for all actions. For each action that a service 
- * implements, there is a corresponding function with this prototype.
- *
- * Pointers to these functions, along with action names, are stored
- * in the service table. When an action request comes in the action
- * name is matched, and the appropriate function is called.
- * Each function returns UPNP_E_SUCCESS, on success, and a nonzero 
- * error code on failure.
- */
-typedef int (*upnp_action)(
-	/*! [in] Document of action request. */
-	IXML_Document *request,
-	/*! [out] Action result. */
-	IXML_Document **out,
-	/*! [out] Error string in case action was unsuccessful. */
-	const char **errorString);
-
-/*! Structure for storing Tv Service identifiers and state table. */
-struct TvService {
-	/*! Universally Unique Device Name. */
-	char UDN[NAME_SIZE];
-	/*! . */
-	char ServiceId[NAME_SIZE];
-	/*! . */
-	char ServiceType[NAME_SIZE];
-	/*! . */
-	const char *VariableName[TV_MAXVARS]; 
-	/*! . */
-	char *VariableStrVal[TV_MAXVARS];
-	/*! . */
-	const char *ActionNames[TV_MAXACTIONS];
-	/*! . */
-	upnp_action actions[TV_MAXACTIONS];
-	/*! . */
-	int VariableCount;
-};
-
-/*! Array of service structures */
-extern struct TvService tv_service_table[];
-
-/*! Device handle returned from sdk */
-extern UpnpDevice_Handle device_handle;
-
-/*! Mutex for protecting the global state table data
- * in a multi-threaded, asynchronous environment.
- * All functions should lock this mutex before reading
- * or writing the state table data. */
-extern ithread_mutex_t TVDevMutex;
-
-/*!
- * \brief Initializes the action table for the specified service.
- *
- * Note that knowledge of the service description is assumed.
- * Action names are hardcoded.
- */
-int SetActionTable(
-	/*! [in] one of TV_SERVICE_CONTROL or, TV_SERVICE_PICTURE. */
-	int serviceType,
-	/*! [in,out] service containing action table to set. */
-	struct TvService *out);
-
-/*!
- * \brief Initialize the device state table for this TvDevice, pulling
- * identifier info from the description Document.
- *
- * Note that knowledge of the service description is assumed.
- * State table variables and default values are currently hardcoded in
- * this file rather than being read from service description documents.
- */
-int TvDeviceStateTableInit(
-	/*! [in] The description document URL. */
-	char *DescDocURL);
-
-/*!
- * \brief Called during a subscription request callback.
- *
- * If the subscription request is for this device and either its
- * control service or picture service, then accept it.
- */
-int TvDeviceHandleSubscriptionRequest(
-	/*! [in] The subscription request event structure. */
-	const UpnpSubscriptionRequest *sr_event);
-
-/*!
- * \brief Called during a get variable request callback.
- *
- * If the request is for this device and either its control service or
- * picture service, then respond with the variable value.
- */
-int TvDeviceHandleGetVarRequest(
-	/*! [in,out] The control get variable request event structure. */
-	UpnpStateVarRequest *cgv_event);
-
-/*!
- * \brief Called during an action request callback.
- *
- * If the request is for this device and either its control service
- * or picture service, then perform the action and respond.
- */
-int TvDeviceHandleActionRequest(
-	/*! [in,out] The control action request event structure. */
-	UpnpActionRequest *ca_event);
-
-/*!
- * \brief The callback handler registered with the SDK while registering
- * root device.
- *
- * Dispatches the request to the appropriate procedure
- * based on the value of EventType. The four requests handled by the 
- * device are: 
- *	\li 1) Event Subscription requests.  
- *	\li 2) Get Variable requests. 
- *	\li 3) Action requests.
- */
-int TvDeviceCallbackEventHandler(
-	/*! [in] The type of callback event. */
-	Upnp_EventType,
-	/*! [in] Data structure containing event data. */
-	const void *Event,
-	/*! [in] Optional data specified during callback registration. */
-	void *Cookie);
-
-/*!
- * \brief Update the TvDevice service state table, and notify all subscribed
- * control points of the updated state.
- *
- * Note that since this function blocks on the mutex TVDevMutex,
- * to avoid a hang this function should not be called within any other
- * function that currently has this mutex locked.
- */
-int TvDeviceSetServiceTableVar(
-	/*! [in] The service number (TV_SERVICE_CONTROL or TV_SERVICE_PICTURE). */
-	unsigned int service,
-	/*! [in] The variable number (TV_CONTROL_POWER, TV_CONTROL_CHANNEL,
-	 * TV_CONTROL_VOLUME, TV_PICTURE_COLOR, TV_PICTURE_TINT,
-	 * TV_PICTURE_CONTRAST, or TV_PICTURE_BRIGHTNESS). */
-	int variable,
-	/*! [in] The string representation of the new value. */
-	char *value);
-
-/* Control Service Actions */
-
-/*!
- * \brief Turn the power on.
- */
-int TvDevicePowerOn(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Turn the power off.
- */
-int TvDevicePowerOff(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the channel, update the TvDevice control service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetChannel(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the channel.  
- */
-int TvDeviceIncreaseChannel(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the channel.  
- */
-int TvDeviceDecreaseChannel(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the volume, update the TvDevice control service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- */
-int TvDeviceSetVolume(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the volume. 
- */
-int TvDeviceIncreaseVolume(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the volume.
- */
-int TvDeviceDecreaseVolume(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*Picture Service Actions */
-
-/*!
- * \brief Change the color, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetColor(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the color.
- */
-int TvDeviceIncreaseColor(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the color.  
- */
-int TvDeviceDecreaseColor(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the tint, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetTint(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase tint.
- */
-int TvDeviceIncreaseTint(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease tint.
- */
-int TvDeviceDecreaseTint(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the contrast, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetContrast(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the contrast.
- */
-int TvDeviceIncreaseContrast(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the contrast.
- */
-int TvDeviceDecreaseContrast(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the brightness, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetBrightness(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase brightnesss.
- */
-int TvDeviceIncreaseBrightness(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease brightnesss.
- */
-int TvDeviceDecreaseBrightness(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Initializes the UPnP Sdk, registers the device, and sends out
- * advertisements.
- */
-int TvDeviceStart(
-	/*! [in] ip address to initialize the sdk (may be NULL)
-	 * if null, then the first non null loopback address is used. */
-	char *ip_address,
-	/*! [in] port number to initialize the sdk (may be 0)
-	 * if zero, then a random number is used. */
-	unsigned short port,
-	/*! [in] name of description document.
-	 * may be NULL. Default is tvdevicedesc.xml. */
-	const char *desc_doc_name,
-	/*! [in] path of web directory.
-	 * may be NULL. Default is ./web (for Linux) or ../tvdevice/web. */
-	const char *web_dir_path,
-	/*! [in] print function to use. */
-	print_string pfun,
-	/*! [in] Non-zero if called from the combo application. */
-	int combo);
-
-/*!
- * \brief Stops the device. Uninitializes the sdk.
- */
-int TvDeviceStop(void);
-
-/*!
- * \brief Function that receives commands from the user at the command prompt
- * during the lifetime of the device, and calls the appropriate
- * functions for those commands. Only one command, exit, is currently
- * defined.
- */
-void *TvDeviceCommandLoop(void *args);
-
-/*!
- * \brief Main entry point for tv device application.
- *
- * Initializes and registers with the sdk.
- * Initializes the state stables of the service.
- * Starts the command loop.
- *
- * Accepts the following optional arguments:
- *	\li \c -ip ipaddress
- *	\li \c -port port
- *	\li \c -desc desc_doc_name
- *	\li \c -webdir web_dir_path
- *	\li \c -help
- */
-int device_main(int argc, char *argv[]);
-
-#ifdef __cplusplus
-}
-#endif
-
-/*! @} Control Point Sample API */
-
-/*! @} UpnpSamples */
-
-#endif /* UPNP_TV_DEVICE_H */

upnp/sample/linux/tv_combo_main.c

@@ -1,75 +0,0 @@
-/*******************************************************************************
- *
- * 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 "sample_util.h"
-#include "tv_ctrlpt.h"
-#include "tv_device.h"
-
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char *argv[])
-{
-	int rc;
-	ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
-#endif
-	int code;
-
-	device_main(argc, argv);
-	rc = TvCtrlPointStart(linux_print, NULL, 1);
-	if (rc != TV_SUCCESS) {
-		SampleUtil_Print("Error starting UPnP TV Control Point\n");
-		return rc;
-	}
-	/* start a command loop thread */
-	code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
-	if (code !=  0) {
-		return UPNP_E_INTERNAL_ERROR;
-	}
-#ifdef WIN32
-	ithread_join(cmdloop_thread, NULL);
-#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
-	TvDeviceStop();
-	rc = TvCtrlPointStop();
-
-	return rc;
-}
-

upnp/sample/linux/tv_ctrlpt_main.c

@@ -1,75 +0,0 @@
-/*******************************************************************************
- *
- * 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 "sample_util.h"
-#include "tv_ctrlpt.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char **argv)
-{
-	int rc;
-	ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
-#endif
-	int code;
-
-	rc = TvCtrlPointStart(linux_print, NULL, 0);
-	if (rc != TV_SUCCESS) {
-		SampleUtil_Print("Error starting UPnP TV Control Point\n");
-		return rc;
-	}
-	/* start a command loop thread */
-	code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
-	if (code !=  0) {
-		return UPNP_E_INTERNAL_ERROR;
-	}
-#ifdef WIN32
-	ithread_join(cmdloop_thread, NULL);
-#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 = TvCtrlPointStop();
-
-	return rc;
-	argc = argc;
-	argv = argv;
-}
-

upnp/sample/linux/tv_device_main.c

@@ -1,72 +0,0 @@
-/*******************************************************************************
- *
- * 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 "sample_util.h"
-#include "tv_device.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-	int rc;
-	ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
-#endif
-	int code;
-
-	rc = device_main(argc, argv);
-	if (rc != UPNP_E_SUCCESS) {
-		return rc;
-	}
-
-	/* start a command loop thread */
-	code = ithread_create(&cmdloop_thread, NULL, TvDeviceCommandLoop, NULL);
-	if (code !=  0) {
-		return UPNP_E_INTERNAL_ERROR;
-	}
-#ifdef WIN32
-	ithread_join(cmdloop_thread, NULL);
-#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;
-}
-