Creation of the tag for release-1.6.6.

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

ChangeLog

@@ -1,3 +1,76 @@
+*******************************************************************************
+Version 1.6.6
+*******************************************************************************
+
+2008-04-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added thread id's to the UpnpPrintf debug messages. Thanks to
+	Charles Nepveu for the idea.
+
+2008-04-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	*  SF Bug Tracker [ 1948586 ]
+	Uppercase U in in "xmlns:U" in Invoke Action causes seg. f.
+	Submitted By: Thomas Norheim - kjakan_no
+	Device no longer segfaults with the following malformed xml action:
+	<u:SetColor xmlns:U="urn:schemas-upnp-org:service:tvpicture:1">
+		<Color>2</Color>
+	</u:SetColor>
+
+2008-04-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Use -O0 in debug builds so that variables do not get optimized out.
+
+2008-04-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Apostolos Syropoulos changes for OpenSolaris x86.
+
+2008-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
+	windows systems with VC9.
+
+2008-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
+	windows systems with VC8.
+
+2008-03-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed a printf format problem on the upnp_tv_device.c from both
+	upnp/sample/tvdevie and upnp/sample/tvcombo directories. The variable
+	port was a short int instead of an unsigned short and it was beeing
+	print as a negative value.
+
+2008-03-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 1902668 ] Cannot compile on MSVC
+	Submitted By Luke Kim - nereusuj
+	Version 1.6.5 cannot be compiled because of some changes in 1.6.3.
+	MSVC does not support stdint.h, gettimeofday(), sys/param.h, const int
+	variables in array size and Windows does not define _WINDOWS_ but define
+	_WINDOWS.
+	* MSVC does not understand "const int"'s as declarators of array
+	dimensions, we must use #define'd constants.
+	* Use WIN32 instead of _WINDOWS_ or _WINDOWS.
+
+2008-02-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* No longer ignore "upnp:rootdevice" advertisement. Thanks to Bob Ciora.
+
+2008-02-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Changed "sys_errlist[errno]", which is deprecated, by
+	"strerror_r()", which is thread safe.
+
+2008-02-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Slightly improved error report by showing the sys_errlist string
+	corresponding to errno.
+
+2008-02-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Got rid of two useless constants: UPNP_SOCKETERROR and
+	UPNP_INVALID_SOCKET. They both mean the same, that a network API
+	function has failed. -1 is the value to check, not an invented constant.
+
+*******************************************************************************
+Version 1.6.5
+*******************************************************************************
+
+2008-02-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Peter Hartley's fix for wrong sized variable beeing passed to
+	http_MakeMessage() on 64 bit architectures.
+
+
 *******************************************************************************
 Version 1.6.4
 *******************************************************************************

THANKS

@@ -7,9 +7,12 @@ Here is a list of these people. Help us keep it complete and
 exempt of errors.
 
 - Alex (afaucher)
+- Andre Sodermans (wienerschnitzel)
+- Apostolos Syropoulos
 - Arno Willig
 - Bob Ciora
 - Chaos
+- Charles Nepveu (cnepveu)
 - Chris Pickel
 - Craig Nelson
 - David Maass
@@ -30,7 +33,7 @@ exempt of errors.
 - Keith Brindley
 - Leuk_He
 - Loigu
-- Luke Kim
+- Luke Kim (nereusuj)
 - Marcelo Roberto Jimenez (mroberto)
 - Markus Strobl
 - Nektarios K. Papadopoulos (npapadop)

build/msvc/stdint.h

@@ -0,0 +1,222 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   extern "C++" {
+#endif 
+#     include <wchar.h>
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   }
+#endif
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef __int64           intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef int               intptr_t;
+   typedef unsigned int      uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]

build/vc8/ixml.vcproj

@@ -0,0 +1,223 @@
+<?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"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<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="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\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\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\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc8/libupnp.sln

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

build/vc8/libupnp.vcproj

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

build/vc8/threadutil.vcproj

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

build/vc8/tvcombo.vcproj

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

build/vc8/tvctrlpt.vcproj

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

build/vc8/tvdevice.vcproj

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

build/vc9/ixml.vcproj

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ixml"
+	ProjectGUID="{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
+	RootNamespace="ixml"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(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"
+				PreprocessorDefinitions="DEBUG;WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<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="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			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"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="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\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\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/libupnp.sln

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

build/vc9/libupnp.vcproj

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

build/vc9/threadutil.vcproj

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

build/vc9/tvcombo.vcproj

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="tvcombo"
+	ProjectGUID="{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
+	RootNamespace="tvcombo"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
+				PreprocessorDefinitions="DEBUG;WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			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"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\linux\upnp_tv_combo_main.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.c"
+				>
+			</File>
+			<File
+				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"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/tvctrlpt.vcproj

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

build/vc9/tvdevice.vcproj

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

configure.ac

@@ -9,7 +9,7 @@
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.6.4], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.6], [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:
@@ -120,9 +120,33 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
 dnl #AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
 dnl #
 dnl ############################################################################
+dnl # Release 1.6.5:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in upnp
+dnl #	revision: 3 -> 4
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [3:4:0])
+dnl #
+dnl ############################################################################
+dnl # Release 1.6.6:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in threadutil
+dnl #	revision: 2 -> 3
+dnl # - Code has changed in upnp
+dnl #	revision: 4 -> 5
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
+dnl #
+dnl ############################################################################
 AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
-AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [4:3: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++
@@ -277,7 +301,9 @@ 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
-		:
+		#:
+		# Use -O0 in debug so that variables do not get optimized out
+		AX_CFLAGS_GCC_OPTION([-O0])
 	else
 		# add optimise for size
 		AX_CFLAGS_GCC_OPTION([-Os])

ixml/src/document.c

@@ -268,7 +268,7 @@ ixmlDocument_createDocumentEx( OUT IXML_Document ** rtDoc )
 *
 *=================================================================*/
 IXML_Document *
-ixmlDocument_createDocument(  )
+ixmlDocument_createDocument()
 {
     IXML_Document *doc = NULL;
 

ixml/src/ixmlparser.c

@@ -483,7 +483,7 @@ Parser_UTF8ToInt( IN const char *ss,
 *			
 *===============================================================================*/
 static Parser *
-Parser_init(  )
+Parser_init()
 {
     Parser *newParser = NULL;
 
@@ -677,7 +677,7 @@ Parser_LoadDocument( OUT IXML_Document ** retDoc,
     int rc = IXML_SUCCESS;
     Parser *xmlParser = NULL;
 
-    xmlParser = Parser_init(  );
+    xmlParser = Parser_init();
     if( xmlParser == NULL ) {
         return IXML_INSUFFICIENT_MEMORY;
     }

ixml/src/node.c

@@ -261,7 +261,7 @@ ixmlNode_setLocalName( IN IXML_Node * nodeptr,
 }
 
 /*================================================================
-*   ixmlNode_getNodeNamespaceURI
+*   ixmlNode_getNamespaceURI
 *       Returns the node namespaceURI
 *       External function.
 *   Returns:		

libupnp.spec

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

threadutil/inc/ThreadPool.h

@@ -79,7 +79,20 @@ typedef enum priority {LOW_PRIORITY,
 #endif
 
 #include "LinkedList.h"
-#include <sys/time.h> /* for gettimeofday() */
+
+#ifdef WIN32
+    #include <time.h>
+    #include <winsock2.h>
+    struct timezone 
+    {
+        int  tz_minuteswest; /* minutes W of Greenwich */
+        int  tz_dsttime;     /* type of dst correction */
+    };
+    int gettimeofday(struct timeval *tv, struct timezone *tz);
+#else /* WIN32 */
+    #include <sys/time.h> /* for gettimeofday() */
+#endif
+
 #include "FreeList.h"
 
 #include "ithread.h"

threadutil/inc/ithread.h

@@ -715,7 +715,11 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
+#ifndef WIN32
 #define isleep sleep
+#else
+#define isleep(x) Sleep((x)*1000)
+#endif
 
 /****************************************************************************
  * Function: isleep
@@ -730,7 +734,11 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
+#ifndef WIN32
 #define imillisleep(x) usleep(1000*x)
+#else
+#define imillisleep	Sleep
+#endif
 
 #ifdef WIN32
 	#ifndef UPNP_STATIC_LIB

threadutil/src/LinkedList.c

@@ -30,11 +30,13 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "LinkedList.h"
-#include <sys/param.h>
+#ifndef WIN32
+	#include <sys/param.h>
+#endif
 #if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
-#include <stdlib.h>
+	#include <stdlib.h>
 #else
-#include <malloc.h>
+	#include <malloc.h>
 #endif
 #include <assert.h>
 
@@ -532,3 +534,4 @@ ListSize( LinkedList * list )
 
     return list->size;
 }
+

threadutil/src/ThreadPool.c

@@ -391,7 +391,7 @@ static void SetSeed()
  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
 #elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__sun)
  	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );
 #else
 	{
@@ -1597,3 +1597,45 @@ int ThreadPoolGetStats( ThreadPool *tp, ThreadPoolStats *stats )
 
 #endif /* STATS */
 
+#ifdef WIN32
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
+	#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
+#else
+	#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
+#endif
+ 
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+    FILETIME ft;
+    unsigned __int64 tmpres = 0;
+    static int tzflag;
+
+    if (NULL != tv)
+    {
+        GetSystemTimeAsFileTime(&ft);
+
+        tmpres |= ft.dwHighDateTime;
+        tmpres <<= 32;
+        tmpres |= ft.dwLowDateTime;
+
+        /*converting file time to unix epoch*/
+        tmpres /= 10;  /*convert into microseconds*/
+        tmpres -= DELTA_EPOCH_IN_MICROSECS; 
+        tv->tv_sec = (long)(tmpres / 1000000UL);
+        tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+    if (NULL != tz)
+    {
+        if (!tzflag)
+        {
+            _tzset();
+            tzflag++;
+        }
+        tz->tz_minuteswest = _timezone / 60;
+        tz->tz_dsttime = _daylight;
+    }
+
+    return 0;
+}
+#endif /* WIN32 */

upnp/inc/upnp.h

@@ -47,7 +47,9 @@
 
 
 #include <stdio.h>
-#include <sys/param.h>
+#ifndef WIN32
+	#include <sys/param.h>
+#endif
 #if (defined(BSD) && BSD >= 199306)
 	#include <time.h>
 #endif
@@ -102,8 +104,6 @@
 	#define UpnpCloseSocket closesocket
 	#define fseeko fseek
 #endif
-#define UPNP_SOCKETERROR -1
-#define UPNP_INVALID_SOCKET -1
 #ifndef WIN32
 	#define SOCKET int
 #endif

upnp/sample/common/sample_util.c

@@ -105,7 +105,7 @@ SampleUtil_RegisterUpdateFunction( state_update update_function )
  *
  ********************************************************************************/
 int
-SampleUtil_Finish(  )
+SampleUtil_Finish()
 {
     ithread_mutex_destroy( &display_mutex );
     gPrintFun = NULL;

upnp/sample/common/sample_util.h

@@ -34,24 +34,26 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
+
 
 #include <stdlib.h>
-
 #include <string.h>
 
-#include "upnptools.h"
 #include "ithread.h"
 #include "ixml.h"
+#include "upnptools.h"
+
+
+// mutex to control displaying of events
+extern ithread_mutex_t display_mutex;
 
-//mutex to control displaying of events
-extern ithread_mutex_t display_mutex ;
 
 typedef enum {
 	STATE_UPDATE = 0,
-	DEVICE_ADDED =1,
-	DEVICE_REMOVED=2,
-	GET_VAR_COMPLETE=3
+	DEVICE_ADDED = 1,
+	DEVICE_REMOVED = 2,
+	GET_VAR_COMPLETE = 3
 } eventType;
 
 
@@ -68,7 +70,7 @@ typedef enum {
  *   node -- The DOM node from which to extract the value
  *
  ********************************************************************************/
-char * SampleUtil_GetElementValue(IN IXML_Element *element);
+char *SampleUtil_GetElementValue(IN IXML_Element *element);
 
 /********************************************************************************
  * SampleUtil_GetFirstServiceList
@@ -85,7 +87,7 @@ char * SampleUtil_GetElementValue(IN IXML_Element *element);
  *
  ********************************************************************************/
 
-IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document * doc); 
+IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document *doc); 
 
 
 /********************************************************************************
@@ -100,7 +102,7 @@ IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document * doc);
  *   item -- The item to search for
  *
  ********************************************************************************/
-char * SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *item); 
+char *SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *item); 
 
 
 
@@ -116,7 +118,7 @@ char * SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *ite
  *   item -- The item to search for
  *
  ********************************************************************************/
-char * SampleUtil_GetFirstElementItem(IN IXML_Element *element, IN const char *item); 
+char *SampleUtil_GetFirstElementItem(IN IXML_Element *element, IN const char *item); 
 
 /********************************************************************************
  * SampleUtil_PrintEventType
@@ -162,9 +164,13 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType,
  *   controlURL -- OUT -- The control URL for the service
  *
  ********************************************************************************/
-int SampleUtil_FindAndParseService (IN IXML_Document *DescDoc, IN char* location, 
-				    IN char *serviceType, OUT char **serviceId, 
-				    OUT char **eventURL, OUT char **controlURL);
+int SampleUtil_FindAndParseService (
+	IN IXML_Document *DescDoc,
+	IN char* location, 
+	IN char *serviceType,
+	OUT char **serviceId, 
+	OUT char **eventURL,
+	OUT char **controlURL);
 
 
 /********************************************************************************
@@ -196,8 +202,11 @@ extern print_string gPrintFun;
  *   const char * UDN
  *   int          newDevice
  ********************************************************************************/
-typedef void (*state_update)( const char *varName, const char *varValue, const char *UDN,
-							 eventType type);
+typedef void (*state_update)(
+	const char *varName,
+	const char *varValue,
+	const char *UDN,
+	eventType type);
 
 //global state update function used by smaple util
 extern state_update gStateUpdateFun;
@@ -224,7 +233,7 @@ int SampleUtil_Initialize(print_string print_function);
  * Parameters:
  *
  ********************************************************************************/
-int SampleUtil_Finish(void);
+int SampleUtil_Finish();
 
 /********************************************************************************
  * SampleUtil_Print
@@ -238,7 +247,7 @@ int SampleUtil_Finish(void);
  *   . . .  - variable number of args. (see printf)
  *
  ********************************************************************************/
-int SampleUtil_Print( char *fmt, ... );
+int SampleUtil_Print(char *fmt, ...);
 
 /********************************************************************************
  * SampleUtil_RegisterUpdateFunction
@@ -248,7 +257,7 @@ int SampleUtil_Print( char *fmt, ... );
  * Parameters:
  *
  ********************************************************************************/
-int SampleUtil_RegisterUpdateFunction( state_update update_function );
+int SampleUtil_RegisterUpdateFunction(state_update update_function);
 
 /********************************************************************************
  * SampleUtil_StateUpdate
@@ -258,11 +267,22 @@ int SampleUtil_RegisterUpdateFunction( state_update update_function );
  * Parameters:
  *
  ********************************************************************************/
-void SampleUtil_StateUpdate( const char *varName, const char *varValue, const char *UDN,
-							eventType type);
+void SampleUtil_StateUpdate(
+	const char *varName,
+	const char *varValue,
+	const char *UDN,
+	eventType type);
 
 #ifdef __cplusplus
 };
+#endif /* __cplusplus */
+
+
+#ifdef WIN32
+	#define snprintf	_snprintf
+	#define strcasecmp	stricmp
 #endif
 
-#endif /* UPNPSDK_UTIL_H */
+
+#endif /* SAMPLE_UTIL_H */
+

upnp/sample/tvcombo/linux/upnp_tv_combo_main.c

@@ -449,17 +449,17 @@ device_main( int argc, char **argv )
 
     port = ( unsigned short )portTemp;
 
-    return TvDeviceStart(
-        ip_address, port, desc_doc_name, web_dir_path, linux_print );
+    return TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path, linux_print );
 }
 
-int
-main( int argc, char **argv )
+int main( int argc, char **argv )
 {
     int rc;
     ithread_t cmdloop_thread;
+#ifndef WIN32
     int sig;
     sigset_t sigs_to_catch;
+#endif
     int code;
 
     device_main(argc, argv);
@@ -468,11 +468,10 @@ main( int argc, char **argv )
         SampleUtil_Print( "Error starting UPnP TV Control Point" );
         return rc;
     }
-    // start a command loop thread
-    code =
-        ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
-                        NULL );
+    /* start a command loop thread */
+    code = ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL );
 
+#ifndef WIN32
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -480,7 +479,10 @@ main( int argc, char **argv )
     sigaddset( &sigs_to_catch, SIGINT );
     sigwait( &sigs_to_catch, &sig );
 
-    SampleUtil_Print( "Shutting down on signal %d...", sig );
+    SampleUtil_Print( "Shutting down on signal %d...\n", sig );
+#else
+	ithread_join(cmdloop_thread, NULL);
+#endif
     TvDeviceStop();
     rc = TvCtrlPointStop();
     

upnp/sample/tvcombo/upnp_tv_ctrlpt.c

@@ -224,7 +224,7 @@ TvCtrlPointRefresh( void )
 {
     int rc;
 
-    TvCtrlPointRemoveAll(  );
+    TvCtrlPointRemoveAll();
 
     /*
        Search for all devices of type tvdevice version 1, 
@@ -539,7 +539,7 @@ TvCtrlPointGetDevice( int devnum,
  *
  ********************************************************************************/
 int
-TvCtrlPointPrintList(  )
+TvCtrlPointPrintList()
 {
     struct TvDeviceNode *tmpdevnode;
     int i = 0;
@@ -1096,7 +1096,7 @@ TvCtrlPointCallbackEventHandler( Upnp_EventType EventType,
                 if( DescDoc )
                     ixmlDocument_free( DescDoc );
 
-                TvCtrlPointPrintList(  );
+                TvCtrlPointPrintList();
                 break;
             }
 
@@ -1122,7 +1122,7 @@ TvCtrlPointCallbackEventHandler( Upnp_EventType EventType,
                 TvCtrlPointRemoveDevice( d_event->DeviceId );
 
                 SampleUtil_Print( "After byebye:" );
-                TvCtrlPointPrintList(  );
+                TvCtrlPointPrintList();
 
                 break;
             }
@@ -1354,7 +1354,7 @@ TvCtrlPointStart( print_string printFunctionPtr,
 {
     ithread_t timer_thread;
     int rc;
-    short int port = 0;
+    unsigned short port = 0;
     char *ip_address = NULL;
 
     SampleUtil_Initialize( printFunctionPtr );
@@ -1362,34 +1362,42 @@ TvCtrlPointStart( print_string printFunctionPtr,
 
     ithread_mutex_init( &DeviceListMutex, 0 );
 
-    SampleUtil_Print( "Intializing UPnP with ipaddress=%s port=%d",
-                      ip_address, port );
+    SampleUtil_Print(
+        "Initializing UPnP Sdk with\n"
+        "\tipaddress = %s port = %u\n",
+        ip_address, port );
+
     rc = UpnpInit( ip_address, port );
     if( UPNP_E_SUCCESS != rc ) {
         SampleUtil_Print( "WinCEStart: UpnpInit() Error: %d", rc );
-        //UpnpFinish(  );
+        //UpnpFinish();
         //return TV_ERROR;
     }
 
-    if( NULL == ip_address )
-        ip_address = UpnpGetServerIpAddress(  );
-    if( 0 == port )
-        port = UpnpGetServerPort(  );
+    if( NULL == ip_address ) {
+        ip_address = UpnpGetServerIpAddress();
+    }
+    if( 0 == port ) {
+        port = UpnpGetServerPort();
+    }
 
-    SampleUtil_Print( "UPnP Initialized (%s:%d)", ip_address, port );
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
+        ip_address, port );
 
     SampleUtil_Print( "Registering Control Point" );
     rc = UpnpRegisterClient( TvCtrlPointCallbackEventHandler,
                              &ctrlpt_handle, &ctrlpt_handle );
     if( UPNP_E_SUCCESS != rc ) {
         SampleUtil_Print( "Error registering CP: %d", rc );
-        UpnpFinish(  );
+        UpnpFinish();
         return TV_ERROR;
     }
 
     SampleUtil_Print( "Control Point Registered" );
 
-    TvCtrlPointRefresh(  );
+    TvCtrlPointRefresh();
 
     // start a timer thread
     ithread_create( &timer_thread, NULL, TvCtrlPointTimerLoop, NULL );
@@ -1400,10 +1408,10 @@ TvCtrlPointStart( print_string printFunctionPtr,
 int
 TvCtrlPointStop( void )
 {
-    TvCtrlPointRemoveAll(  );
+    TvCtrlPointRemoveAll();
     UpnpUnRegisterClient( ctrlpt_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+    UpnpFinish();
+    SampleUtil_Finish();
 
     return TV_SUCCESS;
 }

upnp/sample/tvcombo/upnp_tv_ctrlpt.h

@@ -39,7 +39,9 @@ extern "C" {
 #include <stdio.h>
 
 #include "ithread.h"
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <signal.h>

upnp/sample/tvcombo/upnp_tv_device.c

@@ -1913,11 +1913,11 @@ TvDeviceCallbackEventHandler( Upnp_EventType EventType,
  *
  *****************************************************************************/
 int
-TvDeviceStop(  )
+TvDeviceStop()
 {
     UpnpUnRegisterRootDevice( device_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+    UpnpFinish();
+    SampleUtil_Finish();
     ithread_mutex_destroy( &TVDevMutex );
     return UPNP_E_SUCCESS;
 }
@@ -1958,32 +1958,37 @@ TvDeviceStart( char *ip_address,
 
     SampleUtil_Initialize( pfun );
 
-    SampleUtil_Print
-        ( "Initializing UPnP Sdk with \n \t ipaddress = %s port = %d\n",
-          ip_address, port );
+    SampleUtil_Print(
+        "Initializing UPnP Sdk with\n"
+        "\tipaddress = %s port = %u\n",
+        ip_address, port );
 
     if( ( ret = UpnpInit( ip_address, port ) ) != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error with UpnpInit -- %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     }
 
     if( ip_address == NULL ) {
-        ip_address = UpnpGetServerIpAddress(  );
+        ip_address = UpnpGetServerIpAddress();
     }
 
     if( port == 0 ) {
-        port = UpnpGetServerPort(  );
+        port = UpnpGetServerPort();
     }
 
-    SampleUtil_Print( "UPnP Initialized\n \t ipaddress= %s port = %d\n",
-                      ip_address, port );
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
+        ip_address, port );
 
-    if( desc_doc_name == NULL )
+    if( desc_doc_name == NULL ) {
         desc_doc_name = "tvcombodesc.xml";
+    }
 
-    if( web_dir_path == NULL )
+    if( web_dir_path == NULL ) {
         web_dir_path = DEFAULT_WEB_DIR;
+    }
 
     snprintf( desc_doc_url, DESC_URL_SIZE, "http://%s:%d/%s", ip_address,
               port, desc_doc_name );
@@ -1995,37 +2000,39 @@ TvDeviceStart( char *ip_address,
         SampleUtil_Print
             ( "Error specifying webserver root directory -- %s: %d\n",
               web_dir_path, ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     }
 
-    SampleUtil_Print
-        ( "Registering the RootDevice\n\t with desc_doc_url: %s\n",
-          desc_doc_url );
+    SampleUtil_Print(
+        "Registering the RootDevice\n"
+        "\t with desc_doc_url: %s\n",
+        desc_doc_url );
 
     if( ( ret = UpnpRegisterRootDevice( desc_doc_url,
                                         TvDeviceCallbackEventHandler,
                                         &device_handle, &device_handle ) )
         != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error registering the rootdevice : %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     } else {
-        SampleUtil_Print( "RootDevice Registered\n" );
-
-        SampleUtil_Print( "Initializing State Table\n" );
+        SampleUtil_Print(
+            "RootDevice Registered\n"
+            "Initializing State Table\n");
         TvDeviceStateTableInit( desc_doc_url );
-        SampleUtil_Print( "State Table Initialized\n" );
+        SampleUtil_Print("State Table Initialized\n");
 
         if( ( ret =
               UpnpSendAdvertisement( device_handle, default_advr_expire ) )
             != UPNP_E_SUCCESS ) {
             SampleUtil_Print( "Error sending advertisements : %d\n", ret );
-            UpnpFinish(  );
+            UpnpFinish();
             return ret;
         }
 
-        SampleUtil_Print( "Advertisements Sent\n" );
+        SampleUtil_Print("Advertisements Sent\n");
     }
     return UPNP_E_SUCCESS;
 }
+

upnp/sample/tvcombo/upnp_tv_device.h

@@ -41,7 +41,9 @@ extern "C" {
 
 #include "ithread.h"
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 #include "upnp.h"
 #include "sample_util.h"

upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c

@@ -29,9 +29,12 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include <stdio.h>
+
 #include "sample_util.h"
 #include "upnp_tv_ctrlpt.h"
+
+
+#include <stdio.h>
 #include <string.h>
 
 /*
@@ -124,108 +127,72 @@ TvCtrlPointPrintLongHelp( void )
     SampleUtil_Print( "* TV Control Point Help Info *" );
     SampleUtil_Print( "******************************" );
     SampleUtil_Print( "" );
-    SampleUtil_Print
-        ( "This sample control point application automatically searches" );
-    SampleUtil_Print
-        ( "for and subscribes to the services of television device emulator" );
-    SampleUtil_Print
-        ( "devices, described in the tvdevicedesc.xml description document." );
+    SampleUtil_Print( "This sample control point application automatically searches" );
+    SampleUtil_Print( "for and subscribes to the services of television device emulator" );
+    SampleUtil_Print( "devices, described in the tvdevicedesc.xml description document." );
     SampleUtil_Print( "" );
     SampleUtil_Print( "Commands:" );
     SampleUtil_Print( "  Help" );
     SampleUtil_Print( "       Print this help info." );
     SampleUtil_Print( "  ListDev" );
-    SampleUtil_Print
-        ( "       Print the current list of TV Device Emulators that this" );
-    SampleUtil_Print
-        ( "         control point is aware of.  Each device is preceded by a" );
-    SampleUtil_Print
-        ( "         device number which corresponds to the devnum argument of" );
+    SampleUtil_Print( "       Print the current list of TV Device Emulators that this" );
+    SampleUtil_Print( "         control point is aware of.  Each device is preceded by a" );
+    SampleUtil_Print( "         device number which corresponds to the devnum argument of" );
     SampleUtil_Print( "         commands listed below." );
     SampleUtil_Print( "  Refresh" );
-    SampleUtil_Print
-        ( "       Delete all of the devices from the device list and issue new" );
-    SampleUtil_Print
-        ( "         search request to rebuild the list from scratch." );
+    SampleUtil_Print( "       Delete all of the devices from the device list and issue new" );
+    SampleUtil_Print( "         search request to rebuild the list from scratch." );
     SampleUtil_Print( "  PrintDev       <devnum>" );
-    SampleUtil_Print
-        ( "       Print the state table for the device <devnum>." );
-    SampleUtil_Print
-        ( "         e.g., 'PrintDev 1' prints the state table for the first" );
+    SampleUtil_Print( "       Print the state table for the device <devnum>." );
+    SampleUtil_Print( "         e.g., 'PrintDev 1' prints the state table for the first" );
     SampleUtil_Print( "         device in the device list." );
     SampleUtil_Print( "  PowerOn        <devnum>" );
-    SampleUtil_Print
-        ( "       Sends the PowerOn action to the Control Service of" );
+    SampleUtil_Print( "       Sends the PowerOn action to the Control Service of" );
     SampleUtil_Print( "         device <devnum>." );
     SampleUtil_Print( "  PowerOff       <devnum>" );
-    SampleUtil_Print
-        ( "       Sends the PowerOff action to the Control Service of" );
+    SampleUtil_Print( "       Sends the PowerOff action to the Control Service of" );
     SampleUtil_Print( "         device <devnum>." );
     SampleUtil_Print( "  SetChannel     <devnum> <channel>" );
-    SampleUtil_Print
-        ( "       Sends the SetChannel action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the channel to be changed" );
+    SampleUtil_Print( "       Sends the SetChannel action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the channel to be changed" );
     SampleUtil_Print( "         to <channel>." );
     SampleUtil_Print( "  SetVolume      <devnum> <volume>" );
-    SampleUtil_Print
-        ( "       Sends the SetVolume action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the volume to be changed" );
+    SampleUtil_Print( "       Sends the SetVolume action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the volume to be changed" );
     SampleUtil_Print( "         to <volume>." );
     SampleUtil_Print( "  SetColor       <devnum> <color>" );
-    SampleUtil_Print
-        ( "       Sends the SetColor action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the color to be changed" );
+    SampleUtil_Print( "       Sends the SetColor action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the color to be changed" );
     SampleUtil_Print( "         to <color>." );
     SampleUtil_Print( "  SetTint        <devnum> <tint>" );
-    SampleUtil_Print
-        ( "       Sends the SetTint action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the tint to be changed" );
+    SampleUtil_Print( "       Sends the SetTint action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the tint to be changed" );
     SampleUtil_Print( "         to <tint>." );
     SampleUtil_Print( "  SetContrast    <devnum> <contrast>" );
-    SampleUtil_Print
-        ( "       Sends the SetContrast action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the contrast to be changed" );
+    SampleUtil_Print( "       Sends the SetContrast action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the contrast to be changed" );
     SampleUtil_Print( "         to <contrast>." );
     SampleUtil_Print( "  SetBrightness  <devnum> <brightness>" );
-    SampleUtil_Print
-        ( "       Sends the SetBrightness action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the brightness to be changed" );
+    SampleUtil_Print( "       Sends the SetBrightness action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the brightness to be changed" );
     SampleUtil_Print( "         to <brightness>." );
     SampleUtil_Print( "  CtrlAction     <devnum> <action>" );
-    SampleUtil_Print
-        ( "       Sends an action request specified by the string <action>" );
-    SampleUtil_Print
-        ( "         to the Control Service of device <devnum>.  This command" );
-    SampleUtil_Print
-        ( "         only works for actions that have no arguments." );
-    SampleUtil_Print
-        ( "         (e.g., \"CtrlAction 1 IncreaseChannel\")" );
+    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
+    SampleUtil_Print( "         to the Control Service of device <devnum>.  This command" );
+    SampleUtil_Print( "         only works for actions that have no arguments." );
+    SampleUtil_Print( "         (e.g., \"CtrlAction 1 IncreaseChannel\")" );
     SampleUtil_Print( "  PictAction     <devnum> <action>" );
-    SampleUtil_Print
-        ( "       Sends an action request specified by the string <action>" );
-    SampleUtil_Print
-        ( "         to the Picture Service of device <devnum>.  This command" );
-    SampleUtil_Print
-        ( "         only works for actions that have no arguments." );
-    SampleUtil_Print
-        ( "         (e.g., \"PictAction 1 DecreaseContrast\")" );
+    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
+    SampleUtil_Print( "         to the Picture Service of device <devnum>.  This command" );
+    SampleUtil_Print( "         only works for actions that have no arguments." );
+    SampleUtil_Print( "         (e.g., \"PictAction 1 DecreaseContrast\")" );
     SampleUtil_Print( "  CtrlGetVar     <devnum> <varname>" );
-    SampleUtil_Print
-        ( "       Requests the value of a variable specified by the string <varname>" );
-    SampleUtil_Print
-        ( "         from the Control Service of device <devnum>." );
+    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
+    SampleUtil_Print( "         from the Control Service of device <devnum>." );
     SampleUtil_Print( "         (e.g., \"CtrlGetVar 1 Volume\")" );
     SampleUtil_Print( "  PictGetVar     <devnum> <action>" );
-    SampleUtil_Print
-        ( "       Requests the value of a variable specified by the string <varname>" );
-    SampleUtil_Print
-        ( "         from the Picture Service of device <devnum>." );
+    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
+    SampleUtil_Print( "         from the Picture Service of device <devnum>." );
     SampleUtil_Print( "         (e.g., \"PictGetVar 1 Tint\")" );
     SampleUtil_Print( "  Exit" );
     SampleUtil_Print( "       Exits the control point application." );
@@ -242,7 +209,7 @@ TvCtrlPointPrintLongHelp( void )
  *
  ********************************************************************************/
 void
-TvCtrlPointPrintCommands(  )
+TvCtrlPointPrintCommands()
 {
     int i;
     int numofcmds = sizeof( cmdloop_cmdlist ) / sizeof( cmdloop_commands );
@@ -321,11 +288,11 @@ TvCtrlPointProcessCommand( char *cmdline )
 
     switch ( cmdnum ) {
         case PRTHELP:
-            TvCtrlPointPrintShortHelp(  );
+            TvCtrlPointPrintShortHelp();
             break;
 
         case PRTFULLHELP:
-            TvCtrlPointPrintLongHelp(  );
+            TvCtrlPointPrintLongHelp();
             break;
 
         case POWON:
@@ -411,15 +378,15 @@ TvCtrlPointProcessCommand( char *cmdline )
             break;
 
         case LSTDEV:
-            TvCtrlPointPrintList(  );
+            TvCtrlPointPrintList();
             break;
 
         case REFRESH:
-            TvCtrlPointRefresh(  );
+            TvCtrlPointRefresh();
             break;
 
         case EXITCMD:
-            rc = TvCtrlPointStop(  );
+            rc = TvCtrlPointStop();
             exit( rc );
             break;
 
@@ -440,20 +407,23 @@ main( int argc,
 {
     int rc;
     ithread_t cmdloop_thread;
+#ifndef WIN32
     int sig;
     sigset_t sigs_to_catch;
+#endif
     int code;
 
     rc = TvCtrlPointStart( linux_print, NULL );
     if( rc != TV_SUCCESS ) {
         SampleUtil_Print( "Error starting UPnP TV Control Point" );
-        exit( rc );
+        return rc;
     }
     // start a command loop thread
     code =
         ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
                         NULL );
 
+#ifndef WIN32
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -462,6 +432,10 @@ main( int argc,
     sigwait( &sigs_to_catch, &sig );
 
     SampleUtil_Print( "Shutting down on signal %d...", sig );
-    rc = TvCtrlPointStop(  );
-    exit( rc );
+#else
+	ithread_join(cmdloop_thread, NULL);
+#endif
+
+    rc = TvCtrlPointStop();
+    return rc;
 }

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

@@ -224,7 +224,7 @@ TvCtrlPointRefresh( void )
 {
     int rc;
 
-    TvCtrlPointRemoveAll(  );
+    TvCtrlPointRemoveAll();
 
     /*
        Search for all devices of type tvdevice version 1, 
@@ -539,7 +539,7 @@ TvCtrlPointGetDevice( int devnum,
  *
  ********************************************************************************/
 int
-TvCtrlPointPrintList(  )
+TvCtrlPointPrintList()
 {
     struct TvDeviceNode *tmpdevnode;
     int i = 0;
@@ -1096,7 +1096,7 @@ TvCtrlPointCallbackEventHandler( Upnp_EventType EventType,
                 if( DescDoc )
                     ixmlDocument_free( DescDoc );
 
-                TvCtrlPointPrintList(  );
+                TvCtrlPointPrintList();
                 break;
             }
 
@@ -1122,7 +1122,7 @@ TvCtrlPointCallbackEventHandler( Upnp_EventType EventType,
                 TvCtrlPointRemoveDevice( d_event->DeviceId );
 
                 SampleUtil_Print( "After byebye:" );
-                TvCtrlPointPrintList(  );
+                TvCtrlPointPrintList();
 
                 break;
             }
@@ -1354,7 +1354,7 @@ TvCtrlPointStart( print_string printFunctionPtr,
 {
     ithread_t timer_thread;
     int rc;
-    short int port = 0;
+    unsigned short port = 0;
     char *ip_address = NULL;
 
     SampleUtil_Initialize( printFunctionPtr );
@@ -1362,34 +1362,42 @@ TvCtrlPointStart( print_string printFunctionPtr,
 
     ithread_mutex_init( &DeviceListMutex, 0 );
 
-    SampleUtil_Print( "Initializing UPnP with ipaddress=%s port=%d",
-                      ip_address, port );
+    SampleUtil_Print(
+        "Initializing UPnP Sdk with\n"
+        "\tipaddress = %s port = %u\n",
+        ip_address, port );
+
     rc = UpnpInit( ip_address, port );
     if( UPNP_E_SUCCESS != rc ) {
         SampleUtil_Print( "WinCEStart: UpnpInit() Error: %d", rc );
-        UpnpFinish(  );
+        UpnpFinish();
         return TV_ERROR;
     }
 
-    if( NULL == ip_address )
-        ip_address = UpnpGetServerIpAddress(  );
-    if( 0 == port )
-        port = UpnpGetServerPort(  );
+    if( NULL == ip_address ) {
+        ip_address = UpnpGetServerIpAddress();
+    }
+    if( 0 == port ) {
+        port = UpnpGetServerPort();
+    }
 
-    SampleUtil_Print( "UPnP Initialized (%s:%d)", ip_address, port );
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
+        ip_address, port );
 
     SampleUtil_Print( "Registering Control Point" );
     rc = UpnpRegisterClient( TvCtrlPointCallbackEventHandler,
                              &ctrlpt_handle, &ctrlpt_handle );
     if( UPNP_E_SUCCESS != rc ) {
         SampleUtil_Print( "Error registering CP: %d", rc );
-        UpnpFinish(  );
+        UpnpFinish();
         return TV_ERROR;
     }
 
     SampleUtil_Print( "Control Point Registered" );
 
-    TvCtrlPointRefresh(  );
+    TvCtrlPointRefresh();
 
     // start a timer thread
     ithread_create( &timer_thread, NULL, TvCtrlPointTimerLoop, NULL );
@@ -1400,10 +1408,10 @@ TvCtrlPointStart( print_string printFunctionPtr,
 int
 TvCtrlPointStop( void )
 {
-    TvCtrlPointRemoveAll(  );
+    TvCtrlPointRemoveAll();
     UpnpUnRegisterClient( ctrlpt_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+    UpnpFinish();
+    SampleUtil_Finish();
 
     return TV_SUCCESS;
 }

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h

@@ -39,7 +39,9 @@ extern "C" {
 #include <stdio.h>
 
 #include "ithread.h"
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <signal.h>

upnp/sample/tvdevice/linux/upnp_tv_device_main.c

@@ -29,10 +29,14 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include <stdio.h>
+
 #include "sample_util.h"
 #include "upnp_tv_device.h"
 
+
+#include <stdio.h>
+
+
 /******************************************************************************
  * linux_print
  *
@@ -82,7 +86,7 @@ TvDeviceCommandLoop( void *args )
 
         if( strcasecmp( cmd, "exit" ) == 0 ) {
             SampleUtil_Print( "Shutting down...\n" );
-            TvDeviceStop(  );
+            TvDeviceStop();
             exit( 0 );
         } else {
             SampleUtil_Print( "\n   Unknown command: %s\n\n", cmd );
@@ -117,26 +121,26 @@ TvDeviceCommandLoop( void *args )
  *                 
  *
  *****************************************************************************/
-int
-main( IN int argc,
-      IN char **argv )
+int main( IN int argc, IN char **argv )
 {
 
     unsigned int portTemp = 0;
     char *ip_address = NULL,
      *desc_doc_name = NULL,
      *web_dir_path = NULL;
+    int rc;
     ithread_t cmdloop_thread;
-    int code;
-    unsigned int port = 0;
+#ifndef WIN32
     int sig;
     sigset_t sigs_to_catch;
-
+#endif
+    int code;
+    unsigned int port = 0;
     int i = 0;
 
     SampleUtil_Initialize( linux_print );
 
-    //Parse options
+    // Parse options
     for( i = 1; i < argc; i++ ) {
         if( strcmp( argv[i], "-ip" ) == 0 ) {
             ip_address = argv[++i];
@@ -163,21 +167,18 @@ main( IN int argc,
                 ( "\tweb_dir_path: Filesystem path where web files "
                   "related to the device are stored\n" );
             SampleUtil_Print( "\t\te.g.: /upnp/sample/tvdevice/web\n" );
-            exit( 1 );
+            return 1;
         }
     }
 
     port = ( unsigned short )portTemp;
 
-    TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path,
-                   linux_print );
+    TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path, linux_print );
 
-    /*
-       start a command loop thread 
-     */
-    code = ithread_create( &cmdloop_thread, NULL, TvDeviceCommandLoop,
-                           NULL );
+    /* start a command loop thread */
+    code = ithread_create( &cmdloop_thread, NULL, TvDeviceCommandLoop, NULL );
 
+#ifndef WIN32
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -186,6 +187,11 @@ main( IN int argc,
     sigwait( &sigs_to_catch, &sig );
 
     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
-    TvDeviceStop(  );
-    exit( 0 );
+#else
+	ithread_join(cmdloop_thread, NULL);
+#endif
+    rc = TvDeviceStop();
+    
+    return rc;
 }
+

upnp/sample/tvdevice/upnp_tv_device.c

@@ -1915,11 +1915,11 @@ TvDeviceCallbackEventHandler( Upnp_EventType EventType,
  *
  *****************************************************************************/
 int
-TvDeviceStop(  )
+TvDeviceStop()
 {
     UpnpUnRegisterRootDevice( device_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+    UpnpFinish();
+    SampleUtil_Finish();
     ithread_mutex_destroy( &TVDevMutex );
     return UPNP_E_SUCCESS;
 }
@@ -1960,30 +1960,35 @@ TvDeviceStart( char *ip_address,
 
     SampleUtil_Initialize( pfun );
 
-    SampleUtil_Print
-        ( "Initializing UPnP Sdk with \n \t ipaddress = %s port = %d\n",
-          ip_address, port );
+    SampleUtil_Print(
+        "Initializing UPnP Sdk with\n"
+        "\tipaddress = %s port = %u\n",
+        ip_address, port );
 
     if( ( ret = UpnpInit( ip_address, port ) ) != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error with UpnpInit -- %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     }
 
     if( ip_address == NULL ) {
-        ip_address = UpnpGetServerIpAddress(  );
+        ip_address = UpnpGetServerIpAddress();
     }
 
-        port = UpnpGetServerPort(  );
+    port = UpnpGetServerPort();
 
-    SampleUtil_Print( "UPnP Initialized\n \t ipaddress= %s port = %d\n",
-                      ip_address, port );
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
+        ip_address, port );
 
-    if( desc_doc_name == NULL )
+    if( desc_doc_name == NULL ) {
         desc_doc_name = "tvdevicedesc.xml";
+    }
 
-    if( web_dir_path == NULL )
+    if( web_dir_path == NULL ) {
         web_dir_path = DEFAULT_WEB_DIR;
+    }
 
     snprintf( desc_doc_url, DESC_URL_SIZE, "http://%s:%d/%s", ip_address,
               port, desc_doc_name );
@@ -1995,37 +2000,39 @@ TvDeviceStart( char *ip_address,
         SampleUtil_Print
             ( "Error specifying webserver root directory -- %s: %d\n",
               web_dir_path, ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     }
 
-    SampleUtil_Print
-        ( "Registering the RootDevice\n\t with desc_doc_url: %s\n",
-          desc_doc_url );
+    SampleUtil_Print(
+        "Registering the RootDevice\n"
+        "\t with desc_doc_url: %s\n",
+        desc_doc_url );
 
     if( ( ret = UpnpRegisterRootDevice( desc_doc_url,
                                         TvDeviceCallbackEventHandler,
                                         &device_handle, &device_handle ) )
         != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error registering the rootdevice : %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     } else {
-        SampleUtil_Print( "RootDevice Registered\n" );
-
-        SampleUtil_Print( "Initializing State Table\n" );
+        SampleUtil_Print(
+            "RootDevice Registered\n"
+            "Initializing State Table\n");
         TvDeviceStateTableInit( desc_doc_url );
-        SampleUtil_Print( "State Table Initialized\n" );
+        SampleUtil_Print("State Table Initialized\n");
 
         if( ( ret =
               UpnpSendAdvertisement( device_handle, default_advr_expire ) )
             != UPNP_E_SUCCESS ) {
             SampleUtil_Print( "Error sending advertisements : %d\n", ret );
-            UpnpFinish(  );
+            UpnpFinish();
             return ret;
         }
 
-        SampleUtil_Print( "Advertisements Sent\n" );
+        SampleUtil_Print("Advertisements Sent\n");
     }
     return UPNP_E_SUCCESS;
 }
+

upnp/sample/tvdevice/upnp_tv_device.h

@@ -41,7 +41,9 @@ extern "C" {
 
 #include "ithread.h"
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 #include "upnp.h"
 #include "sample_util.h"

upnp/src/api/upnpapi.c

@@ -31,54 +31,61 @@
 
 
 #include "config.h"
+
+
+#include <sys/stat.h>
+
+
 #include <assert.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
+
+
 #ifndef WIN32
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
 	#include <arpa/inet.h>
-
-	#ifndef SPARC_SOLARIS
-//		#include <linux/if.h>
-		#include <net/if.h>
-	#else
-		#include <fcntl.h>
-		#include <net/if.h>
-		#include <sys/sockio.h>
-	#endif
-
+	#include <net/if.h>
+	#include <netinet/in.h>
 	#include <sys/ioctl.h>
+	#include <sys/param.h>
+	#include <sys/socket.h>
+	#include <sys/types.h>
 	#include <sys/utsname.h>
+
+
 	#include <unistd.h>
 
-	#include <sys/param.h>
-	#if (defined(BSD) && BSD >= 199306)
+
+	#if defined(_sun)
+		#include <sys/sockio.h>
+		#include <fcntl.h>
+	#elif defined(BSD) && BSD >= 199306
 		#include <ifaddrs.h>
 	#endif
-#endif
+#endif /* WIN32 */
+
+
 #include "upnpapi.h"
 #include "httpreadwrite.h"
+#include "membuffer.h"
 #include "ssdplib.h"
 #include "soaplib.h"
 #include "ThreadPool.h"
-#include "membuffer.h"
 
-#include "httpreadwrite.h"
 
 // Needed for GENA
 #include "gena.h"
-#include "service_table.h"
 #include "miniserver.h"
+#include "service_table.h"
+
 
 #ifdef INTERNAL_WEB_SERVER
 	#include "webserver.h"
 	#include "urlconfig.h"
 #endif // INTERNAL_WEB_SERVER
 
+
+//
 virtualDirList *pVirtualDirList;
 
 // Mutex to synchronize the subscription handling at the client side
@@ -206,7 +213,7 @@ int UpnpInit( IN const char *HostIP,
              return UPNP_E_INIT_FAILED;
     }
 
-    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__, "Inside UpnpInit \n" );
+    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__, "Inside UpnpInit\n" );
     // initialize mutex
 #ifdef __CYGWIN__
         /* On Cygwin, pthread_mutex_init() fails without this memset. */
@@ -313,7 +320,7 @@ int UpnpInit( IN const char *HostIP,
         "Host Ip: %s Host Port: %d\n", LOCAL_HOST,
         LOCAL_PORT );
 
-    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__, "Exiting UpnpInit \n" );
+    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__, "Exiting UpnpInit\n" );
 
     return UPNP_E_SUCCESS;
 
@@ -330,7 +337,7 @@ PrintThreadPoolStats(
 	ThreadPoolStats stats;
 	ThreadPoolGetStats(tp, &stats);
 	UpnpPrintf(UPNP_INFO, API, DbgFileName, DbgLineNo, 
-		"%s \n"
+		"%s\n"
 		"High Jobs pending: %d\n"
 		"Med Jobs Pending: %d\n"
 		"Low Jobs Pending: %d\n"

upnp/src/api/upnpdebug.c

@@ -310,17 +310,30 @@ void UpnpDisplayFileAndLine(
 	IN const char *DbgFileName,
 	IN int DbgLineNo)
 {
-	int starlength = 66;
-	const char *lines[2];
-	char FileAndLine[500];
-	lines[0] = "DEBUG";
-	if (DbgFileName) {
-		sprintf(FileAndLine,
-			"FILE: %s, LINE: %d",
-			DbgFileName, DbgLineNo);
-		lines[1] = FileAndLine;
+#define NLINES 2
+#define MAX_LINE_SIZE 512
+#define NUMBER_OF_STARS 80
+	const char *lines[NLINES];
+	char buf[NLINES][MAX_LINE_SIZE];
+	int i;
+
+	/* Initialize the pointer array */
+	for (i = 0; i < NLINES; i++) {
+		lines[i] = buf[i];
 	}
-	UpnpDisplayBanner(fd, lines, 2, starlength);
+
+	/* Put the debug lines in the buffer */
+	sprintf(buf[0], "DEBUG - THREAD ID: 0x%lX",
+		(unsigned long int)ithread_self());
+	if (DbgFileName) {
+		sprintf(buf[1],
+			"FILE: %s, LINE: %d",
+			DbgFileName,
+			DbgLineNo);
+	}
+
+	/* Show the lines centered */
+	UpnpDisplayBanner(fd, lines, NLINES, NUMBER_OF_STARS);
 	fflush(fd);
 }
 #endif

upnp/src/genlib/miniserver/miniserver.c

@@ -35,6 +35,7 @@
 ************************************************************************/
 
 #include "config.h"
+
 #ifndef WIN32
 	#include <arpa/inet.h>
 	#include <netinet/in.h>
@@ -48,6 +49,7 @@
 	typedef int socklen_t;
 	#define EAFNOSUPPORT 97
 #endif /* WIN32 */
+
 #include "unixutil.h"
 #include "ithread.h"
 
@@ -65,7 +67,6 @@
 #include "ThreadPool.h"
 #include "httpreadwrite.h"
 #include "statcodes.h"
-#include "upnp.h"
 #include "upnpapi.h"
 
 #define APPLICATION_LISTENING_PORT 49152
@@ -376,8 +377,9 @@ schedule_request_job( IN int connfd,
  * Return: void
  ************************************************************************/
 static void
-RunMiniServer( MiniServerSockArray * miniSock )
+RunMiniServer( MiniServerSockArray *miniSock )
 {
+    char errorBuffer[ERROR_BUFFER_LEN];
     struct sockaddr_in clientAddr;
     socklen_t clientLen;
     SOCKET connectHnd;
@@ -393,6 +395,7 @@ RunMiniServer( MiniServerSockArray * miniSock )
     unsigned int maxMiniSock;
     int byteReceived;
     char requestBuf[256];
+    int ret = 0;
 
     maxMiniSock = max( miniServSock, miniServStopSock) ;
     maxMiniSock = max( maxMiniSock, (SOCKET)(ssdpSock) );
@@ -414,10 +417,11 @@ RunMiniServer( MiniServerSockArray * miniSock )
         FD_SET( ssdpReqSock, &rdSet );
 #endif
 
-        if( select( maxMiniSock, &rdSet, NULL, &expSet, NULL ) ==
-            UPNP_SOCKETERROR ) {
+        ret = select( maxMiniSock, &rdSet, NULL, &expSet, NULL );
+        if ( ret == -1 ) {
+            strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
             UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-                "Error in select call!\n" );
+                "Error in select(): %s\n", errorBuffer );
 	    /* Avoid 100% CPU in case of repeated error in select() */
 	    isleep( 1 );
             continue;
@@ -426,9 +430,10 @@ RunMiniServer( MiniServerSockArray * miniSock )
                 clientLen = sizeof( struct sockaddr_in );
                 connectHnd = accept( miniServSock,
                     ( struct sockaddr * )&clientAddr, &clientLen );
-                if( connectHnd == UPNP_INVALID_SOCKET ) {
+                if( connectHnd == -1 ) {
+                    strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
                     UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                        "miniserver: Error in accepting connection\n" );
+                        "miniserver: Error in accept(): %s\n", errorBuffer );
                     continue;
                 }
                 schedule_request_job( connectHnd, &clientAddr );
@@ -444,8 +449,7 @@ RunMiniServer( MiniServerSockArray * miniSock )
             }
             if( FD_ISSET( miniServStopSock, &rdSet ) ) {
                 clientLen = sizeof( struct sockaddr_in );
-                memset( ( char * )&clientAddr, 0,
-                        sizeof( struct sockaddr_in ) );
+                memset( (char *)&clientAddr, 0, sizeof (struct sockaddr_in) );
                 byteReceived =
                     recvfrom( miniServStopSock, requestBuf, 25, 0,
                               ( struct sockaddr * )&clientAddr,
@@ -453,7 +457,7 @@ RunMiniServer( MiniServerSockArray * miniSock )
                 if( byteReceived > 0 ) {
                     requestBuf[byteReceived] = '\0';
                     UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                        "Received response !!!  %s From host %s \n",
+                        "Received response: %s From host %s \n",
                         requestBuf, inet_ntoa( clientAddr.sin_addr ) );
                     UpnpPrintf( UPNP_PACKET, MSERV, __FILE__, __LINE__,
                         "Received multicast packet: \n %s\n",
@@ -544,6 +548,7 @@ int
 get_miniserver_sockets( MiniServerSockArray * out,
                         unsigned short listen_port )
 {
+    char errorBuffer[ERROR_BUFFER_LEN];
     struct sockaddr_in serverAddr;
     int listenfd;
     int success;
@@ -552,9 +557,10 @@ get_miniserver_sockets( MiniServerSockArray * out,
     int sockError = UPNP_E_SUCCESS;
     int errCode = 0;
     int miniServerStopSock;
+    int ret = 0;
 
     listenfd = socket( AF_INET, SOCK_STREAM, 0 );
-    if( listenfd < 0 ) {
+    if ( listenfd == -1 ) {
         return UPNP_E_OUTOF_SOCKET; // error creating socket
     }
     // As per the IANA specifications for the use of ports by applications
@@ -571,51 +577,51 @@ get_miniserver_sockets( MiniServerSockArray * out,
     // Keeping the re-use address code as an optional behaviour that can be 
     // turned on if necessary. 
     // TURN ON the reuseaddr_on option to use the option.
-    if( reuseaddr_on ) {
-        //THIS IS ALLOWS US TO BIND AGAIN IMMEDIATELY
-        //AFTER OUR SERVER HAS BEEN CLOSED
-        //THIS MAY CAUSE TCP TO BECOME LESS RELIABLE
-        //HOWEVER IT HAS BEEN SUGESTED FOR TCP SERVERS
-
+    if ( reuseaddr_on ) {
+        // THIS IS ALLOWS US TO BIND AGAIN IMMEDIATELY
+        // AFTER OUR SERVER HAS BEEN CLOSED
+        // THIS MAY CAUSE TCP TO BECOME LESS RELIABLE
+        // HOWEVER IT HAS BEEN SUGESTED FOR TCP SERVERS
         UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
             "mserv start: resuseaddr set\n" );
         sockError = setsockopt( listenfd, SOL_SOCKET, SO_REUSEADDR,
-            ( const char * )&reuseaddr_on, sizeof( int ));
-        if( sockError == UPNP_SOCKETERROR ) {
+            (const char *)&reuseaddr_on, sizeof (int) );
+        if ( sockError == -1 ) {
             shutdown( listenfd, SD_BOTH );
             UpnpCloseSocket( listenfd );
+
             return UPNP_E_SOCKET_BIND;
         }
 
-        sockError = bind( listenfd,
-                          ( struct sockaddr * )&serverAddr,
-                          sizeof( struct sockaddr_in )
-             );
+        sockError = bind( listenfd, (struct sockaddr *)&serverAddr,
+            sizeof (struct sockaddr_in) );
     } else {
         do {
             serverAddr.sin_port = htons( listen_port++ );
-            sockError = bind( listenfd,
-                              ( struct sockaddr * )&serverAddr,
-                              sizeof( struct sockaddr_in )
-                 );
-            if( sockError == UPNP_SOCKETERROR ) {
+            sockError = bind( listenfd, (struct sockaddr *)&serverAddr,
+                sizeof (struct sockaddr_in) );
+            if ( sockError == -1 ) {
 #ifdef WIN32
                 errCode = WSAGetLastError();
 #else
                 errCode = errno; 
 #endif
-                if( errno == EADDRINUSE )
+                if( errno == EADDRINUSE ) {
                     errCode = 1;
+                }
             } else
                 errCode = 0;
 
-        } while( errCode != 0 );
+        } while ( errCode != 0 );
     }
 
-    if( sockError == UPNP_SOCKETERROR ) {
-        perror( "mserv start: bind failed" );
+    if ( sockError == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+            "mserv start: Error in bind(): %s\n", errorBuffer );
         shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
+
         return UPNP_E_SOCKET_BIND;  // bind failed
     }
 
@@ -623,28 +629,34 @@ get_miniserver_sockets( MiniServerSockArray * out,
         "mserv start: bind success\n" );
 
     success = listen( listenfd, SOMAXCONN );
-    if( success == UPNP_SOCKETERROR ) {
+    if ( success == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+            "mserv start: Error in listen(): %s\n", errorBuffer );
         shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
-        return UPNP_E_LISTEN;   // listen failed
+
+        return UPNP_E_LISTEN;
     }
 
     actual_port = get_port( listenfd );
     if( actual_port <= 0 ) {
         shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
+
         return UPNP_E_INTERNAL_ERROR;
     }
 
     out->miniServerPort = actual_port;
 
-    if( ( miniServerStopSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) ==
-        UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            MSERV, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
+    miniServerStopSock = socket( AF_INET, SOCK_DGRAM, 0 );
+    if ( miniServerStopSock == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, MSERV, __FILE__, __LINE__,
+            "Error in socket(): %s\n", errorBuffer );
         shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
+
         return UPNP_E_OUTOF_SOCKET;
     }
 
@@ -652,10 +664,9 @@ get_miniserver_sockets( MiniServerSockArray * out,
     memset( ( char * )&serverAddr, 0, sizeof( struct sockaddr_in ) );
     serverAddr.sin_family = AF_INET;
     serverAddr.sin_addr.s_addr = inet_addr( "127.0.0.1" );
-
-    if( bind( miniServerStopSock, ( struct sockaddr * )&serverAddr,
-              sizeof( serverAddr ) ) == UPNP_SOCKETERROR ) {
-
+    ret = bind( miniServerStopSock, (struct sockaddr *)&serverAddr,
+        sizeof (serverAddr) );
+    if ( ret == -1 ) {
         UpnpPrintf( UPNP_CRITICAL,
             MSERV, __FILE__, __LINE__,
             "Error in binding localhost!!!\n" );
@@ -663,25 +674,25 @@ get_miniserver_sockets( MiniServerSockArray * out,
         UpnpCloseSocket( listenfd );
         shutdown( miniServerStopSock, SD_BOTH );
         UpnpCloseSocket( miniServerStopSock );
+
         return UPNP_E_SOCKET_BIND;
     }
 
     miniStopSockPort = get_port( miniServerStopSock );
-    if( miniStopSockPort <= 0 ) {
+    if ( miniStopSockPort <= 0 ) {
         shutdown( miniServerStopSock, SD_BOTH );
         UpnpCloseSocket( miniServerStopSock );
         shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
+
         return UPNP_E_INTERNAL_ERROR;
     }
 
     out->stopPort = miniStopSockPort;
-
     out->miniServerSock = listenfd;
     out->miniServerStopSock = miniServerStopSock;
 
     return UPNP_E_SUCCESS;
-
 }
 
 /************************************************************************
@@ -718,18 +729,19 @@ StartMiniServer( unsigned short listen_port )
         return UPNP_E_INTERNAL_ERROR;   // miniserver running
     }
 
-    miniSocket =
-        ( MiniServerSockArray * ) malloc( sizeof( MiniServerSockArray ) );
-    if( miniSocket == NULL )
+    miniSocket = (MiniServerSockArray *) malloc( sizeof (MiniServerSockArray) );
+    if( miniSocket == NULL ) {
         return UPNP_E_OUTOF_MEMORY;
+    }
 
-    if( ( success = get_miniserver_sockets( miniSocket, listen_port ) )
-        != UPNP_E_SUCCESS ) {
+    success = get_miniserver_sockets( miniSocket, listen_port );
+    if( success != UPNP_E_SUCCESS ) {
         free( miniSocket );
         return success;
     }
 
-    if( ( success = get_ssdp_sockets( miniSocket ) ) != UPNP_E_SUCCESS ) {
+    success = get_ssdp_sockets( miniSocket );
+    if( success != UPNP_E_SUCCESS ) {
         shutdown( miniSocket->miniServerSock, SD_BOTH );
         UpnpCloseSocket( miniSocket->miniServerSock );
         shutdown( miniSocket->miniServerStopSock, SD_BOTH );
@@ -739,15 +751,12 @@ StartMiniServer( unsigned short listen_port )
         return success;
     }
 
-    TPJobInit( &job, ( start_routine ) RunMiniServer,
-               ( void * )miniSocket );
+    TPJobInit( &job, (start_routine)RunMiniServer, (void *)miniSocket );
     TPJobSetPriority( &job, MED_PRIORITY );
-
     TPJobSetFreeFunction( &job, ( free_routine ) free );
 
     success = ThreadPoolAddPersistent( &gMiniServerThreadPool, &job, NULL );
-
-    if( success < 0 ) {
+    if ( success < 0 ) {
         shutdown( miniSocket->miniServerSock, SD_BOTH );
         UpnpCloseSocket( miniSocket->miniServerSock );
         shutdown( miniSocket->miniServerStopSock, SD_BOTH );
@@ -763,13 +772,13 @@ StartMiniServer( unsigned short listen_port )
     }
     // wait for miniserver to start
     count = 0;
-    while( gMServState != MSERV_RUNNING && count < max_count ) {
+    while ( gMServState != MSERV_RUNNING && count < max_count ) {
         usleep( 50 * 1000 );    // 0.05s
         count++;
     }
 
     // taking too long to start that thread
-    if( count >= max_count ) {
+    if ( count >= max_count ) {
         shutdown( miniSocket->miniServerSock, SD_BOTH );
         UpnpCloseSocket( miniSocket->miniServerSock );
         shutdown( miniSocket->miniServerStopSock, SD_BOTH );
@@ -801,9 +810,9 @@ StartMiniServer( unsigned short listen_port )
  *		Always returns 0 
  ************************************************************************/
 int
-StopMiniServer( void )
+StopMiniServer()
 {
-
+    char errorBuffer[ERROR_BUFFER_LEN];
     int socklen = sizeof( struct sockaddr_in );
     int sock;
     struct sockaddr_in ssdpAddr;
@@ -817,9 +826,10 @@ StopMiniServer( void )
     }
 
     sock = socket( AF_INET, SOCK_DGRAM, 0 );
-    if( sock == UPNP_INVALID_SOCKET ) {
+    if ( sock == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
         UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-            "SSDP_SERVER:StopSSDPServer: Error in socket operation !!!\n" );
+            "SSDP_SERVER: StopSSDPServer: Error in socket() %s\n", errorBuffer );
         return 0;
     }
 
@@ -827,15 +837,16 @@ StopMiniServer( void )
         ssdpAddr.sin_family = AF_INET;
         ssdpAddr.sin_addr.s_addr = inet_addr( "127.0.0.1" );
         ssdpAddr.sin_port = htons( miniStopSockPort );
-        sendto( sock, buf, bufLen, 0, ( struct sockaddr * )&ssdpAddr,
-                socklen );
+        sendto( sock, buf, bufLen, 0, (struct sockaddr *)&ssdpAddr, socklen );
         usleep( 1000 );
-        if( gMServState == MSERV_IDLE )
+        if( gMServState == MSERV_IDLE ) {
             break;
+	}
         isleep( 1 );
     }
     shutdown( sock, SD_BOTH );
     UpnpCloseSocket( sock );
+
     return 0;
 }
 

upnp/src/genlib/net/http/httpparser.c

@@ -395,8 +395,13 @@ scanner_get_str( IN scanner_t * scanner )
 *
 * Note :
 ************************************************************************/
+#ifndef WIN32
 #warning The only use of the function 'scanner_pushback()' in the code is commented out.
 #warning 'scanner_pushback()' is a candidate for removal.
+#else
+#pragma message ("The only use of the function 'scanner_pushback()' in the code is commented out.")
+#pragma message ("'scanner_pushback()' is a candidate for removal.")
+#endif
 static UPNP_INLINE void
 scanner_pushback( INOUT scanner_t * scanner,
                   IN size_t pushback_bytes )
@@ -965,8 +970,13 @@ read_until_crlf( INOUT scanner_t * scanner,
 *   PARSE_FAILURE
 *   PARSE_INCOMPLETE
 ************************************************************************/
+#ifndef WIN32
 #warning There are currently no uses of the function 'skip_to_end_of_header()' in the code.
 #warning 'skip_to_end_of_header()' is a candidate for removal.
+#else
+#pragma message("There are currently no uses of the function 'skip_to_end_of_header()' in the code.")
+#pragma message("'skip_to_end_of_header()' is a candidate for removal.")
+#endif
 static UPNP_INLINE int
 skip_to_end_of_header( INOUT scanner_t * scanner )
 {

upnp/src/genlib/net/http/httpreadwrite.c

@@ -71,8 +71,16 @@
 #include "webserver.h"
 
 
+/* 
+ * Please, do not change these to const int while MSVC cannot understand
+ * const int in array dimensions.
+ */
+/*
 const int CHUNK_HEADER_SIZE = 10;
 const int CHUNK_TAIL_SIZE = 10;
+*/
+#define CHUNK_HEADER_SIZE 10
+#define CHUNK_TAIL_SIZE 10
 
 
 /************************************************************************

upnp/src/genlib/net/http/statcodes.c

@@ -176,7 +176,7 @@ http_get_code_text( int statusCode )
     int table_num;
 
     if( !gInitialized ) {
-        init_tables(  );
+        init_tables();
     }
 
     if( statusCode < 100 && statusCode >= 600 ) {

upnp/src/genlib/net/http/webserver.c

@@ -38,11 +38,9 @@
 #include <assert.h>
 #include <fcntl.h>
 #ifndef UPNP_USE_BCBPP
-#ifndef UPNP_USE_MSVCPP
     #include <inttypes.h>
     #include <stdint.h>
 #endif
-#endif
 #include "util.h"
 #include "strintmap.h"
 #include "membuffer.h"
@@ -536,9 +534,9 @@ web_server_init( void )
     int ret_code;
 
     if( bWebServerState == WEB_SERVER_DISABLED ) {
-        media_list_init(  );    // decode media list
+        media_list_init();    // decode media list
         membuffer_init( &gDocumentRootDir );
-        glob_alias_init(  );
+        glob_alias_init();
 
         pVirtualDirList = NULL;
 

upnp/src/inc/config.h

@@ -32,6 +32,7 @@
 #ifndef INTERNAL_CONFIG_H
 #define INTERNAL_CONFIG_H 
 
+
 #include "autoconfig.h"
 
 

upnp/src/inc/upnpapi.h

@@ -36,12 +36,8 @@
 
 #include "upnp.h"
 #include "client_table.h"
-
 //#include "../ssdp/ssdplib.h"
 
-
-
-
 #define MAX_INTERFACES 256
 
 #define DEFAULT_INTERFACE 1

upnp/src/inc/util.h

@@ -31,19 +31,22 @@
 
 #ifndef UTIL_H
 #define UTIL_H
+
+
 #include "upnp.h"
 
+
 // usually used to specify direction of parameters in functions
 #ifndef IN
-#define IN
+	#define IN
 #endif
 
 #ifndef OUT
-#define OUT
+	#define OUT
 #endif
 
 #ifndef INOUT
-#define INOUT
+	#define INOUT
 #endif
 
 
@@ -52,23 +55,18 @@
 #define EVENT_TERMINATE	-3
 
 
-#ifndef WIN32
- #define max(a, b)   (((a)>(b))? (a):(b))
- #define min(a, b)   (((a)<(b))? (a):(b))
-#endif
-
-
 // boolean type in C
 typedef char xboolean;
 
 #ifndef TRUE
-#define TRUE 1
+	#define TRUE 1
 #endif
 
 #ifndef FALSE
-#define FALSE 0
+	#define FALSE 0
 #endif
 
+
 ///////////////////////////
 // funcs
 
@@ -76,58 +74,62 @@ typedef char xboolean;
 extern "C" {
 #endif
 
+/************************************************************************
+ * Function: logerror
+ *
+ * Parameters:
+ * 	IN const char *fmt;	format string
+ *
+ * Description: Log an error message.
+ *
+ * Return: void
+ ************************************************************************/
 void log_error( IN const char *fmt, ... );
 
 /************************************************************************
-*	Function :	linecopy
-*
-*	Parameters :
-*		OUT char dest[LINE_SIZE] ;	output buffer
-*		IN const char* src ;	input buffer
-*
-*	Description : Copy no of bytes spcified by the LINE_SIZE constant, 
-*		from the source buffer. Null terminate the destination buffer
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+ * Function: linecopy
+ *
+ * Parameters:
+ *	OUT char dest[LINE_SIZE];	output buffer
+ *	IN const char *src;		input buffer
+ *
+ * Description: Copy no of bytes spcified by the LINE_SIZE constant, 
+ *	from the source buffer. Null terminate the destination buffer.
+ *
+ * Return: void
+ ************************************************************************/
 void linecopy( OUT char dest[LINE_SIZE], IN const char* src );
 
 /************************************************************************
-*	Function :	namecopy
-*
-*	Parameters :
-*		OUT char dest[NAME_SIZE] ;	output buffer
-*		IN const char* src ;	input buffer
-*
-*	Description : Copy no of bytes spcified by the NAME_SIZE constant, 
-*		from the source buffer. Null terminate the destination buffer
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+ * Function: namecopy
+ *
+ * Parameters:
+ * 	OUT char dest[NAME_SIZE];	output buffer
+ * 	IN const char *src;		input buffer
+ *
+ * Description: Copy no of bytes spcified by the NAME_SIZE constant, 
+ * 	from the source buffer. Null terminate the destination buffer
+ *
+ * Return: void
+ ************************************************************************/
 void namecopy( OUT char dest[NAME_SIZE], IN const char* src );
 
 /************************************************************************
-*	Function :	linecopylen
-*
-*	Parameters :
-*		OUT char dest[LINE_SIZE] ;	output buffer
-*		IN const char* src ;	input buffer
-*		IN size_t srclen ;	bytes to be copied.
-*
-*	Description : Determine if the srclen passed in paramter is less than 
-*		the permitted LINE_SIZE. If it is use the passed parameter, if not
-*		use the permitted LINE_SIZE as the length parameter
-*		Copy no of bytes spcified by the LINE_SIZE constant, 
-*		from the source buffer. Null terminate the destination buffer
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+ * Function:	linecopylen
+ *
+ * Parameters:
+ *	OUT char dest[LINE_SIZE];	output buffer
+ *	IN const char *src;		input buffer
+ *	IN size_t srclen;		bytes to be copied.
+ *
+ * Description : Determine if the srclen passed in paramter is less than 
+ *	the permitted LINE_SIZE. If it is use the passed parameter, if not
+ *	use the permitted LINE_SIZE as the length parameter
+ *	Copy no of bytes spcified by the LINE_SIZE constant, 
+ *	from the source buffer. Null terminate the destination buffer
+ *
+ * Return: void
+ ************************************************************************/
 void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen );
 
 
@@ -135,6 +137,9 @@ void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen
 } // extern C
 #endif
 
+/* Size of the errorBuffer variable, passed to the strerror_r() function */
+#define ERROR_BUFFER_LEN 256
+
 //////////////////////////////////
 // C specific
 #ifndef __cplusplus
@@ -148,16 +153,21 @@ void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen
 		#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 	#endif
 
-	#define EADDRINUSE WSAEADDRINUSE
+	#define EADDRINUSE		WSAEADDRINUSE
 
-	#define strcasecmp stricmp
-	#define strncasecmp strnicmp
+	#define strcasecmp		stricmp
+	#define strncasecmp		strnicmp
 
-	#define sleep(a) Sleep((a)*1000)
-	#define usleep(a) Sleep((a)/1000)
-#endif
+	#define sleep(a)		Sleep((a)*1000)
+	#define usleep(a)		Sleep((a)/1000)
+
+	#define strerror_r(a,b,c)	(strerror_s((b),(c),(a)))
+#else
+	#define max(a, b)   (((a)>(b))? (a):(b))
+	#define min(a, b)   (((a)<(b))? (a):(b))
+#endif /* WIN32 */
 
 #endif // __cplusplus
 
-#endif /* GENLIB_UTIL_UTIL_H */
+#endif /* UTIL_H */
 

upnp/src/soap/soap_device.c

@@ -443,9 +443,9 @@ check_soap_body( IN IXML_Document * doc,
             if( actionNode ) {
                 ns = ixmlNode_getNamespaceURI( actionNode );
                 name = ixmlNode_getLocalName( actionNode );
-
-                if( ( !strcmp( actionName, name ) )
-                    && ( !strcmp( urn, ns ) ) ) {
+                if (name && ns &&
+                    !strcmp( actionName, name ) &&
+                    !strcmp( urn, ns ) ) {
                     ret_code = UPNP_E_SUCCESS;
                 }
             }
@@ -607,7 +607,7 @@ get_device_info( IN http_message_t * request,
     save_char = control_url[request->uri.pathquery.size];
     ((char *)control_url)[request->uri.pathquery.size] = '\0';
 
-    HandleLock(  );
+    HandleLock();
 
     if( GetDeviceHandleInfo( &device_hnd, &device_info ) != HND_DEVICE ) {
         goto error_handler;
@@ -663,7 +663,7 @@ get_device_info( IN http_message_t * request,
 
   error_handler:
     ((char *)control_url)[request->uri.pathquery.size] = save_char;   // restore
-    HandleUnlock(  );
+    HandleUnlock();
     return ret_code;
 }
 

upnp/src/ssdp/ssdp_ctrlpt.c

@@ -46,12 +46,10 @@
 #include "unixutil.h"
 
 #ifdef WIN32
- #include <ws2tcpip.h>
- #include <winsock2.h>
- #ifndef imillisleep
- #define imillisleep Sleep
- #endif
-#endif
+	#include <ws2tcpip.h>
+	#include <winsock2.h>
+	#include <string.h>
+#endif /* WIN32 */
 
 
 /************************************************************************
@@ -365,8 +363,13 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
 * Returns: void
 *
 ***************************************************************************/
+#ifndef WIN32
 #warning There are currently no uses of the function 'process_reply()' in the code.
 #warning 'process_reply()' is a candidate for removal.
+#else
+#pragma message("There are currently no uses of the function 'process_reply()' in the code.")
+#pragma message("'process_reply()' is a candidate for removal.")
+#endif
 static UPNP_INLINE void
 process_reply( IN char *request_buf,
                IN int buf_len,
@@ -514,8 +517,10 @@ SearchByTarget( IN int Mx,
                 IN char *St,
                 IN void *Cookie )
 {
+    char errorBuffer[ERROR_BUFFER_LEN];
     int socklen = sizeof( struct sockaddr_in );
     int *id = NULL;
+    int ret = 0;
     char *ReqBuf;
     struct sockaddr_in destAddr;
     fd_set wrSet;
@@ -534,9 +539,10 @@ SearchByTarget( IN int Mx,
         return UPNP_E_INVALID_PARAM;
     }
 
-    ReqBuf = ( char * )malloc( BUFSIZE );
-    if( ReqBuf == NULL )
+    ReqBuf = (char *)malloc( BUFSIZE );
+    if( ReqBuf == NULL ) {
         return UPNP_E_OUTOF_MEMORY;
+    }
 
     UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__, ">>> SSDP SEND >>>\n");
 
@@ -558,7 +564,7 @@ SearchByTarget( IN int Mx,
     FD_ZERO( &wrSet );
     FD_SET( gSsdpReqSocket, &wrSet );
 
-    //add search criteria to list
+    // add search criteria to list
     HandleLock();
     if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
         HandleUnlock();
@@ -576,7 +582,7 @@ SearchByTarget( IN int Mx,
     TPJobSetPriority( &job, MED_PRIORITY );
     TPJobSetFreeFunction( &job, ( free_routine ) free );
 
-    //Schdule a timeout event to remove search Arg
+    // Schedule a timeout event to remove search Arg
     TimerThreadSchedule( &gTimerThread, timeTillRead,
                          REL_SEC, &job, SHORT_TERM, id );
     newArg->timeoutEventId = ( *id );
@@ -584,37 +590,25 @@ SearchByTarget( IN int Mx,
     ListAddTail( &ctrlpt_info->SsdpSearchList, newArg );
     HandleUnlock();
 
-    setsockopt( gSsdpReqSocket, IPPROTO_IP, IP_MULTICAST_IF,
-                ( char * )&addr, sizeof( addr ) );
+    ret = setsockopt( gSsdpReqSocket, IPPROTO_IP, IP_MULTICAST_IF,
+        (char *)&addr, sizeof (addr) );
 
-    if( select( gSsdpReqSocket + 1, NULL, &wrSet, NULL, NULL )
-        == UPNP_SOCKETERROR ) {
-        if( errno == EBADF ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "SSDP_LIB :RequestHandler:An invalid file descriptor"
-                " was givenin one of the sets. \n" );
-        } else if( errno == EINTR ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "SSDP_LIB :RequestHandler:  A non blocked "
-                "signal was caught.    \n" );
-        } else if( errno == EINVAL ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "SSDP_LIB :RequestHandler: n is negative.  \n" );
-        } else if( errno == ENOMEM ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "SSDP_LIB : RequestHandler:select was unable to "
-                "allocate memory for internal tables.\n" );
-        }
+    ret = select( gSsdpReqSocket + 1, NULL, &wrSet, NULL, NULL );
+    if( ret == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            "SSDP_LIB: Error in select(): %s\n",
+            errorBuffer );
 	shutdown( gSsdpReqSocket, SD_BOTH );
         UpnpCloseSocket( gSsdpReqSocket );
         free( ReqBuf );
+
         return UPNP_E_INTERNAL_ERROR;
     } else if( FD_ISSET( gSsdpReqSocket, &wrSet ) ) {
         int NumCopy = 0;
-
         while( NumCopy < NUM_SSDP_COPY ) {
             sendto( gSsdpReqSocket, ReqBuf, strlen( ReqBuf ), 0,
-                    ( struct sockaddr * )&destAddr, socklen );
+                (struct sockaddr *)&destAddr, socklen );
             NumCopy++;
             imillisleep( SSDP_PAUSE );
         }
@@ -626,3 +620,4 @@ SearchByTarget( IN int Mx,
 
 #endif // EXCLUDE_SSDP
 #endif // INCLUDE_CLIENT_APIS
+

upnp/src/ssdp/ssdp_device.c

@@ -30,10 +30,14 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "config.h"
+
 #ifdef INCLUDE_DEVICE_APIS
 #if EXCLUDE_SSDP == 0
+
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
+
 #include "ssdplib.h"
 #include "upnpapi.h"
 #include "ThreadPool.h"
@@ -45,7 +49,7 @@
 #ifdef WIN32
 	#include <ws2tcpip.h>
 	#include <winsock2.h>
-#endif
+#endif /* WIN32 */
 
 #define MSGTYPE_SHUTDOWN	0
 #define MSGTYPE_ADVERTISEMENT	1
@@ -213,26 +217,28 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
                    IN int NumPacket,
                    IN char **RqPacket )
 {
-    int ReplySock,
-      socklen = sizeof( struct sockaddr_in );
-    int NumCopy,
-      Index;
+    char errorBuffer[ERROR_BUFFER_LEN];
+    int ReplySock;
+    int socklen = sizeof( struct sockaddr_in );
+    int NumCopy;
+    int Index;
     unsigned long replyAddr = inet_addr( LOCAL_HOST );
-    int ttl = 4;                //a/c to UPNP Spec
+    int ttl = 4; // a/c to UPNP Spec
 
     ReplySock = socket( AF_INET, SOCK_DGRAM, 0 );
-    if( ReplySock == UPNP_INVALID_SOCKET ) {
+    if ( ReplySock == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
         UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
             "SSDP_LIB: New Request Handler:"
-            "Error in socket operation !!!\n" );
+            "Error in socket(): %s\n", errorBuffer );
 
         return UPNP_E_OUTOF_SOCKET;
     }
 
     setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_IF,
-                ( char * )&replyAddr, sizeof( replyAddr ) );
+        (char *)&replyAddr, sizeof (replyAddr) );
     setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_TTL,
-                ( char * )&ttl, sizeof( int ) );
+        (char *)&ttl, sizeof (int) );
 
     for( Index = 0; Index < NumPacket; Index++ ) {
         int rc;
@@ -262,6 +268,7 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 
     shutdown( ReplySock, SD_BOTH );
     UpnpCloseSocket( ReplySock );
+
     return UPNP_E_SUCCESS;
 }
 
@@ -334,8 +341,8 @@ CreateServicePacket( IN int msg_type,
         ret_code = http_MakeMessage(
             &buf, 1, 1,
             "Q" "sssdc" "sdc" "ssc" "ssc" "ssc" "S" "Xc" "sscc",
-            HTTPMETHOD_NOTIFY, "*",
-            1, "HOST: ", SSDP_IP, ":", SSDP_PORT,
+            HTTPMETHOD_NOTIFY, "*", (size_t)1,
+            "HOST: ", SSDP_IP, ":", SSDP_PORT,
             "CACHE-CONTROL: max-age=", duration,
             "LOCATION: ", location,
             "NT: ", nt,

upnp/src/ssdp/ssdp_server.c

@@ -43,6 +43,7 @@
 #include "httpreadwrite.h"
 
 #ifdef WIN32
+	#include <string.h>
 	#include <winsock2.h>
 	#include <ws2tcpip.h>
 	#include "unixutil.h"
@@ -442,20 +443,18 @@ Make_Socket_NoBlocking( int sock )
  * Returns: int
  *	0 if successful else -1
  ***************************************************************************/
-int
-unique_service_name( IN char *cmd,
-                     IN SsdpEvent * Evt )
+int unique_service_name(IN char *cmd, IN SsdpEvent *Evt)
 {
-    char *TempPtr,
-      TempBuf[COMMAND_LEN],
-     *Ptr,
-     *ptr1,
-     *ptr2,
-     *ptr3;
+    char TempBuf[COMMAND_LEN];
+    char *TempPtr = NULL;
+    char *Ptr = NULL;
+    char *ptr1 = NULL;
+    char *ptr2 = NULL;
+    char *ptr3 = NULL;
     int CommandFound = 0;
+    int length = 0;
 
     if( ( TempPtr = strstr( cmd, "uuid:schemas" ) ) != NULL ) {
-
         ptr1 = strstr( cmd, ":device" );
         if( ptr1 != NULL ) {
             ptr2 = strstr( ptr1 + 1, ":" );
@@ -487,7 +486,6 @@ unique_service_name( IN char *cmd,
     }
 
     if( ( TempPtr = strstr( cmd, "uuid" ) ) != NULL ) {
-        //printf("cmd = %s\n",cmd);
         if( ( Ptr = strstr( cmd, "::" ) ) != NULL ) {
             strncpy( Evt->UDN, TempPtr, Ptr - TempPtr );
             Evt->UDN[Ptr - TempPtr] = '\0';
@@ -499,7 +497,6 @@ unique_service_name( IN char *cmd,
 
     if( strstr( cmd, "urn:" ) != NULL
         && strstr( cmd, ":service:" ) != NULL ) {
-
         if( ( TempPtr = strstr( cmd, "urn" ) ) != NULL ) {
             strcpy( Evt->ServiceType, TempPtr );
             CommandFound = 1;
@@ -514,8 +511,17 @@ unique_service_name( IN char *cmd,
         }
     }
 
-    if( CommandFound == 0 ) {
+    if( ( TempPtr = strstr( cmd, "::upnp:rootdevice" ) ) != NULL ) {
+        /* Everything before "::upnp::rootdevice" is the UDN. */
+        if( TempPtr != cmd ) {
+            length = TempPtr - cmd;
+            strncpy(Evt->UDN, cmd, length);
+            Evt->UDN[length] = 0;
+            CommandFound = 1;
+        }
+    }
    
+    if( CommandFound == 0 ) {
         return -1;
     }
 
@@ -856,33 +862,38 @@ readFromSSDPSocket( SOCKET socket )
 int
 get_ssdp_sockets( MiniServerSockArray * out )
 {
+    char errorBuffer[ERROR_BUFFER_LEN];
     int onOff = 1;
     u_char ttl = 4;
     struct ip_mreq ssdpMcastAddr;
     struct sockaddr_in ssdpAddr;
     int option = 1;
+    int ret = 0;
     struct in_addr addr;
     SOCKET ssdpSock;
 #if INCLUDE_CLIENT_APIS
     SOCKET ssdpReqSock;
 
-    if( ( ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
+    ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 );
+    if ( ssdpReqSock == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in socket(): %s\n", errorBuffer );
 
             return UPNP_E_OUTOF_SOCKET;
     }
-    setsockopt( ssdpReqSock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
+    ret = setsockopt( ssdpReqSock, IPPROTO_IP, IP_MULTICAST_TTL,
+        &ttl, sizeof (ttl) );
     // just do it, regardless if fails or not.
     Make_Socket_NoBlocking( ssdpReqSock );
     gSsdpReqSocket = ssdpReqSock;
 #endif /* INCLUDE_CLIENT_APIS */
 
-    if( ( ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
+    ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 );
+    if ( ssdpSock == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in socket(): %s\n", errorBuffer );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
 
@@ -890,11 +901,12 @@ get_ssdp_sockets( MiniServerSockArray * out )
     }
 
     onOff = 1;
-    if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEADDR,
-            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in set reuse addr !!!\n" );
+    ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEADDR,
+        (char *)&onOff, sizeof(onOff) );
+    if ( ret == -1) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in setsockopt() SO_REUSEADDR: %s\n", errorBuffer );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
         shutdown( ssdpSock, SD_BOTH );
@@ -904,11 +916,12 @@ get_ssdp_sockets( MiniServerSockArray * out )
     }
     
 #if defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
-    if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
-            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in set reuse port !!!\n" );
+    ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
+        (char *)&onOff, sizeof (onOff) );
+    if ( ret == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in setsockopt() SO_REUSEPORT: %s\n", errorBuffer );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
         shutdown( ssdpSock, SD_BOTH );
@@ -918,16 +931,17 @@ get_ssdp_sockets( MiniServerSockArray * out )
     }
 #endif /* __FreeBSD__ */
 
-    memset( ( void * )&ssdpAddr, 0, sizeof( struct sockaddr_in ) );
+    memset( (void *)&ssdpAddr, 0, sizeof( struct sockaddr_in ) );
     ssdpAddr.sin_family = AF_INET;
     //  ssdpAddr.sin_addr.s_addr = inet_addr(LOCAL_HOST);
     ssdpAddr.sin_addr.s_addr = htonl( INADDR_ANY );
     ssdpAddr.sin_port = htons( SSDP_PORT );
-    if( bind( ssdpSock, ( struct sockaddr * )&ssdpAddr,
-            sizeof( ssdpAddr ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in binding !!!\n" );
+    ret = bind( ssdpSock, (struct sockaddr *)&ssdpAddr, sizeof (ssdpAddr) );
+    if ( ret == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in bind(), addr=0x%08X, port=%d: %s\n",
+            INADDR_ANY, SSDP_PORT, errorBuffer );
             shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
@@ -936,14 +950,16 @@ get_ssdp_sockets( MiniServerSockArray * out )
         return UPNP_E_SOCKET_BIND;
     }
 
-    memset( ( void * )&ssdpMcastAddr, 0, sizeof( struct ip_mreq ) );
+    memset( (void *)&ssdpMcastAddr, 0, sizeof (struct ip_mreq) );
     ssdpMcastAddr.imr_interface.s_addr = inet_addr( LOCAL_HOST );
     ssdpMcastAddr.imr_multiaddr.s_addr = inet_addr( SSDP_IP );
-    if( setsockopt( ssdpSock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-            ( char * )&ssdpMcastAddr, sizeof( struct ip_mreq ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in joining" " multicast group !!!\n" );
+    ret = setsockopt( ssdpSock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+        (char *)&ssdpMcastAddr, sizeof (struct ip_mreq) );
+    if ( ret == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in setsockopt() IP_ADD_MEMBERSHIP (join multicast group): %s\n",
+            errorBuffer );
         shutdown( ssdpSock, SD_BOTH );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
         UpnpCloseSocket( ssdpSock );
@@ -953,23 +969,29 @@ get_ssdp_sockets( MiniServerSockArray * out )
     }
 
     /* Set multicast interface. */
-    memset( ( void * )&addr, 0, sizeof( struct in_addr ));
+    memset( (void *)&addr, 0, sizeof (struct in_addr) );
     addr.s_addr = inet_addr(LOCAL_HOST);
-    if ( setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
-            (char *)&addr, sizeof addr) != 0) {
+    ret = setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
+        (char *)&addr, sizeof addr);
+    if ( ret == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
         UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-            "Couldn't set multicast interface.\n" );
+            "Error in setsockopt() IP_MULTICAST_IF (set multicast interface): %s\n",
+            errorBuffer );
         /* This is probably not a critical error, so let's continue. */
     }
 
     /* result is not checked becuase it will fail in WinMe and Win9x. */
-    setsockopt( ssdpSock, IPPROTO_IP,
-                IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
-    if( setsockopt( ssdpSock, SOL_SOCKET, SO_BROADCAST,
-            (char *)&option, sizeof(option) ) != 0) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in setting broadcast !!!\n" );
+    ret = setsockopt( ssdpSock, IPPROTO_IP,
+        IP_MULTICAST_TTL, &ttl, sizeof (ttl) );
+
+    ret = setsockopt( ssdpSock, SOL_SOCKET, SO_BROADCAST,
+        (char *)&option, sizeof (option) );
+    if( ret == -1) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            "Error in setsockopt() SO_BROADCAST (set broadcast): %s\n",
+            errorBuffer );
         shutdown( ssdpSock, SD_BOTH );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
         UpnpCloseSocket( ssdpSock );

upnp/src/uuid/sysdep.c

@@ -18,11 +18,11 @@
  */
 
 #include "config.h"
-#ifndef WIN32
- #include <unistd.h>
-#else
- #include <winsock2.h>
-#endif
+#ifdef WIN32
+	#include <winsock2.h>
+#else /* WIN32 */
+	#include <unistd.h>
+#endif /* WIN32 */
 #include <string.h>
 #include <stdio.h>
 #include "sysdep.h"
@@ -56,7 +56,7 @@ get_ieee_node_identifier(uuid_node_t *node)
    less than 100ns.
  */
 
-#ifdef _WINDOWS_
+#ifdef WIN32
 
 void
 get_system_time( uuid_time_t * uuid_time )
@@ -119,7 +119,7 @@ get_random_info(char seed[16])
 	MD5Final(seed, &c);
 };
 
-#else /* _WINDOWS_ */
+#else /* WIN32 */
 
 /*-----------------------------------------------------------------------------*/
 void
@@ -163,5 +163,5 @@ get_random_info(char seed[16])
 	MD5Final(seed, &c);
 };
 
-#endif /* _WINDOWS_ */
+#endif /* WIN32 */
 

upnp/src/uuid/uuid.c

@@ -282,7 +282,7 @@ true_random( void )
         inited = 1;
     };
 
-    return ( rand(  ) );
+    return ( rand() );
 }
 
 /*-----------------------------------------------------------------------------*/