Menu
▾
▴
pupnp-commits — Subversion commits notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
|
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(10) |
Feb
(17) |
Mar
(14) |
Apr
(25) |
May
(27) |
Jun
(8) |
Jul
|
Aug
(10) |
Sep
(2) |
Oct
(1) |
Nov
(32) |
Dec
(29) |
| 2008 |
Jan
(22) |
Feb
(20) |
Mar
(12) |
Apr
(17) |
May
(39) |
Jun
(49) |
Jul
(32) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(46) |
Apr
(16) |
May
(3) |
Jun
(6) |
Jul
|
Aug
(27) |
Sep
(23) |
Oct
(115) |
Nov
(178) |
Dec
(72) |
| 2011 |
Jan
(34) |
Feb
(16) |
Mar
(7) |
Apr
(2) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(2) |
Nov
(7) |
Dec
|
| 2012 |
Jan
(7) |
Feb
(18) |
Mar
(118) |
Apr
(29) |
May
(2) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Marcelo R. J. <mro...@us...> - 2013-01-29 14:14:55
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The tag, release-1.6.18 has been created
at 6cd1f111547a3aee2e080702430c0078371cb7ea (commit)
- Log -----------------------------------------------------------------
commit 6cd1f111547a3aee2e080702430c0078371cb7ea
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Tue Jan 29 12:04:00 2013 -0200
Adjust the library numbers for release.
-----------------------------------------------------------------------
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2013-01-29 14:14:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 6279b7fa5fec87e9067fd71788b7ab17f9345297 (commit)
via 6cd1f111547a3aee2e080702430c0078371cb7ea (commit)
from f015a132e82239cbf40dcb2346d7bee83685531b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=6279b7fa5fec87e9067fd71788b7ab17f9345297
commit 6279b7fa5fec87e9067fd71788b7ab17f9345297
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Tue Jan 29 12:11:56 2013 -0200
Homekeeping for the next release.
diff --git a/ChangeLog b/ChangeLog
index b7d2643..578f1db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
*******************************************************************************
+Version 1.6.19
+*******************************************************************************
+
+
+*******************************************************************************
Version 1.6.18
*******************************************************************************
diff --git a/Doxyfile b/Doxyfile
index 00a2963..20d8c96 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = libUPnP
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.6.18
+PROJECT_NUMBER = 1.6.19
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/build/inc/autoconfig.h b/build/inc/autoconfig.h
index ab04902..fd04975 100644
--- a/build/inc/autoconfig.h
+++ b/build/inc/autoconfig.h
@@ -105,7 +105,7 @@
#define PACKAGE_NAME "libupnp"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libupnp 1.6.18"
+#define PACKAGE_STRING "libupnp 1.6.19"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libupnp"
@@ -114,7 +114,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.18"
+#define PACKAGE_VERSION "1.6.19"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -172,13 +172,13 @@
#define UPNP_VERSION_MINOR 6
/* see upnpconfig.h */
-#define UPNP_VERSION_PATCH 18
+#define UPNP_VERSION_PATCH 19
/* see upnpconfig.h */
-#define UPNP_VERSION_STRING "1.6.18"
+#define UPNP_VERSION_STRING "1.6.19"
/* Version number of package */
-#define VERSION "1.6.18"
+#define VERSION "1.6.19"
/* File Offset size */
#define _FILE_OFFSET_BITS 64
diff --git a/build/inc/upnpconfig.h b/build/inc/upnpconfig.h
index f5f6e6f..aa525db 100644
--- a/build/inc/upnpconfig.h
+++ b/build/inc/upnpconfig.h
@@ -40,7 +40,7 @@
***************************************************************************/
/** The library version (string) e.g. "1.3.0" */
-#define UPNP_VERSION_STRING "1.6.18"
+#define UPNP_VERSION_STRING "1.6.19"
/** Major version of the library */
#define UPNP_VERSION_MAJOR 1
@@ -49,7 +49,7 @@
#define UPNP_VERSION_MINOR 6
/** Patch version of the library */
-#define UPNP_VERSION_PATCH 18
+#define UPNP_VERSION_PATCH 19
/** The library version (numeric) e.g. 10300 means version 1.3.0 */
#define UPNP_VERSION \
diff --git a/configure.ac b/configure.ac
index 990381f..f4b59c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
AC_PREREQ(2.60)
-AC_INIT([libupnp], [1.6.18], [mro...@us...])
+AC_INIT([libupnp], [1.6.19], [mro...@us...])
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:
@@ -328,6 +328,16 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:3:0])
dnl #AC_SUBST([LT_VERSION_UPNP], [9:2:3])
dnl #
dnl ############################################################################
+dnl # Release 1.6.19:
+dnl # "current:revision:age"
+dnl #
+dnl # -
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML], [::])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [::])
+dnl #AC_SUBST([LT_VERSION_UPNP], [::])
+dnl #
+dnl ############################################################################
AC_SUBST([LT_VERSION_IXML], [2:8:0])
AC_SUBST([LT_VERSION_THREADUTIL], [6:3:0])
AC_SUBST([LT_VERSION_UPNP], [9:2:3])
diff --git a/libupnp.spec b/libupnp.spec
index 66eb948..5040788 100644
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -1,4 +1,4 @@
-Version: 1.6.18
+Version: 1.6.19
Summary: Universal Plug and Play (UPnP) SDK
Name: libupnp
Release: 1%{?dist}
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=6cd1f111547a3aee2e080702430c0078371cb7ea
commit 6cd1f111547a3aee2e080702430c0078371cb7ea
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Tue Jan 29 12:04:00 2013 -0200
Adjust the library numbers for release.
diff --git a/configure.ac b/configure.ac
index 74e1fc3..990381f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,16 +316,21 @@ dnl ############################################################################
dnl # Release 1.6.18:
dnl # "current:revision:age"
dnl #
-dnl # -
+dnl # - Code has changed in ixml
+dnl # revision: 7 -> 8
+dnl # - Code has changed in threadutil
+dnl # revision: 2 -> 3
+dnl # - Code has changed in upnp
+dnl # revision: 1 -> 2
dnl #
-dnl #AC_SUBST([LT_VERSION_IXML], [::])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [::])
-dnl #AC_SUBST([LT_VERSION_UPNP], [::])
+dnl #AC_SUBST([LT_VERSION_IXML], [2:8:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:3:0])
+dnl #AC_SUBST([LT_VERSION_UPNP], [9:2:3])
dnl #
dnl ############################################################################
-AC_SUBST([LT_VERSION_IXML], [2:7:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [6:2:0])
-AC_SUBST([LT_VERSION_UPNP], [9:1:3])
+AC_SUBST([LT_VERSION_IXML], [2:8:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [6:3:0])
+AC_SUBST([LT_VERSION_UPNP], [9:2:3])
dnl ############################################################################
dnl # Repeating the algorithm to place it closer to the modificatin place:
dnl # - library code modified: revision++
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
Doxyfile | 2 +-
build/inc/autoconfig.h | 10 +++++-----
build/inc/upnpconfig.h | 4 ++--
configure.ac | 25 ++++++++++++++++++++-----
libupnp.spec | 2 +-
6 files changed, 34 insertions(+), 14 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2013-01-29 13:52:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 2bb79879b77dd215a26c92d1348adf2ae406dfd8 (commit)
from 6a9baf6058fa68a202f88e60cb8ff8c4cf839e9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=2bb79879b77dd215a26c92d1348adf2ae406dfd8
commit 2bb79879b77dd215a26c92d1348adf2ae406dfd8
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Tue Dec 4 16:36:16 2012 -0200
Security fix for CERT issue VU#922681
This patch addresses three possible buffer overflows in function
unique_service_name(). The three issues have the folowing CVE
numbers:
CVE-2012-5958 Issue #2: Stack buffer overflow of Tempbuf
CVE-2012-5959 Issue #4: Stack buffer overflow of Event->UDN
CVE-2012-5960 Issue #8: Stack buffer overflow of Event->UDN
Notice that the following issues have already been dealt by previous
work:
CVE-2012-5961 Issue #1: Stack buffer overflow of Evt->UDN
CVE-2012-5962 Issue #3: Stack buffer overflow of Evt->DeviceType
CVE-2012-5963 Issue #5: Stack buffer overflow of Event->UDN
CVE-2012-5964 Issue #6: Stack buffer overflow of Event->DeviceType
CVE-2012-5965 Issue #7: Stack buffer overflow of Event->DeviceType
(cherry picked from commit f015a132e82239cbf40dcb2346d7bee83685531b)
diff --git a/ChangeLog b/ChangeLog
index d3ba399..0d08ebb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -349,6 +349,26 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-12-06 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
+
+ Security fix for CERT issue VU#922681
+
+ This patch addresses three possible buffer overflows in function
+ unique_service_name(). The three issues have the folowing CVE numbers:
+
+ CVE-2012-5958 Issue #2: Stack buffer overflow of Tempbuf
+ CVE-2012-5959 Issue #4: Stack buffer overflow of Event->UDN
+ CVE-2012-5960 Issue #8: Stack buffer overflow of Event->UDN
+
+ Notice that the following issues have already been dealt by previous
+ work:
+
+ CVE-2012-5961 Issue #1: Stack buffer overflow of Evt->UDN
+ CVE-2012-5962 Issue #3: Stack buffer overflow of Evt->DeviceType
+ CVE-2012-5963 Issue #5: Stack buffer overflow of Event->UDN
+ CVE-2012-5964 Issue #6: Stack buffer overflow of Event->DeviceType
+ CVE-2012-5965 Issue #7: Stack buffer overflow of Event->DeviceType
+
2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Fix memory leak and access violation in UpnpSendAction(Ex)Async.
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index 231c2c5..8a57d08 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -467,16 +467,16 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
else
return -1;
if (ptr3 != NULL) {
- if (strlen("uuid:") + strlen(ptr3 + 1) >= sizeof(Evt->UDN))
+ if (strlen("uuid:") + strlen(ptr3 + 1) >= sizeof Evt->UDN)
return -1;
- snprintf(Evt->UDN, sizeof(Evt->UDN), "uuid:%s",
- ptr3 + 1);
+ snprintf(Evt->UDN, sizeof Evt->UDN, "uuid:%s", ptr3 + 1);
}
else
return -1;
ptr1 = strstr(cmd, ":");
if (ptr1 != NULL) {
n = (size_t)ptr3 - (size_t)ptr1;
+ n = n >= sizeof TempBuf ? sizeof TempBuf - 1 : n;
strncpy(TempBuf, ptr1, n);
TempBuf[n] = '\0';
if (strlen("urn") + strlen(TempBuf) >= sizeof(Evt->DeviceType))
@@ -490,27 +490,28 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
if ((TempPtr = strstr(cmd, "uuid")) != NULL) {
if ((Ptr = strstr(cmd, "::")) != NULL) {
n = (size_t)Ptr - (size_t)TempPtr;
+ n = n >= sizeof Evt->UDN ? sizeof Evt->UDN - 1 : n;
strncpy(Evt->UDN, TempPtr, n);
Evt->UDN[n] = '\0';
} else {
memset(Evt->UDN, 0, sizeof(Evt->UDN));
- strncpy(Evt->UDN, TempPtr, sizeof(Evt->UDN) - 1);
+ strncpy(Evt->UDN, TempPtr, sizeof Evt->UDN - 1);
}
CommandFound = 1;
}
if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":service:") != NULL) {
if ((TempPtr = strstr(cmd, "urn")) != NULL) {
- memset(Evt->ServiceType, 0, sizeof(Evt->ServiceType));
+ memset(Evt->ServiceType, 0, sizeof Evt->ServiceType);
strncpy(Evt->ServiceType, TempPtr,
- sizeof(Evt->ServiceType) - 1);
+ sizeof Evt->ServiceType - 1);
CommandFound = 1;
}
}
if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":device:") != NULL) {
if ((TempPtr = strstr(cmd, "urn")) != NULL) {
- memset(Evt->DeviceType, 0, sizeof(Evt->DeviceType));
+ memset(Evt->DeviceType, 0, sizeof Evt->DeviceType);
strncpy(Evt->DeviceType, TempPtr,
- sizeof(Evt->DeviceType) - 1);
+ sizeof Evt->DeviceType - 1);
CommandFound = 1;
}
}
@@ -518,6 +519,7 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
/* Everything before "::upnp::rootdevice" is the UDN. */
if (TempPtr != cmd) {
n = (size_t)TempPtr - (size_t)cmd;
+ n = n >= sizeof Evt->UDN ? sizeof Evt->UDN - 1 : n;
strncpy(Evt->UDN, cmd, n);
Evt->UDN[n] = 0;
CommandFound = 1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 20 ++++++++++++++++++++
upnp/src/ssdp/ssdp_server.c | 18 ++++++++++--------
2 files changed, 30 insertions(+), 8 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2013-01-29 13:52:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via f015a132e82239cbf40dcb2346d7bee83685531b (commit)
from 40e90e89fc406f0ed665d3753b5fb3b7071787d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=f015a132e82239cbf40dcb2346d7bee83685531b
commit f015a132e82239cbf40dcb2346d7bee83685531b
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Tue Dec 4 16:36:16 2012 -0200
Security fix for CERT issue VU#922681
This patch addresses three possible buffer overflows in function
unique_service_name(). The three issues have the folowing CVE
numbers:
CVE-2012-5958 Issue #2: Stack buffer overflow of Tempbuf
CVE-2012-5959 Issue #4: Stack buffer overflow of Event->UDN
CVE-2012-5960 Issue #8: Stack buffer overflow of Event->UDN
Notice that the following issues have already been dealt by previous
work:
CVE-2012-5961 Issue #1: Stack buffer overflow of Evt->UDN
CVE-2012-5962 Issue #3: Stack buffer overflow of Evt->DeviceType
CVE-2012-5963 Issue #5: Stack buffer overflow of Event->UDN
CVE-2012-5964 Issue #6: Stack buffer overflow of Event->DeviceType
CVE-2012-5965 Issue #7: Stack buffer overflow of Event->DeviceType
diff --git a/ChangeLog b/ChangeLog
index 904d009..b7d2643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
Version 1.6.18
*******************************************************************************
+2012-12-06 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
+
+ Security fix for CERT issue VU#922681
+
+ This patch addresses three possible buffer overflows in function
+ unique_service_name(). The three issues have the folowing CVE numbers:
+
+ CVE-2012-5958 Issue #2: Stack buffer overflow of Tempbuf
+ CVE-2012-5959 Issue #4: Stack buffer overflow of Event->UDN
+ CVE-2012-5960 Issue #8: Stack buffer overflow of Event->UDN
+
+ Notice that the following issues have already been dealt by previous
+ work:
+
+ CVE-2012-5961 Issue #1: Stack buffer overflow of Evt->UDN
+ CVE-2012-5962 Issue #3: Stack buffer overflow of Evt->DeviceType
+ CVE-2012-5963 Issue #5: Stack buffer overflow of Event->UDN
+ CVE-2012-5964 Issue #6: Stack buffer overflow of Event->DeviceType
+ CVE-2012-5965 Issue #7: Stack buffer overflow of Event->DeviceType
+
2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Fix memory leak and access violation in UpnpSendAction(Ex)Async.
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index 231c2c5..8a57d08 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -467,16 +467,16 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
else
return -1;
if (ptr3 != NULL) {
- if (strlen("uuid:") + strlen(ptr3 + 1) >= sizeof(Evt->UDN))
+ if (strlen("uuid:") + strlen(ptr3 + 1) >= sizeof Evt->UDN)
return -1;
- snprintf(Evt->UDN, sizeof(Evt->UDN), "uuid:%s",
- ptr3 + 1);
+ snprintf(Evt->UDN, sizeof Evt->UDN, "uuid:%s", ptr3 + 1);
}
else
return -1;
ptr1 = strstr(cmd, ":");
if (ptr1 != NULL) {
n = (size_t)ptr3 - (size_t)ptr1;
+ n = n >= sizeof TempBuf ? sizeof TempBuf - 1 : n;
strncpy(TempBuf, ptr1, n);
TempBuf[n] = '\0';
if (strlen("urn") + strlen(TempBuf) >= sizeof(Evt->DeviceType))
@@ -490,27 +490,28 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
if ((TempPtr = strstr(cmd, "uuid")) != NULL) {
if ((Ptr = strstr(cmd, "::")) != NULL) {
n = (size_t)Ptr - (size_t)TempPtr;
+ n = n >= sizeof Evt->UDN ? sizeof Evt->UDN - 1 : n;
strncpy(Evt->UDN, TempPtr, n);
Evt->UDN[n] = '\0';
} else {
memset(Evt->UDN, 0, sizeof(Evt->UDN));
- strncpy(Evt->UDN, TempPtr, sizeof(Evt->UDN) - 1);
+ strncpy(Evt->UDN, TempPtr, sizeof Evt->UDN - 1);
}
CommandFound = 1;
}
if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":service:") != NULL) {
if ((TempPtr = strstr(cmd, "urn")) != NULL) {
- memset(Evt->ServiceType, 0, sizeof(Evt->ServiceType));
+ memset(Evt->ServiceType, 0, sizeof Evt->ServiceType);
strncpy(Evt->ServiceType, TempPtr,
- sizeof(Evt->ServiceType) - 1);
+ sizeof Evt->ServiceType - 1);
CommandFound = 1;
}
}
if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":device:") != NULL) {
if ((TempPtr = strstr(cmd, "urn")) != NULL) {
- memset(Evt->DeviceType, 0, sizeof(Evt->DeviceType));
+ memset(Evt->DeviceType, 0, sizeof Evt->DeviceType);
strncpy(Evt->DeviceType, TempPtr,
- sizeof(Evt->DeviceType) - 1);
+ sizeof Evt->DeviceType - 1);
CommandFound = 1;
}
}
@@ -518,6 +519,7 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
/* Everything before "::upnp::rootdevice" is the UDN. */
if (TempPtr != cmd) {
n = (size_t)TempPtr - (size_t)cmd;
+ n = n >= sizeof Evt->UDN ? sizeof Evt->UDN - 1 : n;
strncpy(Evt->UDN, cmd, n);
Evt->UDN[n] = 0;
CommandFound = 1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 20 ++++++++++++++++++++
upnp/src/ssdp/ssdp_server.c | 18 ++++++++++--------
2 files changed, 30 insertions(+), 8 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-11-13 21:20:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 6a9baf6058fa68a202f88e60cb8ff8c4cf839e9a (commit)
via 3f37b55ebc5f73b3a0a8dbcc7e28d14c0d622fab (commit)
via 617bda0ab91637563127f123491f6146af166530 (commit)
via 2a0d73aeacfdbcd62b0dbc1081c6c4d110677ad2 (commit)
via 05e66448944d712161439ef5e6ff279e10091876 (commit)
via d00e4944814b6a5ee38645e4ca756b626e51728c (commit)
via 6c2346a526bc720602ff4f53a9402beeaeaa8d0b (commit)
via 77b7ec848f06fddd6482a2beef9849c4a37deab7 (commit)
via cc69373a7d637df3e5de3be532b638e7e54a3ead (commit)
via cb7d43605a4ee58e406f94f1e9fe1aa4f3a72752 (commit)
via 42dd1ad53394e68f02782229bfacc36040cf8891 (commit)
via f2cceaf021f984f7dd3dd6ac823712939ed07ad6 (commit)
via 2b4c5f816809ea25bab6d92c46df883291fdda20 (commit)
from 9f17244f95a45a6ebabc18c1aecc041e518f67c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=6a9baf6058fa68a202f88e60cb8ff8c4cf839e9a
commit 6a9baf6058fa68a202f88e60cb8ff8c4cf839e9a
Merge: 9f17244 3f37b55
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Tue Nov 13 13:17:19 2012 -0800
Merge pull request #7 from Tieske/master
updated request for https://github.com/mrjimenez/pupnp/pull/6
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=3f37b55ebc5f73b3a0a8dbcc7e28d14c0d622fab
commit 3f37b55ebc5f73b3a0a8dbcc7e28d14c0d622fab
Author: Thijs Schreijer <th...@th...>
Date: Sun Oct 21 21:26:11 2012 +0200
exported the UUID function to enable reuse in client applications
diff --git a/upnp/src/inc/uuid.h b/upnp/src/inc/uuid.h
index 93f5681..099160b 100644
--- a/upnp/src/inc/uuid.h
+++ b/upnp/src/inc/uuid.h
@@ -41,14 +41,14 @@ typedef struct _uuid_upnp {
/*!
* \brief Generate a UUID.
*/
-int uuid_create(
+EXPORT_SPEC int uuid_create(
/*! . */
uuid_upnp * id);
/*!
* \brief Out will be xxxx-xx-xx-xx-xxxxxx format.
*/
-void uuid_unpack(
+EXPORT_SPEC void uuid_unpack(
/*! . */
uuid_upnp * u,
/*! . */
@@ -57,7 +57,7 @@ void uuid_unpack(
/*!
* \brief Create a UUID using a "name" from a "name space"
*/
-void uuid_create_from_name(
+EXPORT_SPEC void uuid_create_from_name(
/*! Resulting UUID. */
uuid_upnp * uid,
/*! UUID to serve as context, so identical names from different name
@@ -78,7 +78,7 @@ void uuid_create_from_name(
*
* \note Lexical ordering is not temporal ordering!
*/
-int uuid_compare(
+EXPORT_SPEC int uuid_compare(
/*! . */
uuid_upnp * u1,
/*! . */
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=617bda0ab91637563127f123491f6146af166530
commit 617bda0ab91637563127f123491f6146af166530
Author: Thijs Schreijer <th...@th...>
Date: Sun Oct 14 08:56:47 2012 +0200
updated ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 6b783c4..d3ba399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
Version 1.8.0
*******************************************************************************
+2012-07-11 Thijs Schreijer <thijs(at)thijsschreijer.nl>
+
+ Changed param to const UpnpAcceptSubscriptionExt() for consistency
+
+2012-06-07 Thijs Schreijer <thijs(at)thijsschreijer.nl>
+
+ updated ixmlDocument_createAttributeEx() and ixmlDocument_createAttribute()
+ to use parameter DOMString instead of char * (same but now consistent)
+
+2012-05-06 Thijs Schreijer <thijs(at)thijsschreijer.nl>
+
+ Added script support (directive SCRIPTSUPPORT) for better support of
+ garbage collected script languages. The node element gets a custom tag
+ through ixmlNode_setCTag() and ixmlNode_getCTag(). And a callback upon
+ releasing the node resources can be set using ixmlSetBeforeFree()
+ See updated readme for usage.
+
2012-03-24 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
SF Bug Tracker id 3510595 - UpnpDownloadXmlDoc : can't get the file
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=2a0d73aeacfdbcd62b0dbc1081c6c4d110677ad2
commit 2a0d73aeacfdbcd62b0dbc1081c6c4d110677ad2
Merge: 05e6644 9f17244
Author: Thijs Schreijer <th...@th...>
Date: Sun Oct 14 08:33:19 2012 +0200
Merge branch 'master' of git://github.com/mrjimenez/pupnp
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=05e66448944d712161439ef5e6ff279e10091876
commit 05e66448944d712161439ef5e6ff279e10091876
Author: Thijs Schreijer <th...@th...>
Date: Fri Sep 21 22:20:51 2012 +0200
added scriptsupport switch to release configuration
diff --git a/build/vc10/ixml.vcxproj b/build/vc10/ixml.vcxproj
index 192c688..7c0bfcb 100644
--- a/build/vc10/ixml.vcxproj
+++ b/build/vc10/ixml.vcxproj
@@ -206,7 +206,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;SCRIPTSUPPORT;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=d00e4944814b6a5ee38645e4ca756b626e51728c
commit d00e4944814b6a5ee38645e4ca756b626e51728c
Author: Thijs Schreijer <th...@th...>
Date: Wed Jul 11 23:18:23 2012 +0200
Updated parameter to UpnpAcceptSubscriptionExt to a 'const' declaration, this aligns with UpnpAcceptSubscription
diff --git a/upnp/inc/upnp.h b/upnp/inc/upnp.h
index 8508a47..894702e 100644
--- a/upnp/inc/upnp.h
+++ b/upnp/inc/upnp.h
@@ -1492,7 +1492,7 @@ EXPORT_SPEC int UpnpAcceptSubscriptionExt(
* Plug and Play Device Architecture specification. */
IXML_Document *PropSet,
/*! [in] The subscription ID of the newly registered control point. */
- Upnp_SID SubsId);
+ const Upnp_SID SubsId);
/*!
* \brief Sends out an event change notification to all control points
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 2a24b52..f231f67 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -2522,7 +2522,7 @@ int UpnpAcceptSubscriptionExt(
const char *DevID_const,
const char *ServName_const,
IXML_Document *PropSet,
- Upnp_SID SubsId)
+ const Upnp_SID SubsId)
{
int ret = 0;
int line = 0;
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=6c2346a526bc720602ff4f53a9402beeaeaa8d0b
commit 6c2346a526bc720602ff4f53a9402beeaeaa8d0b
Author: Thijs Schreijer <th...@th...>
Date: Fri Jul 6 02:11:12 2012 +0200
added debug output to ignore list
changed some project settings to make debugging available (PDB file didn't match)
diff --git a/.gitignore b/.gitignore
index 43f3edb..f01fc8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,4 +110,6 @@ docs/doxygen
/build/vc10/out.vc10.Win32
/build/vc10/out.vc10.x64
/pthreads
-/build/vc10/ipch
\ No newline at end of file
+/build/vc10/ipch
+/build/vc10/IUpnpErrFile.txt
+/build/vc10/IUpnpInfoFile.txt
\ No newline at end of file
diff --git a/build/vc10/libupnp.vcxproj b/build/vc10/libupnp.vcxproj
index 5494c46..50cf350 100644
--- a/build/vc10/libupnp.vcxproj
+++ b/build/vc10/libupnp.vcxproj
@@ -300,7 +300,6 @@
</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<BrowseInformation>
</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -318,7 +317,6 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
diff --git a/build/vc10/tvdevice.vcxproj b/build/vc10/tvdevice.vcxproj
index 1446778..e5763ac 100644
--- a/build/vc10/tvdevice.vcxproj
+++ b/build/vc10/tvdevice.vcxproj
@@ -163,7 +163,6 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsC</CompileAs>
@@ -172,7 +171,6 @@
<AdditionalDependencies>pthreadVC2.lib;ixml.lib;threadutil.lib;libupnp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\libupnp;$(OutDir)..\lib\threadutil;$(OutDir)..\lib\ixml;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=77b7ec848f06fddd6482a2beef9849c4a37deab7
commit 77b7ec848f06fddd6482a2beef9849c4a37deab7
Author: Thijs Schreijer <th...@th...>
Date: Tue Jul 3 21:47:47 2012 +0200
added ipch folder to ignore list
Added documentation/usage of SCRIPTSUPPORT to the README file.
diff --git a/.gitignore b/.gitignore
index 0515e66..43f3edb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,4 +109,5 @@ docs/doxygen
/build/vc10/out.vc9.Win32/Debug
/build/vc10/out.vc10.Win32
/build/vc10/out.vc10.x64
-/pthreads
\ No newline at end of file
+/pthreads
+/build/vc10/ipch
\ No newline at end of file
diff --git a/README b/README
index 6347b9c..c7946ad 100644
--- a/README
+++ b/README
@@ -17,6 +17,7 @@ sections:
6. Product Release Notes
7. New Features
8. Support and Contact Information
+9. IXML support for scriptinglanguages
1) Release Contents
@@ -343,3 +344,53 @@ us know.
* Other brands, names, and trademarks are the property of their respective
owners.
+
+9. IXML support for scriptinglanguages
+-------------------------------------------
+The treestructure of XML documents created by IXML is hard to maintain when
+creating a binding for a scripting language. Even when many elements may
+never be used on the script side, it requires copying the entire tree
+structure once you start accessing elements several levels deep.
+Hence scriptsupport was added. To enable it compile while SCRIPTSUPPORT has
+been defined. This allows control using only a list instead of a tree-like
+structure, and only nodes actually accessed need to be created instead of
+all the nodes in the tree.
+
+Here's how its supposed to work;
+* The scriptsupport allows you to add a callback when a node is freed on
+ the C side, so appropriate action can be taken on the script side, see
+ function ixmlSetBeforeFree().
+* Instead of recreating the tree structure, an intermediate object should
+ be created only for the nodes actually accessed. The object should be
+ containing a pointer to the node and a 'valid flag' which is initially
+ set to TRUE (the valid flag, can simply be the pointer to the node being
+ NULL or not). Before creating the intermediate object, the custom tag
+ 'ctag' can be used to check whether one was already created.
+* the node object gets an extra 'void* ctag' field, a custom tag to make a
+ cross reference to the script side intermediate object. It can be set
+ using ixmlNode_setCTag(), and read using ixmlNode_getCTag(). Whenever
+ a new intermediate object is created, the ctag of the coirresponding
+ node should be set to point to this intermediate object.
+* The tree structure traversal is done on the C side (looking up parents,
+ children and siblings)
+* Every intermediate object created should be kept in a list (preferably a
+ key-value list, where the key is the pointer to the node and the value is
+ the pointer to the intermediate object)
+* when the callback is called, the node should be looked up in the list,
+ the flag set to false, the pointer to the C-side node be cleared and on
+ the C-side the ctag should be cleared.
+* whenever the intermediate object is accessed and its flag is set to False,
+ an error should be thrown that the XML document has been closed.
+
+Freeing resources can be done in 2 ways, C side by simply calling the free
+node methods, or script side by the garbage collector of the scriptengine.
+Scriptside steps;
+* if the valid flag is set to False (XML document is closed), then the
+ intermediate object can be destroyed, no further action
+* if the node has a parent, then the intermediate object can be destroyed
+ after the ctag on the corresponding node has been cleared. Nothing needs
+ to be freed on the C-side.
+* if the node has no parent, then the node must be freed on the C side by
+ calling the corresponding free node methods. This will result in a chain
+ of callbacks closing the node and all underlying nodes.
+
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=cc69373a7d637df3e5de3be532b638e7e54a3ead
commit cc69373a7d637df3e5de3be532b638e7e54a3ead
Author: Thijs Schreijer <th...@th...>
Date: Fri Jun 22 20:59:52 2012 +0200
Added the SCRIPTSUPPORT directive to the doxygen configfile so documentation will be generated
diff --git a/Doxyfile b/Doxyfile
index d334ad3..2af481f 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS EXCLUDE_GENA=0 EXCLUDE_DOM=0
+PREDEFINED = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS SCRIPTSUPPORT EXCLUDE_GENA=0 EXCLUDE_DOM=0
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=cb7d43605a4ee58e406f94f1e9fe1aa4f3a72752
commit cb7d43605a4ee58e406f94f1e9fe1aa4f3a72752
Merge: 42dd1ad 4d88a2a
Author: Thijs Schreijer <th...@th...>
Date: Mon Jun 11 15:21:56 2012 +0200
Merge branch 'master' of https://github.com/mrjimenez/pupnp
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=42dd1ad53394e68f02782229bfacc36040cf8891
commit 42dd1ad53394e68f02782229bfacc36040cf8891
Author: Thijs Schreijer <th...@th...>
Date: Thu Jun 7 23:31:57 2012 +0200
Small documentation updates and updating 2 parameters to the DOMString type for consistency.
diff --git a/ixml/inc/ixml.h b/ixml/inc/ixml.h
index 36f7508..447aa20 100644
--- a/ixml/inc/ixml.h
+++ b/ixml/inc/ixml.h
@@ -273,6 +273,8 @@ extern "C" {
* The \b Node interface forms the primary datatype for all other DOM
* objects. Every other interface is derived from this interface, inheriting
* its functionality. For more information, refer to DOM2-Core page 34.
+ * (Note: within the IXML library the NamedNodeMap and NodeList interfaces are
+ * the only interfaces that are not DOM objects and hence do not inherit from Node)
*
* @{
*/
@@ -324,7 +326,8 @@ EXPORT_SPEC int ixmlNode_setNodeValue(
/*!
- * \brief Retrieves the type of a \b Node.
+ * \brief Retrieves the type of a \b Node. Note that not all possible
+ * return values are actually implemented.
*
* \return An enum IXML_NODE_TYPE representing the type of the \b Node.
*/
@@ -901,7 +904,7 @@ EXPORT_SPEC IXML_Attr *ixmlDocument_createAttribute(
/*! [in] The owner \b Document of the new node. */
IXML_Document *doc,
/*! [in] The name of the new attribute. */
- const char *name);
+ const DOMString name);
/*!
@@ -922,7 +925,7 @@ EXPORT_SPEC int ixmlDocument_createAttributeEx(
/*! [in] The owner \b Document of the new node. */
IXML_Document *doc,
/*! [in] The name of the new attribute. */
- const char *name,
+ const DOMString name,
/*! [out] A pointer to a \b Attr where the new object will be stored. */
IXML_Attr **attrNode);
diff --git a/ixml/src/document.c b/ixml/src/document.c
index 9a72b0e..c6285c9 100644
--- a/ixml/src/document.c
+++ b/ixml/src/document.c
@@ -281,7 +281,7 @@ IXML_Node *ixmlDocument_createTextNode(
int ixmlDocument_createAttributeEx(
IXML_Document *doc,
- const char *name,
+ const DOMString name,
IXML_Attr **rtAttr)
{
IXML_Attr *attrNode = NULL;
@@ -322,7 +322,7 @@ ErrorHandler:
IXML_Attr *ixmlDocument_createAttribute(
IXML_Document *doc,
- const char *name)
+ const DOMString name)
{
IXML_Attr *attrNode = NULL;
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=f2cceaf021f984f7dd3dd6ac823712939ed07ad6
commit f2cceaf021f984f7dd3dd6ac823712939ed07ad6
Author: Thijs Schreijer <th...@th...>
Date: Thu Jun 7 23:30:03 2012 +0200
cleanup of VC project, removing files from UPnP project that are part of IXML project
diff --git a/build/vc10/.gitignore b/build/vc10/.gitignore
index 102253c..2c7023e 100644
--- a/build/vc10/.gitignore
+++ b/build/vc10/.gitignore
@@ -1,3 +1,4 @@
*.suo
-*.user
\ No newline at end of file
+*.user
+*.sdf
\ No newline at end of file
diff --git a/build/vc10/libupnp.vcxproj b/build/vc10/libupnp.vcxproj
index 31e0006..5494c46 100644
--- a/build/vc10/libupnp.vcxproj
+++ b/build/vc10/libupnp.vcxproj
@@ -292,7 +292,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;SCRIPTSUPPORT;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -574,31 +574,20 @@
<ItemGroup>
<ClCompile Include="..\..\upnp\src\api\ActionComplete.c" />
<ClCompile Include="..\..\upnp\src\api\ActionRequest.c" />
- <ClCompile Include="..\..\ixml\src\attr.c" />
<ClCompile Include="..\..\upnp\src\genlib\client_table\client_table.c" />
<ClCompile Include="..\..\upnp\src\genlib\client_table\ClientSubscription.c" />
<ClCompile Include="..\..\upnp\src\api\Discovery.c" />
- <ClCompile Include="..\..\ixml\src\document.c" />
- <ClCompile Include="..\..\ixml\src\element.c" />
<ClCompile Include="..\..\upnp\src\api\Event.c" />
<ClCompile Include="..\..\upnp\src\api\EventSubscribe.c" />
<ClCompile Include="..\..\upnp\src\api\FileInfo.c" />
- <ClCompile Include="..\..\threadutil\src\FreeList.c" />
<ClCompile Include="..\..\upnp\src\gena\gena_callback2.c" />
<ClCompile Include="..\..\upnp\src\gena\gena_ctrlpt.c" />
<ClCompile Include="..\..\upnp\src\gena\gena_device.c" />
<ClCompile Include="..\..\upnp\src\genlib\net\http\httpparser.c" />
<ClCompile Include="..\..\upnp\src\genlib\net\http\httpreadwrite.c" />
- <ClCompile Include="..\..\ixml\src\ixml.c" />
- <ClCompile Include="..\..\ixml\src\ixmlmembuf.c" />
- <ClCompile Include="..\..\ixml\src\ixmlparser.c" />
- <ClCompile Include="..\..\threadutil\src\LinkedList.c" />
<ClCompile Include="..\..\upnp\src\uuid\md5.c" />
<ClCompile Include="..\..\upnp\src\genlib\util\membuffer.c" />
<ClCompile Include="..\..\upnp\src\genlib\miniserver\miniserver.c" />
- <ClCompile Include="..\..\ixml\src\namedNodeMap.c" />
- <ClCompile Include="..\..\ixml\src\node.c" />
- <ClCompile Include="..\..\ixml\src\nodeList.c" />
<ClCompile Include="..\..\upnp\src\genlib\net\http\parsetools.c" />
<ClCompile Include="..\..\upnp\src\genlib\service_table\service_table.c" />
<ClCompile Include="..\..\upnp\src\soap\soap_common.c" />
@@ -615,8 +604,6 @@
<ClCompile Include="..\..\upnp\src\genlib\util\strintmap.c" />
<ClCompile Include="..\..\upnp\src\api\SubscriptionRequest.c" />
<ClCompile Include="..\..\upnp\src\uuid\sysdep.c" />
- <ClCompile Include="..\..\threadutil\src\ThreadPool.c" />
- <ClCompile Include="..\..\threadutil\src\TimerThread.c" />
<ClCompile Include="..\..\upnp\src\genlib\util\upnp_timeout.c" />
<ClCompile Include="..\..\upnp\src\api\upnpapi.c" />
<ClCompile Include="..\..\upnp\src\api\upnpdebug.c" />
diff --git a/build/vc10/libupnp.vcxproj.filters b/build/vc10/libupnp.vcxproj.filters
index 1c25aaa..633ee69 100644
--- a/build/vc10/libupnp.vcxproj.filters
+++ b/build/vc10/libupnp.vcxproj.filters
@@ -17,9 +17,6 @@
<ClCompile Include="..\..\upnp\src\api\ActionRequest.c">
<Filter>sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\ixml\src\attr.c">
- <Filter>sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\upnp\src\genlib\client_table\client_table.c">
<Filter>sources</Filter>
</ClCompile>
@@ -29,12 +26,6 @@
<ClCompile Include="..\..\upnp\src\api\Discovery.c">
<Filter>sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\ixml\src\document.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\ixml\src\element.c">
- <Filter>sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\upnp\src\api\Event.c">
<Filter>sources</Filter>
</ClCompile>
@@ -44,9 +35,6 @@
<ClCompile Include="..\..\upnp\src\api\FileInfo.c">
<Filter>sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\threadutil\src\FreeList.c">
- <Filter>sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\upnp\src\gena\gena_callback2.c">
<Filter>sources</Filter>
</ClCompile>
@@ -62,18 +50,6 @@
<ClCompile Include="..\..\upnp\src\genlib\net\http\httpreadwrite.c">
<Filter>sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\ixml\src\ixml.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\ixml\src\ixmlmembuf.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\ixml\src\ixmlparser.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\threadutil\src\LinkedList.c">
- <Filter>sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\upnp\src\uuid\md5.c">
<Filter>sources</Filter>
</ClCompile>
@@ -83,15 +59,6 @@
<ClCompile Include="..\..\upnp\src\genlib\miniserver\miniserver.c">
<Filter>sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\ixml\src\namedNodeMap.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\ixml\src\node.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\ixml\src\nodeList.c">
- <Filter>sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\upnp\src\genlib\net\http\parsetools.c">
<Filter>sources</Filter>
</ClCompile>
@@ -140,12 +107,6 @@
<ClCompile Include="..\..\upnp\src\uuid\sysdep.c">
<Filter>sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\threadutil\src\ThreadPool.c">
- <Filter>sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\threadutil\src\TimerThread.c">
- <Filter>sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\upnp\src\genlib\util\upnp_timeout.c">
<Filter>sources</Filter>
</ClCompile>
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=2b4c5f816809ea25bab6d92c46df883291fdda20
commit 2b4c5f816809ea25bab6d92c46df883291fdda20
Author: Thijs Schreijer <th...@th...>
Date: Sun May 6 23:10:07 2012 +0200
Added a custom tag (void*) to the Node object and a callback before freeing a Node. This to aid in resource management for a scripting language with auto-garbage collection.
diff --git a/build/vc10/ixml.vcxproj b/build/vc10/ixml.vcxproj
index 5054848..192c688 100644
--- a/build/vc10/ixml.vcxproj
+++ b/build/vc10/ixml.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Lib|Win32">
@@ -158,7 +158,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;SCRIPTSUPPORT;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/ixml/inc/ixml.h b/ixml/inc/ixml.h
index d58255d..36f7508 100644
--- a/ixml/inc/ixml.h
+++ b/ixml/inc/ixml.h
@@ -158,6 +158,13 @@ typedef struct _IXML_Document *Docptr;
typedef struct _IXML_Node *Nodeptr;
+#ifdef SCRIPTSUPPORT
+/*!
+ * \brief Signature for GC support method, called before a node is freed.
+ */
+typedef void (*IXML_BeforeFreeNode_t) (Nodeptr obj);
+#endif
+
/*!
* \brief Data structure common to all types of nodes.
@@ -178,6 +185,9 @@ typedef struct _IXML_Node
Nodeptr nextSibling;
Nodeptr firstAttr;
Docptr ownerDocument;
+#ifdef SCRIPTSUPPORT
+ void* ctag; // custom tag
+#endif
} IXML_Node;
@@ -625,9 +635,29 @@ EXPORT_SPEC BOOL ixmlNode_hasAttributes(
* \brief Frees a \b Node and all \b Nodes in its subtree.
*/
EXPORT_SPEC void ixmlNode_free(
- /*! [in] The \b Node tree to free. */
+ /*! [in] The \b Node tree to free. Before it is freed, the handler
+ * set by \b ixmlSetBeforeFree will be called, the order will be
+ * top-down.
+ */
IXML_Node *nodeptr);
+#ifdef SCRIPTSUPPORT
+/*!
+ * \brief Sets the custom tag for the node.
+ */
+EXPORT_SPEC void ixmlNode_setCTag(
+ /*! [in] The \b Node to which to attach the tag. */
+ IXML_Node *nodeptr,
+ /*! [in] The \b tag to attach. */
+ void *ctag);
+
+/*!
+ * \brief Gets the custom tag for the node.
+ */
+EXPORT_SPEC void* ixmlNode_getCTag(
+ /*! [in] The \b Node from which to get the tag. */
+ IXML_Node *nodeptr);
+#endif
/* @} Interface Node */
@@ -1737,6 +1767,18 @@ EXPORT_SPEC void ixmlRelaxParser(
*/
char errorChar);
+#ifdef SCRIPTSUPPORT
+/*!
+ * \brief Sets the handler to call before a node is freed.
+ */
+EXPORT_SPEC void ixmlSetBeforeFree(
+ /*! [in] If \b hndlr is set to a function, it will be called before any
+ * node is freed, with the node as its parameter. This allows scripting
+ * languages to do their garbage collection, without maintaining their
+ * own tree structure.
+ */
+ IXML_BeforeFreeNode_t hndlr);
+#endif
/*! |
|
From: Marcelo R. J. <mro...@us...> - 2012-06-21 01:11:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 9f17244f95a45a6ebabc18c1aecc041e518f67c8 (commit)
via 40d5a1dea3a83fcc3ad4e9d3617ff71ebe3f83cd (commit)
via fa9aef8eb662ce74fc340073b498d1657646327a (commit)
via f67de332a18010e7f54f0d276c0ef7ee304327e1 (commit)
from 4d88a2a4ea34eb4b30676619d35856a0b25c8268 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=9f17244f95a45a6ebabc18c1aecc041e518f67c8
commit 9f17244f95a45a6ebabc18c1aecc041e518f67c8
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Jun 20 21:33:16 2012 -0300
Remove an unused variable
(cherry picked from commit 40e90e89fc406f0ed665d3753b5fb3b7071787d3)
diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c
index e3b6d2a..13db741 100644
--- a/upnp/src/gena/gena_device.c
+++ b/upnp/src/gena/gena_device.c
@@ -257,14 +257,11 @@ static int genaNotify(
{
size_t i;
membuffer mid_msg;
- membuffer endmsg;
uri_type *url;
http_parser_t response;
int return_code = -1;
membuffer_init(&mid_msg);
- /* make 'end' msg (the part that won't vary with the destination) */
- endmsg.size_inc = 30;
if (http_MakeMessage(&mid_msg, 1, 1,
"s" "ssc" "sdcc",
headers,
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=40d5a1dea3a83fcc3ad4e9d3617ff71ebe3f83cd
commit 40d5a1dea3a83fcc3ad4e9d3617ff71ebe3f83cd
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Jun 20 21:17:25 2012 -0300
Remove an unused variable ifndef INET_IPV6
(cherry picked from commit 40ddff10964905b3d63b9e1d7ed6d045c2db6dab)
diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index af310ca..eae6eca 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -502,10 +502,14 @@ static int get_miniserver_sockets(
MiniServerSockArray *out,
/*! [in] port on which the server is listening for incoming IPv4
* connections. */
- uint16_t listen_port4,
+ uint16_t listen_port4
+#ifdef UPNP_ENABLE_IPV6
+ ,
/*! [in] port on which the server is listening for incoming IPv6
* connections. */
- uint16_t listen_port6)
+ uint16_t listen_port6
+#endif
+ )
{
char errorBuffer[ERROR_BUFFER_LEN];
struct sockaddr_storage __ss_v4;
@@ -760,10 +764,6 @@ static int get_miniserver_sockets(
out->miniServerSock4 = listenfd4;
#ifdef UPNP_ENABLE_IPV6
out->miniServerSock6 = listenfd6;
-#else
- /* Silence compiler warning message:
- * warning: unused parameter âlisten_port6â */
- listen_port6 = 0u;
#endif
return UPNP_E_SUCCESS;
}
@@ -868,7 +868,11 @@ int StartMiniServer(
#ifdef INTERNAL_WEB_SERVER
/* V4 and V6 http listeners. */
ret_code = get_miniserver_sockets(
- miniSocket, *listen_port4, *listen_port6);
+ miniSocket, *listen_port4
+#ifdef UPNP_ENABLE_IPV6
+ , *listen_port6
+#endif
+ );
if (ret_code != UPNP_E_SUCCESS) {
free(miniSocket);
return ret_code;
diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
index d00efb5..c3dbc1f 100644
--- a/upnp/src/ssdp/ssdp_device.c
+++ b/upnp/src/ssdp/ssdp_device.c
@@ -186,7 +186,9 @@ static int NewRequestHandler(
unsigned long replyAddr = inet_addr(gIF_IPV4);
/* a/c to UPNP Spec */
int ttl = 4;
+#ifdef INET_IPV6
int hops = 1;
+#endif
char buf_ntop[INET6_ADDRSTRLEN];
int ret = UPNP_E_SUCCESS;
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=fa9aef8eb662ce74fc340073b498d1657646327a
commit fa9aef8eb662ce74fc340073b498d1657646327a
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Jun 20 21:15:01 2012 -0300
Remove a pointless way to test a return value
(cherry picked from commit 692813d03e0d89b239639499c5b700ddf6d9458d)
diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c
index eb2294e..99e9cfb 100644
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -493,8 +493,6 @@ int web_server_init()
void web_server_destroy(void)
{
- int ret;
-
if (bWebServerState == WEB_SERVER_ENABLED) {
membuffer_destroy(&gDocumentRootDir);
alias_release(&gAliasDoc);
@@ -503,8 +501,7 @@ void web_server_destroy(void)
memset(&gAliasDoc, 0, sizeof(struct xml_alias_t));
ithread_mutex_unlock(&gWebMutex);
- ret = ithread_mutex_destroy(&gWebMutex);
- assert(ret == 0);
+ ithread_mutex_destroy(&gWebMutex);
bWebServerState = WEB_SERVER_DISABLED;
}
}
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=f67de332a18010e7f54f0d276c0ef7ee304327e1
commit f67de332a18010e7f54f0d276c0ef7ee304327e1
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Tue Jun 19 19:13:46 2012 +0900
Fix memory leak and access violation in UpnpSendAction(Ex)Async.
Free buffers after malloc or ixmlPrintNode failure.
Free Param->Header before destructing Param.
(cherry picked from commit d9e90499b7ead7e9fae30b9c248b343ec6d9b273)
diff --git a/ChangeLog b/ChangeLog
index 34c5c6f..6b783c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,13 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Fix memory leak and access violation in UpnpSendAction(Ex)Async.
+
+ Free buffers after malloc or ixmlPrintNode failure.
+ Free Param->Header before destructing Param.
+
2012-05-25 Anoop Mohan <anoop.anoop(at)gmail.com>
This patch fixes a bug in non blocking connect call where the sock
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 2a24b52..375adc8 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -2769,6 +2769,7 @@ int UpnpSendActionAsync(
malloc( sizeof( struct UpnpNonblockParam ) );
if( Param == NULL ) {
+ ixmlFreeDOMString( tmpStr );
return UPNP_E_OUTOF_MEMORY;
}
memset( Param, 0, sizeof( struct UpnpNonblockParam ) );
@@ -2862,6 +2863,7 @@ int UpnpSendActionExAsync(
tmpStr = ixmlPrintNode( ( IXML_Node * ) Act );
if( tmpStr == NULL ) {
+ ixmlFreeDOMString( headerStr );
return UPNP_E_INVALID_ACTION;
}
@@ -2869,6 +2871,8 @@ int UpnpSendActionExAsync(
( struct UpnpNonblockParam * )
malloc( sizeof( struct UpnpNonblockParam ) );
if( Param == NULL ) {
+ ixmlFreeDOMString( tmpStr );
+ ixmlFreeDOMString( headerStr );
return UPNP_E_OUTOF_MEMORY;
}
memset( Param, 0, sizeof( struct UpnpNonblockParam ) );
@@ -2892,10 +2896,10 @@ int UpnpSendActionExAsync(
retVal = ixmlParseBufferEx( tmpStr, &( Param->Act ) );
if( retVal != IXML_SUCCESS ) {
+ ixmlDocument_free( Param->Header );
free( Param );
ixmlFreeDOMString( tmpStr );
ixmlFreeDOMString( headerStr );
- ixmlDocument_free( Param->Header );
if( retVal == IXML_INSUFFICIENT_MEMORY ) {
return UPNP_E_OUTOF_MEMORY;
} else {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
upnp/src/api/upnpapi.c | 6 +++++-
upnp/src/gena/gena_device.c | 3 ---
upnp/src/genlib/miniserver/miniserver.c | 18 +++++++++++-------
upnp/src/genlib/net/http/webserver.c | 5 +----
upnp/src/ssdp/ssdp_device.c | 2 ++
6 files changed, 26 insertions(+), 15 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-06-21 01:11:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 40e90e89fc406f0ed665d3753b5fb3b7071787d3 (commit)
via 40ddff10964905b3d63b9e1d7ed6d045c2db6dab (commit)
via 692813d03e0d89b239639499c5b700ddf6d9458d (commit)
from d9e90499b7ead7e9fae30b9c248b343ec6d9b273 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=40e90e89fc406f0ed665d3753b5fb3b7071787d3
commit 40e90e89fc406f0ed665d3753b5fb3b7071787d3
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Jun 20 21:33:16 2012 -0300
Remove an unused variable
diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c
index 5afadf9..39edc0b 100644
--- a/upnp/src/gena/gena_device.c
+++ b/upnp/src/gena/gena_device.c
@@ -257,14 +257,11 @@ static int genaNotify(
{
size_t i;
membuffer mid_msg;
- membuffer endmsg;
uri_type *url;
http_parser_t response;
int return_code = -1;
membuffer_init(&mid_msg);
- /* make 'end' msg (the part that won't vary with the destination) */
- endmsg.size_inc = 30;
if (http_MakeMessage(&mid_msg, 1, 1,
"s" "ssc" "sdcc",
headers,
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=40ddff10964905b3d63b9e1d7ed6d045c2db6dab
commit 40ddff10964905b3d63b9e1d7ed6d045c2db6dab
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Jun 20 21:17:25 2012 -0300
Remove an unused variable ifndef INET_IPV6
diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index af310ca..eae6eca 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -502,10 +502,14 @@ static int get_miniserver_sockets(
MiniServerSockArray *out,
/*! [in] port on which the server is listening for incoming IPv4
* connections. */
- uint16_t listen_port4,
+ uint16_t listen_port4
+#ifdef UPNP_ENABLE_IPV6
+ ,
/*! [in] port on which the server is listening for incoming IPv6
* connections. */
- uint16_t listen_port6)
+ uint16_t listen_port6
+#endif
+ )
{
char errorBuffer[ERROR_BUFFER_LEN];
struct sockaddr_storage __ss_v4;
@@ -760,10 +764,6 @@ static int get_miniserver_sockets(
out->miniServerSock4 = listenfd4;
#ifdef UPNP_ENABLE_IPV6
out->miniServerSock6 = listenfd6;
-#else
- /* Silence compiler warning message:
- * warning: unused parameter âlisten_port6â */
- listen_port6 = 0u;
#endif
return UPNP_E_SUCCESS;
}
@@ -868,7 +868,11 @@ int StartMiniServer(
#ifdef INTERNAL_WEB_SERVER
/* V4 and V6 http listeners. */
ret_code = get_miniserver_sockets(
- miniSocket, *listen_port4, *listen_port6);
+ miniSocket, *listen_port4
+#ifdef UPNP_ENABLE_IPV6
+ , *listen_port6
+#endif
+ );
if (ret_code != UPNP_E_SUCCESS) {
free(miniSocket);
return ret_code;
diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
index d00efb5..c3dbc1f 100644
--- a/upnp/src/ssdp/ssdp_device.c
+++ b/upnp/src/ssdp/ssdp_device.c
@@ -186,7 +186,9 @@ static int NewRequestHandler(
unsigned long replyAddr = inet_addr(gIF_IPV4);
/* a/c to UPNP Spec */
int ttl = 4;
+#ifdef INET_IPV6
int hops = 1;
+#endif
char buf_ntop[INET6_ADDRSTRLEN];
int ret = UPNP_E_SUCCESS;
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=692813d03e0d89b239639499c5b700ddf6d9458d
commit 692813d03e0d89b239639499c5b700ddf6d9458d
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Jun 20 21:15:01 2012 -0300
Remove a pointless way to test a return value
diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c
index b2c3eb8..0b2c852 100644
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -491,8 +491,6 @@ int web_server_init()
void web_server_destroy(void)
{
- int ret;
-
if (bWebServerState == WEB_SERVER_ENABLED) {
membuffer_destroy(&gDocumentRootDir);
alias_release(&gAliasDoc);
@@ -501,8 +499,7 @@ void web_server_destroy(void)
memset(&gAliasDoc, 0, sizeof(struct xml_alias_t));
ithread_mutex_unlock(&gWebMutex);
- ret = ithread_mutex_destroy(&gWebMutex);
- assert(ret == 0);
+ ithread_mutex_destroy(&gWebMutex);
bWebServerState = WEB_SERVER_DISABLED;
}
}
-----------------------------------------------------------------------
Summary of changes:
upnp/src/gena/gena_device.c | 3 ---
upnp/src/genlib/miniserver/miniserver.c | 18 +++++++++++-------
upnp/src/genlib/net/http/webserver.c | 5 +----
upnp/src/ssdp/ssdp_device.c | 2 ++
4 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-06-19 10:16:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via d9e90499b7ead7e9fae30b9c248b343ec6d9b273 (commit)
from 6db2271ac36adb6f5bc210240ed41ec8aad2c57f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=d9e90499b7ead7e9fae30b9c248b343ec6d9b273
commit d9e90499b7ead7e9fae30b9c248b343ec6d9b273
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Tue Jun 19 19:13:46 2012 +0900
Fix memory leak and access violation in UpnpSendAction(Ex)Async.
Free buffers after malloc or ixmlPrintNode failure.
Free Param->Header before destructing Param.
diff --git a/ChangeLog b/ChangeLog
index aa33651..904d009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
Version 1.6.18
*******************************************************************************
+2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Fix memory leak and access violation in UpnpSendAction(Ex)Async.
+
+ Free buffers after malloc or ixmlPrintNode failure.
+ Free Param->Header before destructing Param.
+
2012-05-25 Anoop Mohan <anoop.anoop(at)gmail.com>
This patch fixes a bug in non blocking connect call where the sock
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index e5196bf..dcc62bb 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -2736,6 +2736,7 @@ int UpnpSendActionAsync(
malloc( sizeof( struct UpnpNonblockParam ) );
if( Param == NULL ) {
+ ixmlFreeDOMString( tmpStr );
return UPNP_E_OUTOF_MEMORY;
}
memset( Param, 0, sizeof( struct UpnpNonblockParam ) );
@@ -2829,6 +2830,7 @@ int UpnpSendActionExAsync(
tmpStr = ixmlPrintNode( ( IXML_Node * ) Act );
if( tmpStr == NULL ) {
+ ixmlFreeDOMString( headerStr );
return UPNP_E_INVALID_ACTION;
}
@@ -2836,6 +2838,8 @@ int UpnpSendActionExAsync(
( struct UpnpNonblockParam * )
malloc( sizeof( struct UpnpNonblockParam ) );
if( Param == NULL ) {
+ ixmlFreeDOMString( tmpStr );
+ ixmlFreeDOMString( headerStr );
return UPNP_E_OUTOF_MEMORY;
}
memset( Param, 0, sizeof( struct UpnpNonblockParam ) );
@@ -2859,10 +2863,10 @@ int UpnpSendActionExAsync(
retVal = ixmlParseBufferEx( tmpStr, &( Param->Act ) );
if( retVal != IXML_SUCCESS ) {
+ ixmlDocument_free( Param->Header );
free( Param );
ixmlFreeDOMString( tmpStr );
ixmlFreeDOMString( headerStr );
- ixmlDocument_free( Param->Header );
if( retVal == IXML_INSUFFICIENT_MEMORY ) {
return UPNP_E_OUTOF_MEMORY;
} else {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
upnp/src/api/upnpapi.c | 6 +++++-
2 files changed, 12 insertions(+), 1 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-05-25 16:41:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 4d88a2a4ea34eb4b30676619d35856a0b25c8268 (commit)
from dc29948893e001a0a3d43b0cd4e5a70d1a555c40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=4d88a2a4ea34eb4b30676619d35856a0b25c8268
commit 4d88a2a4ea34eb4b30676619d35856a0b25c8268
Author: Anoop Mohan <ano...@gm...>
Date: Fri May 25 11:59:21 2012 -0300
Fixes a bug in non blocking connect call
This patch fixes a bug in non blocking connect call where the sock
option length for SO_ERROR was passed as 0 instead of sizeof(int).
(cherry picked from commit 6db2271ac36adb6f5bc210240ed41ec8aad2c57f)
diff --git a/ChangeLog b/ChangeLog
index 5320332..34c5c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,11 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-05-25 Anoop Mohan <anoop.anoop(at)gmail.com>
+
+ This patch fixes a bug in non blocking connect call where the sock
+ option length for SO_ERROR was passed as 0 instead of sizeof(int).
+
2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Disable SetGenaCallback call if device is disabled.
diff --git a/THANKS b/THANKS
index 4bacd2b..e2a6f8f 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ exempt of errors.
- Alex (afaucher)
- Andre Sodermans (wienerschnitzel)
+- Anoop Mohan (an00p)
- Anthony Viallard (homer242)
- Apostolos Syropoulos
- Arno Willig
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 044c18f..b872ede 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -126,7 +126,7 @@ static int Check_Connect_And_Wait_Connection(
#ifndef WIN32
} else {
int valopt = 0;
- socklen_t len = 0;
+ socklen_t len = sizeof(valopt);
if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *) &valopt, &len) < 0) {
/* failed to read delayed error */
return -1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
THANKS | 1 +
upnp/src/genlib/net/http/httpreadwrite.c | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-05-25 16:41:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 6db2271ac36adb6f5bc210240ed41ec8aad2c57f (commit)
from 4d21d45da730550707db5cdd2bca399f6217237f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=6db2271ac36adb6f5bc210240ed41ec8aad2c57f
commit 6db2271ac36adb6f5bc210240ed41ec8aad2c57f
Author: Anoop Mohan <ano...@gm...>
Date: Fri May 25 11:59:21 2012 -0300
Fixes a bug in non blocking connect call
This patch fixes a bug in non blocking connect call where the sock
option length for SO_ERROR was passed as 0 instead of sizeof(int).
diff --git a/ChangeLog b/ChangeLog
index 975ed26..aa33651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
Version 1.6.18
*******************************************************************************
+2012-05-25 Anoop Mohan <anoop.anoop(at)gmail.com>
+
+ This patch fixes a bug in non blocking connect call where the sock
+ option length for SO_ERROR was passed as 0 instead of sizeof(int).
+
2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Disable SetGenaCallback call if device is disabled.
diff --git a/THANKS b/THANKS
index 4bacd2b..e2a6f8f 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ exempt of errors.
- Alex (afaucher)
- Andre Sodermans (wienerschnitzel)
+- Anoop Mohan (an00p)
- Anthony Viallard (homer242)
- Apostolos Syropoulos
- Arno Willig
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 0e97ecc..4ea6102 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -126,7 +126,7 @@ static int Check_Connect_And_Wait_Connection(
#ifndef WIN32
} else {
int valopt = 0;
- socklen_t len = 0;
+ socklen_t len = sizeof(valopt);
if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *) &valopt, &len) < 0) {
/* failed to read delayed error */
return -1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
THANKS | 1 +
upnp/src/genlib/net/http/httpreadwrite.c | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-24 17:27:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via dc29948893e001a0a3d43b0cd4e5a70d1a555c40 (commit)
via 8eaaf0f17109e57c89145daf20d228967f4d03fd (commit)
via c27a089d6fccf5c218c15b453b2aaebffc4aa25b (commit)
via 76e8812acc164d0f054c06221cc4c1bb78621bab (commit)
from 3b2cfdc45de4f65b40d3360994be0ccbea8fbb7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=dc29948893e001a0a3d43b0cd4e5a70d1a555c40
commit dc29948893e001a0a3d43b0cd4e5a70d1a555c40
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Wed Apr 25 00:27:58 2012 +0900
Disable SetGenaCallback call if device is disabled.
If device is disabled, SetGenaCallback definition is disabled,
but its call remains. A link error will occur in Win32.
(cherry picked from commit 4d21d45da730550707db5cdd2bca399f6217237f)
diff --git a/ChangeLog b/ChangeLog
index 143b117..5320332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,13 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Disable SetGenaCallback call if device is disabled.
+
+ If device is disabled, SetGenaCallback definition is disabled,
+ but its call remains. A link error will occur in Win32.
+
2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Fix condition for allocation failure in get_content_type().
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index fb3b8eb..2a24b52 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -374,9 +374,11 @@ static int UpnpInitPreamble(void)
#endif
#endif /* INCLUDE_DEVICE_APIS */
+#ifdef INTERNAL_WEB_SERVER
#if EXCLUDE_GENA == 0
SetGenaCallback(genaCallback);
#endif
+#endif /* INTERNAL_WEB_SERVER */
/* Initialize the SDK timer thread. */
retVal = TimerThreadInit( &gTimerThread, &gSendThreadPool );
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=8eaaf0f17109e57c89145daf20d228967f4d03fd
commit 8eaaf0f17109e57c89145daf20d228967f4d03fd
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Sat Apr 21 21:48:55 2012 +0900
Fix condition for allocation failure in get_content_type().
At the end of get_content_type() in webserver.c, it should check
return value of ixmlCloneDOMString().
(Forward ported from commit 708ea308060e3a68b9596a714afa94c56e6bbde4)
diff --git a/ChangeLog b/ChangeLog
index 3bf2423..143b117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -334,6 +334,13 @@ Version 1.6.18
2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+ Fix condition for allocation failure in get_content_type().
+
+ At the end of get_content_type() in webserver.c, it should check
+ return value of ixmlCloneDOMString().
+
+2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
Fix problems detected as dead assignment warning by clang scan-build.
Wrong assignment by shutdown result hides the real error code
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=c27a089d6fccf5c218c15b453b2aaebffc4aa25b
commit c27a089d6fccf5c218c15b453b2aaebffc4aa25b
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Sat Apr 21 11:38:20 2012 +0900
Fix problems detected as dead assignment warning by clang scan-build.
Wrong assignment by shutdown result hides the real error code
of NewRequestHandler() in ssdp_device.c.
Fix return code description of NewRequestHandler().
Handle return code from ithread_create in sample applications.
Remove unused assignments.
(forward ported from commit 39dfad2cba5f577a24659deb8afc81d9016b2080)
diff --git a/ChangeLog b/ChangeLog
index 4b2b6d1..3bf2423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,16 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Fix problems detected as dead assignment warning by clang scan-build.
+
+ Wrong assignment by shutdown result hides the real error code
+ of NewRequestHandler() in ssdp_device.c.
+ Fix return code description of NewRequestHandler().
+ Handle return code from ithread_create in sample applications.
+ Remove unused assignments.
+
2012-04-20 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid dereference of null pointer in ixmlNode_setNodeProperties.
diff --git a/upnp/sample/linux/tv_combo_main.c b/upnp/sample/linux/tv_combo_main.c
index 92788e4..cb9909e 100644
--- a/upnp/sample/linux/tv_combo_main.c
+++ b/upnp/sample/linux/tv_combo_main.c
@@ -55,6 +55,9 @@ int main(int argc, char *argv[])
}
/* start a command loop thread */
code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
+ if (code != 0) {
+ return UPNP_E_INTERNAL_ERROR;
+ }
#ifdef WIN32
ithread_join(cmdloop_thread, NULL);
#else
diff --git a/upnp/sample/linux/tv_ctrlpt_main.c b/upnp/sample/linux/tv_ctrlpt_main.c
index 2d40b81..79641fc 100644
--- a/upnp/sample/linux/tv_ctrlpt_main.c
+++ b/upnp/sample/linux/tv_ctrlpt_main.c
@@ -54,6 +54,9 @@ int main(int argc, char **argv)
}
/* start a command loop thread */
code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
+ if (code != 0) {
+ return UPNP_E_INTERNAL_ERROR;
+ }
#ifdef WIN32
ithread_join(cmdloop_thread, NULL);
#else
diff --git a/upnp/sample/linux/tv_device_main.c b/upnp/sample/linux/tv_device_main.c
index 57e7035..9d59d5e 100644
--- a/upnp/sample/linux/tv_device_main.c
+++ b/upnp/sample/linux/tv_device_main.c
@@ -53,6 +53,9 @@ int main(int argc, char *argv[])
/* start a command loop thread */
code = ithread_create(&cmdloop_thread, NULL, TvDeviceCommandLoop, NULL);
+ if (code != 0) {
+ return UPNP_E_INTERNAL_ERROR;
+ }
#ifdef WIN32
ithread_join(cmdloop_thread, NULL);
#else
diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c
index cd99334..e3b6d2a 100644
--- a/upnp/src/gena/gena_device.c
+++ b/upnp/src/gena/gena_device.c
@@ -102,12 +102,11 @@ static int GeneratePropertySet(
char *buffer;
int counter = 0;
size_t size = 0;
- int temp_counter = 0;
/*size += strlen(XML_VERSION);*/
size += strlen(XML_PROPERTYSET_HEADER);
size += strlen("</e:propertyset>\n\n");
- for (temp_counter = 0, counter = 0; counter < count; counter++) {
+ for (counter = 0; counter < count; counter++) {
size += strlen( "<e:property>\n</e:property>\n" );
size += 2 * strlen(names[counter]) +
strlen(values[counter]) +
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 983a29c..044c18f 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -1000,7 +1000,6 @@ static int ReadResponseLineAndHeaders(
return num_read;
}
}
- done = 0;
status = parser_parse_headers(parser);
if ((status == (parse_status_t)PARSE_OK) &&
(parser->position == (parser_pos_t)POS_ENTITY))
diff --git a/upnp/src/genlib/service_table/service_table.c b/upnp/src/genlib/service_table/service_table.c
index 3f09976..5b173f3 100644
--- a/upnp/src/genlib/service_table/service_table.c
+++ b/upnp/src/genlib/service_table/service_table.c
@@ -926,7 +926,6 @@ removeServiceTable( IXML_Node * node,
long unsigned int i = 0lu;
if( getSubElement( "root", node, &root ) ) {
- current_service = in->serviceList;
start_search = in->serviceList;
deviceList =
ixmlElement_getElementsByTagName( ( IXML_Element * ) root,
diff --git a/upnp/src/ssdp/ssdp_ctrlpt.c b/upnp/src/ssdp/ssdp_ctrlpt.c
index 9e51700..c82a320 100644
--- a/upnp/src/ssdp/ssdp_ctrlpt.c
+++ b/upnp/src/ssdp/ssdp_ctrlpt.c
@@ -242,7 +242,6 @@ void ssdp_handle_ctrlpt_msg(http_message_t *hmsg, struct sockaddr_storage *dest_
/*hdr_value.buf[ hdr_value.length ] = '\0'; */
while (node != NULL) {
searchArg = node->item;
- matched = 0;
/* check for match of ST header and search target */
switch (searchArg->requestType) {
case SSDP_ALL:
diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
index a439005..d00efb5 100644
--- a/upnp/src/ssdp/ssdp_device.c
+++ b/upnp/src/ssdp/ssdp_device.c
@@ -169,7 +169,7 @@ void ssdp_handle_device_request(http_message_t *hmsg, struct sockaddr_storage *d
* \brief Works as a request handler which passes the HTTP request string
* to multicast channel.
*
- * \return 1 if successful else appropriate error.
+ * \return UPNP_E_SUCCESS if successful else appropriate error.
*/
static int NewRequestHandler(
/*! [in] Ip address, to send the reply. */
@@ -246,8 +246,7 @@ static int NewRequestHandler(
}
end_NewRequestHandler:
- ret = shutdown(ReplySock, SD_BOTH);
- if (ret == -1) {
+ if (shutdown(ReplySock, SD_BOTH) == -1) {
strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__,
"Error in shutdown: %s\n", errorBuffer);
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index 01c873f..231c2c5 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -864,8 +864,8 @@ static int create_ssdp_sock_v4(
/* This is probably not a critical error, so let's continue. */
}
/* result is not checked becuase it will fail in WinMe and Win9x. */
- ret = setsockopt(*ssdpSock, IPPROTO_IP,
- IP_MULTICAST_TTL, &ttl, sizeof(ttl));
+ setsockopt(*ssdpSock, IPPROTO_IP,
+ IP_MULTICAST_TTL, &ttl, sizeof(ttl));
onOff = 1;
ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_BROADCAST,
(char *)&onOff, sizeof(onOff));
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=76e8812acc164d0f054c06221cc4c1bb78621bab
commit 76e8812acc164d0f054c06221cc4c1bb78621bab
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Fri Apr 20 03:42:02 2012 +0900
Avoid dereference of null pointer in ixmlNode_setNodeProperties.
The problem can occur if one of the arguments is NULL.
Test argument and fix assertion.
(cherry picked from commit 3d7c1dbd5901300d0ad7db6653e8008aa54ab89c)
diff --git a/ChangeLog b/ChangeLog
index 8b6f498..4b2b6d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,13 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-04-20 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Avoid dereference of null pointer in ixmlNode_setNodeProperties.
+
+ The problem can occur if one of the arguments is NULL.
+ Test argument and fix assertion.
+
2012-04-17 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Create intermediate directory per project on vc9.
diff --git a/ixml/src/node.c b/ixml/src/node.c
index c20b841..1d1ec16 100644
--- a/ixml/src/node.c
+++ b/ixml/src/node.c
@@ -1339,7 +1339,10 @@ int ixmlNode_setNodeProperties(
{
int rc;
- assert(destNode != NULL || src != NULL);
+ assert(destNode != NULL && src != NULL);
+ if(destNode == NULL || src == NULL) {
+ return IXML_INVALID_PARAMETER;
+ }
rc = ixmlNode_setNodeValue(destNode, src->nodeValue);
if(rc != IXML_SUCCESS) {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 31 +++++++++++++++++++++++++
ixml/src/node.c | 5 +++-
upnp/sample/linux/tv_combo_main.c | 3 ++
upnp/sample/linux/tv_ctrlpt_main.c | 3 ++
upnp/sample/linux/tv_device_main.c | 3 ++
upnp/src/api/upnpapi.c | 2 +
upnp/src/gena/gena_device.c | 3 +-
upnp/src/genlib/net/http/httpreadwrite.c | 1 -
upnp/src/genlib/service_table/service_table.c | 1 -
upnp/src/ssdp/ssdp_ctrlpt.c | 1 -
upnp/src/ssdp/ssdp_device.c | 5 +--
upnp/src/ssdp/ssdp_server.c | 4 +-
12 files changed, 51 insertions(+), 11 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-04-24 15:32:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 4d21d45da730550707db5cdd2bca399f6217237f (commit)
from 708ea308060e3a68b9596a714afa94c56e6bbde4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=4d21d45da730550707db5cdd2bca399f6217237f
commit 4d21d45da730550707db5cdd2bca399f6217237f
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Wed Apr 25 00:27:58 2012 +0900
Disable SetGenaCallback call if device is disabled.
If device is disabled, SetGenaCallback definition is disabled,
but its call remains. A link error will occur in Win32.
diff --git a/ChangeLog b/ChangeLog
index 167fe6d..975ed26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
Version 1.6.18
*******************************************************************************
+2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Disable SetGenaCallback call if device is disabled.
+
+ If device is disabled, SetGenaCallback definition is disabled,
+ but its call remains. A link error will occur in Win32.
+
2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Fix condition for allocation failure in get_content_type().
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 136d9e9..e5196bf 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -364,9 +364,11 @@ static int UpnpInitPreamble(void)
#endif
#endif /* INCLUDE_DEVICE_APIS */
+#ifdef INTERNAL_WEB_SERVER
#if EXCLUDE_GENA == 0
SetGenaCallback(genaCallback);
#endif
+#endif /* INTERNAL_WEB_SERVER */
/* Initialize the SDK timer thread. */
retVal = TimerThreadInit( &gTimerThread, &gSendThreadPool );
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
upnp/src/api/upnpapi.c | 2 ++
2 files changed, 9 insertions(+), 0 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-04-21 12:50:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 708ea308060e3a68b9596a714afa94c56e6bbde4 (commit)
from 39dfad2cba5f577a24659deb8afc81d9016b2080 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=708ea308060e3a68b9596a714afa94c56e6bbde4
commit 708ea308060e3a68b9596a714afa94c56e6bbde4
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Sat Apr 21 21:48:55 2012 +0900
Fix condition for allocation failure in get_content_type().
At the end of get_content_type() in webserver.c, it should check
return value of ixmlCloneDOMString().
diff --git a/ChangeLog b/ChangeLog
index 00d9bb1..167fe6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ Version 1.6.18
2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+ Fix condition for allocation failure in get_content_type().
+
+ At the end of get_content_type() in webserver.c, it should check
+ return value of ixmlCloneDOMString().
+
+2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
Fix problems detected as dead assignment warning by clang scan-build.
Wrong assignment by shutdown result hides the real error code
diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c
index 50527fc..b2c3eb8 100644
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -344,7 +344,7 @@ static UPNP_INLINE int get_content_type(
}
(*content_type) = ixmlCloneDOMString(temp);
free(temp);
- if (!content_type)
+ if (!(*content_type))
return UPNP_E_OUTOF_MEMORY;
return 0;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
upnp/src/genlib/net/http/webserver.c | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-04-21 02:41:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 39dfad2cba5f577a24659deb8afc81d9016b2080 (commit)
from 3d7c1dbd5901300d0ad7db6653e8008aa54ab89c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=39dfad2cba5f577a24659deb8afc81d9016b2080
commit 39dfad2cba5f577a24659deb8afc81d9016b2080
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Sat Apr 21 11:38:20 2012 +0900
Fix problems detected as dead assignment warning by clang scan-build.
Wrong assignment by shutdown result hides the real error code
of NewRequestHandler() in ssdp_device.c.
Fix return code description of NewRequestHandler().
Handle return code from ithread_create in sample applications.
Remove unused assignments.
diff --git a/ChangeLog b/ChangeLog
index afd5c9f..00d9bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
Version 1.6.18
*******************************************************************************
+2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Fix problems detected as dead assignment warning by clang scan-build.
+
+ Wrong assignment by shutdown result hides the real error code
+ of NewRequestHandler() in ssdp_device.c.
+ Fix return code description of NewRequestHandler().
+ Handle return code from ithread_create in sample applications.
+ Remove unused assignments.
+
2012-04-20 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid dereference of null pointer in ixmlNode_setNodeProperties.
diff --git a/upnp/sample/linux/tv_combo_main.c b/upnp/sample/linux/tv_combo_main.c
index 92788e4..cb9909e 100644
--- a/upnp/sample/linux/tv_combo_main.c
+++ b/upnp/sample/linux/tv_combo_main.c
@@ -55,6 +55,9 @@ int main(int argc, char *argv[])
}
/* start a command loop thread */
code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
+ if (code != 0) {
+ return UPNP_E_INTERNAL_ERROR;
+ }
#ifdef WIN32
ithread_join(cmdloop_thread, NULL);
#else
diff --git a/upnp/sample/linux/tv_ctrlpt_main.c b/upnp/sample/linux/tv_ctrlpt_main.c
index 2d40b81..79641fc 100644
--- a/upnp/sample/linux/tv_ctrlpt_main.c
+++ b/upnp/sample/linux/tv_ctrlpt_main.c
@@ -54,6 +54,9 @@ int main(int argc, char **argv)
}
/* start a command loop thread */
code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
+ if (code != 0) {
+ return UPNP_E_INTERNAL_ERROR;
+ }
#ifdef WIN32
ithread_join(cmdloop_thread, NULL);
#else
diff --git a/upnp/sample/linux/tv_device_main.c b/upnp/sample/linux/tv_device_main.c
index 57e7035..9d59d5e 100644
--- a/upnp/sample/linux/tv_device_main.c
+++ b/upnp/sample/linux/tv_device_main.c
@@ -53,6 +53,9 @@ int main(int argc, char *argv[])
/* start a command loop thread */
code = ithread_create(&cmdloop_thread, NULL, TvDeviceCommandLoop, NULL);
+ if (code != 0) {
+ return UPNP_E_INTERNAL_ERROR;
+ }
#ifdef WIN32
ithread_join(cmdloop_thread, NULL);
#else
diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c
index 877d887..5afadf9 100644
--- a/upnp/src/gena/gena_device.c
+++ b/upnp/src/gena/gena_device.c
@@ -102,12 +102,11 @@ static int GeneratePropertySet(
char *buffer;
int counter = 0;
size_t size = 0;
- int temp_counter = 0;
/*size += strlen(XML_VERSION);*/
size += strlen(XML_PROPERTYSET_HEADER);
size += strlen("</e:propertyset>\n\n");
- for (temp_counter = 0, counter = 0; counter < count; counter++) {
+ for (counter = 0; counter < count; counter++) {
size += strlen( "<e:property>\n</e:property>\n" );
size += 2 * strlen(names[counter]) +
strlen(values[counter]) +
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index b1955a7..0e97ecc 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -1206,7 +1206,6 @@ static int ReadResponseLineAndHeaders(
return num_read;
}
}
- done = 0;
status = parser_parse_headers(parser);
if ((status == (parse_status_t)PARSE_OK) &&
(parser->position == (parser_pos_t)POS_ENTITY))
diff --git a/upnp/src/genlib/service_table/service_table.c b/upnp/src/genlib/service_table/service_table.c
index 3f09976..5b173f3 100644
--- a/upnp/src/genlib/service_table/service_table.c
+++ b/upnp/src/genlib/service_table/service_table.c
@@ -926,7 +926,6 @@ removeServiceTable( IXML_Node * node,
long unsigned int i = 0lu;
if( getSubElement( "root", node, &root ) ) {
- current_service = in->serviceList;
start_search = in->serviceList;
deviceList =
ixmlElement_getElementsByTagName( ( IXML_Element * ) root,
diff --git a/upnp/src/soap/soap_device.c b/upnp/src/soap/soap_device.c
index 7d41454..3e8eaaa 100644
--- a/upnp/src/soap/soap_device.c
+++ b/upnp/src/soap/soap_device.c
@@ -723,8 +723,6 @@ static UPNP_INLINE void handle_query_variable(
"Return from callback for var request\n");
/* validate, and handle result */
if (variable.CurrentVal == NULL) {
- err_code = SOAP_ACTION_FAILED;
- err_str = Soap_Action_Failed;
send_error_response(info, SOAP_INVALID_VAR, Soap_Invalid_Var,
request);
return;
diff --git a/upnp/src/ssdp/ssdp_ctrlpt.c b/upnp/src/ssdp/ssdp_ctrlpt.c
index 2fb3b68..136a3ca 100644
--- a/upnp/src/ssdp/ssdp_ctrlpt.c
+++ b/upnp/src/ssdp/ssdp_ctrlpt.c
@@ -239,7 +239,6 @@ void ssdp_handle_ctrlpt_msg(http_message_t *hmsg, struct sockaddr_storage *dest_
/*hdr_value.buf[ hdr_value.length ] = '\0'; */
while (node != NULL) {
searchArg = node->item;
- matched = 0;
/* check for match of ST header and search target */
switch (searchArg->requestType) {
case SSDP_ALL:
diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
index a439005..d00efb5 100644
--- a/upnp/src/ssdp/ssdp_device.c
+++ b/upnp/src/ssdp/ssdp_device.c
@@ -169,7 +169,7 @@ void ssdp_handle_device_request(http_message_t *hmsg, struct sockaddr_storage *d
* \brief Works as a request handler which passes the HTTP request string
* to multicast channel.
*
- * \return 1 if successful else appropriate error.
+ * \return UPNP_E_SUCCESS if successful else appropriate error.
*/
static int NewRequestHandler(
/*! [in] Ip address, to send the reply. */
@@ -246,8 +246,7 @@ static int NewRequestHandler(
}
end_NewRequestHandler:
- ret = shutdown(ReplySock, SD_BOTH);
- if (ret == -1) {
+ if (shutdown(ReplySock, SD_BOTH) == -1) {
strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__,
"Error in shutdown: %s\n", errorBuffer);
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index 01c873f..231c2c5 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -864,8 +864,8 @@ static int create_ssdp_sock_v4(
/* This is probably not a critical error, so let's continue. */
}
/* result is not checked becuase it will fail in WinMe and Win9x. */
- ret = setsockopt(*ssdpSock, IPPROTO_IP,
- IP_MULTICAST_TTL, &ttl, sizeof(ttl));
+ setsockopt(*ssdpSock, IPPROTO_IP,
+ IP_MULTICAST_TTL, &ttl, sizeof(ttl));
onOff = 1;
ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_BROADCAST,
(char *)&onOff, sizeof(onOff));
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
upnp/sample/linux/tv_combo_main.c | 3 +++
upnp/sample/linux/tv_ctrlpt_main.c | 3 +++
upnp/sample/linux/tv_device_main.c | 3 +++
upnp/src/gena/gena_device.c | 3 +--
upnp/src/genlib/net/http/httpreadwrite.c | 1 -
upnp/src/genlib/service_table/service_table.c | 1 -
upnp/src/soap/soap_device.c | 2 --
upnp/src/ssdp/ssdp_ctrlpt.c | 1 -
upnp/src/ssdp/ssdp_device.c | 5 ++---
upnp/src/ssdp/ssdp_server.c | 4 ++--
11 files changed, 24 insertions(+), 12 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-04-20 23:15:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 3d7c1dbd5901300d0ad7db6653e8008aa54ab89c (commit)
from e52e7e0bd3e43df357e1586427e2264538013fd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=3d7c1dbd5901300d0ad7db6653e8008aa54ab89c
commit 3d7c1dbd5901300d0ad7db6653e8008aa54ab89c
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Fri Apr 20 03:42:02 2012 +0900
Avoid dereference of null pointer in ixmlNode_setNodeProperties.
The problem can occur if one of the arguments is NULL.
Test argument and fix assertion.
diff --git a/ChangeLog b/ChangeLog
index 8c7d3d3..afd5c9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
Version 1.6.18
*******************************************************************************
+2012-04-20 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Avoid dereference of null pointer in ixmlNode_setNodeProperties.
+
+ The problem can occur if one of the arguments is NULL.
+ Test argument and fix assertion.
+
2012-04-17 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Create intermediate directory per project on vc9.
diff --git a/ixml/src/node.c b/ixml/src/node.c
index c20b841..1d1ec16 100644
--- a/ixml/src/node.c
+++ b/ixml/src/node.c
@@ -1339,7 +1339,10 @@ int ixmlNode_setNodeProperties(
{
int rc;
- assert(destNode != NULL || src != NULL);
+ assert(destNode != NULL && src != NULL);
+ if(destNode == NULL || src == NULL) {
+ return IXML_INVALID_PARAMETER;
+ }
rc = ixmlNode_setNodeValue(destNode, src->nodeValue);
if(rc != IXML_SUCCESS) {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
ixml/src/node.c | 5 ++++-
2 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-17 13:56:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 3b2cfdc45de4f65b40d3360994be0ccbea8fbb7b (commit)
from e570b7943d6835778c0055985cac5f83fa012535 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=3b2cfdc45de4f65b40d3360994be0ccbea8fbb7b
commit 3b2cfdc45de4f65b40d3360994be0ccbea8fbb7b
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Tue Apr 17 20:34:37 2012 +0900
Create intermediate directory per project on vc9.
Sample applications share sample_util.c and collisions of
object file can occur in parallel build. Modify project files to
split intermediate directories against it.
Apply similar changes also to library projects, like vc10 projects.
(cherry picked from commit e52e7e0bd3e43df357e1586427e2264538013fd0)
diff --git a/ChangeLog b/ChangeLog
index ad1c244..8b6f498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,15 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-04-17 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Create intermediate directory per project on vc9.
+
+ Sample applications share sample_util.c and collisions of
+ object file can occur in parallel build. Modify project files to
+ split intermediate directories against it.
+ Apply similar changes also to library projects, like vc10 projects.
+
2012-04-11 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid access violation after parser_parse_chunky_headers call.
diff --git a/build/vc9/ixml.vcproj b/build/vc9/ixml.vcproj
index ce565cb..760e76d 100644
--- a/build/vc9/ixml.vcproj
+++ b/build/vc9/ixml.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -88,7 +88,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -156,7 +156,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -226,7 +226,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -297,7 +297,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -364,7 +364,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -432,7 +432,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -502,7 +502,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
diff --git a/build/vc9/libupnp.vcproj b/build/vc9/libupnp.vcproj
index d863d40..dcc4ea1 100644
--- a/build/vc9/libupnp.vcproj
+++ b/build/vc9/libupnp.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -126,7 +126,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -231,7 +231,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -329,7 +329,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -427,7 +427,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -508,7 +508,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -589,7 +589,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -674,7 +674,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
diff --git a/build/vc9/threadutil.vcproj b/build/vc9/threadutil.vcproj
index f4828df..6c39e0a 100644
--- a/build/vc9/threadutil.vcproj
+++ b/build/vc9/threadutil.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -86,7 +86,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -152,7 +152,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -220,7 +220,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -289,7 +289,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -354,7 +354,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -420,7 +420,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -488,7 +488,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
diff --git a/build/vc9/tvcombo.vcproj b/build/vc9/tvcombo.vcproj
index 094085a..ff6624d 100644
--- a/build/vc9/tvcombo.vcproj
+++ b/build/vc9/tvcombo.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -98,7 +98,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -176,7 +176,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -257,7 +257,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -339,7 +339,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -416,7 +416,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -494,7 +494,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -575,7 +575,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
diff --git a/build/vc9/tvctrlpt.vcproj b/build/vc9/tvctrlpt.vcproj
index c7219d1..a9280e5 100644
--- a/build/vc9/tvctrlpt.vcproj
+++ b/build/vc9/tvctrlpt.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -98,7 +98,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -176,7 +176,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -257,7 +257,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -339,7 +339,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -416,7 +416,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -494,7 +494,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -575,7 +575,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/vc9/tvdevice.vcproj b/build/vc9/tvdevice.vcproj
index cf444ad..1793e84 100644
--- a/build/vc9/tvdevice.vcproj
+++ b/build/vc9/tvdevice.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -98,7 +98,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -176,7 +176,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -257,7 +257,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -339,7 +339,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -416,7 +416,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -494,7 +494,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -575,7 +575,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
build/vc9/ixml.vcproj | 16 ++++++++--------
build/vc9/libupnp.vcproj | 16 ++++++++--------
build/vc9/threadutil.vcproj | 16 ++++++++--------
build/vc9/tvcombo.vcproj | 16 ++++++++--------
build/vc9/tvctrlpt.vcproj | 16 ++++++++--------
build/vc9/tvdevice.vcproj | 16 ++++++++--------
7 files changed, 57 insertions(+), 48 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-04-17 11:42:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via e52e7e0bd3e43df357e1586427e2264538013fd0 (commit)
from d5d680d13136ea9c3bea85470926bbb4f3f4837a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=e52e7e0bd3e43df357e1586427e2264538013fd0
commit e52e7e0bd3e43df357e1586427e2264538013fd0
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Tue Apr 17 20:34:37 2012 +0900
Create intermediate directory per project on vc9.
Sample applications share sample_util.c and collisions of
object file can occur in parallel build. Modify project files to
split intermediate directories against it.
Apply similar changes also to library projects, like vc10 projects.
diff --git a/ChangeLog b/ChangeLog
index 84be080..8c7d3d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
Version 1.6.18
*******************************************************************************
+2012-04-17 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Create intermediate directory per project on vc9.
+
+ Sample applications share sample_util.c and collisions of
+ object file can occur in parallel build. Modify project files to
+ split intermediate directories against it.
+ Apply similar changes also to library projects, like vc10 projects.
+
2012-04-11 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid access violation after parser_parse_chunky_headers call.
diff --git a/build/vc9/ixml.vcproj b/build/vc9/ixml.vcproj
index ce565cb..760e76d 100644
--- a/build/vc9/ixml.vcproj
+++ b/build/vc9/ixml.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -88,7 +88,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -156,7 +156,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -226,7 +226,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -297,7 +297,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -364,7 +364,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
EnableManagedIncrementalBuild="1"
@@ -432,7 +432,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -502,7 +502,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
diff --git a/build/vc9/libupnp.vcproj b/build/vc9/libupnp.vcproj
index 6d8bc84..1c8b702 100644
--- a/build/vc9/libupnp.vcproj
+++ b/build/vc9/libupnp.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -126,7 +126,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -231,7 +231,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -329,7 +329,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -427,7 +427,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -508,7 +508,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -589,7 +589,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -674,7 +674,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
diff --git a/build/vc9/threadutil.vcproj b/build/vc9/threadutil.vcproj
index f4828df..6c39e0a 100644
--- a/build/vc9/threadutil.vcproj
+++ b/build/vc9/threadutil.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -86,7 +86,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -152,7 +152,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -220,7 +220,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -289,7 +289,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -354,7 +354,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
>
@@ -420,7 +420,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -488,7 +488,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="4"
CharacterSet="0"
WholeProgramOptimization="1"
diff --git a/build/vc9/tvcombo.vcproj b/build/vc9/tvcombo.vcproj
index 094085a..ff6624d 100644
--- a/build/vc9/tvcombo.vcproj
+++ b/build/vc9/tvcombo.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -98,7 +98,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -176,7 +176,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -257,7 +257,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -339,7 +339,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -416,7 +416,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
>
@@ -494,7 +494,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -575,7 +575,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="0"
WholeProgramOptimization="1"
diff --git a/build/vc9/tvctrlpt.vcproj b/build/vc9/tvctrlpt.vcproj
index c7219d1..a9280e5 100644
--- a/build/vc9/tvctrlpt.vcproj
+++ b/build/vc9/tvctrlpt.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -98,7 +98,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -176,7 +176,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -257,7 +257,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -339,7 +339,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -416,7 +416,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -494,7 +494,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -575,7 +575,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/vc9/tvdevice.vcproj b/build/vc9/tvdevice.vcproj
index cf444ad..1793e84 100644
--- a/build/vc9/tvdevice.vcproj
+++ b/build/vc9/tvdevice.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -98,7 +98,7 @@
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -176,7 +176,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -257,7 +257,7 @@
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -339,7 +339,7 @@
<Configuration
Name="Debug Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -416,7 +416,7 @@
<Configuration
Name="Debug Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
>
@@ -494,7 +494,7 @@
<Configuration
Name="Release Lib|Win32"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -575,7 +575,7 @@
<Configuration
Name="Release Lib|x64"
OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
- IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+ IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\$(ProjectName)\"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
build/vc9/ixml.vcproj | 16 ++++++++--------
build/vc9/libupnp.vcproj | 16 ++++++++--------
build/vc9/threadutil.vcproj | 16 ++++++++--------
build/vc9/tvcombo.vcproj | 16 ++++++++--------
build/vc9/tvctrlpt.vcproj | 16 ++++++++--------
build/vc9/tvdevice.vcproj | 16 ++++++++--------
7 files changed, 57 insertions(+), 48 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 23:18:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via e570b7943d6835778c0055985cac5f83fa012535 (commit)
via 7d28dd559eee930eb2ed806c28510d0f0929eff5 (commit)
via e385d5a27e22049270a2ac71cca7924ce95073c5 (commit)
from 4a07690dc4a1da0ff603b5657421e7426a849c35 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=e570b7943d6835778c0055985cac5f83fa012535
commit e570b7943d6835778c0055985cac5f83fa012535
Author: Thijs Schreijer <th...@th...>
Date: Thu Apr 12 00:08:30 2012 +0200
Updated the readme regarding the newer visual studio versions and the 'VC runtime dependency hell'
diff --git a/README b/README
index 30d0f67..6347b9c 100644
--- a/README
+++ b/README
@@ -266,12 +266,24 @@ In order to build libupnp under Windows the pthreads-w32 package is required.
You can download a self-extracting ZIP file from the following location:
ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-2-7-0-release.exe
+or possibly newer versions if available.
Execute the self-extracting archive and copy the Pre-build.2 folder to the
top level source folder.
Rename Pre-build.2 to pthreads.
Open the provided workspace build\libupnp.dsw with Visual C++ 6.0 and select
Build->Build libupnp.dll (F7)
+In the build directory there are also VC8, VC9 and VC10 folders containing
+solution files for Visual Studio 2005/2008/2010 respectively.
+
+If you use newer versions to build libupnp, eg Visual Studio 2003 or later,
+then you need to rebuild the pthreads package so it uses the same VC runtime
+as libupnp to prevent cross boundary runtime problems
+(see http://msdn.microsoft.com/en-us/library/ms235460%28v=VS.100%29.aspx).
+Just replace the files in the Pre-build.2 folder (renamed to pthreads as
+mentioned above) with the newly build versions.
+If you also use a newer version of pthreads-win32 then you should also
+replace the header files in that directory structure (obviously).
For building a static library instead of a DLL and for using the static
pthreads-w32 library following switches need to be defined additionally:
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=7d28dd559eee930eb2ed806c28510d0f0929eff5
commit 7d28dd559eee930eb2ed806c28510d0f0929eff5
Author: Thijs Schreijer <th...@th...>
Date: Wed Apr 11 23:47:07 2012 +0200
Added pthreads folder back in, put in on the ignore list this time so it won't be included in the repository
diff --git a/.gitignore b/.gitignore
index bd54109..0515e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,4 +108,5 @@ docs/doxygen
/build/vc10/out.vc9.Win32/Debug
/build/vc10/out.vc10.Win32
-/build/vc10/out.vc10.x64
\ No newline at end of file
+/build/vc10/out.vc10.x64
+/pthreads
\ No newline at end of file
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=e385d5a27e22049270a2ac71cca7924ce95073c5
commit e385d5a27e22049270a2ac71cca7924ce95073c5
Author: Thijs Schreijer <th...@th...>
Date: Sun Mar 25 23:29:58 2012 +0200
- Copied the VC9 build directory and renamed to VC10 to prepare for Visual Studio 2010 update - Upgraded build/VC10 dir from VC9 to VC10 (using wizard) - Updated the Debug build configuration to be functional, including references for pthread.dll and the web example folders. Other build configurations still to be fixed. - Added output directory to GIT-ignore list. - Updated the Win32 build configurations to make them all work. x64 remains to be done. - Updated build process, after build events (copying sample files and pthreadVC2.dll to the target directory)
diff --git a/.gitignore b/.gitignore
index e3ba67a..bd54109 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,7 @@ upnp/unittest/unittest
upnp/unittest/*.pp.c
docs/doxygen
+
+/build/vc10/out.vc9.Win32/Debug
+/build/vc10/out.vc10.Win32
+/build/vc10/out.vc10.x64
\ No newline at end of file
diff --git a/build/vc10/.gitignore b/build/vc10/.gitignore
new file mode 100644
index 0000000..102253c
--- /dev/null
+++ b/build/vc10/.gitignore
@@ -0,0 +1,3 @@
+
+*.suo
+*.user
\ No newline at end of file
diff --git a/build/vc10/ixml.vcxproj b/build/vc10/ixml.vcxproj
new file mode 100644
index 0000000..5054848
--- /dev/null
+++ b/build/vc10/ixml.vcxproj
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Lib|Win32">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Lib|x64">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|Win32">
+ <Configuration>Release Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|x64">
+ <Configuration>Release Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9C2C266D-35A3-465F-A297-0E21D54E5C89}</ProjectGuid>
+ <RootNamespace>ixml</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">true</EnableManagedIncrementalBuild>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ <BuildLog>
+ <Path>$(IntDir)$(MSBuildProjectName).log</Path>
+ </BuildLog>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\ixml\src\attr.c" />
+ <ClCompile Include="..\..\ixml\src\document.c" />
+ <ClCompile Include="..\..\ixml\src\element.c" />
+ <ClCompile Include="..\..\ixml\src\ixml.c" />
+ <ClCompile Include="..\..\ixml\src\ixmldebug.c" />
+ <ClCompile Include="..\..\ixml\src\ixmlmembuf.c" />
+ <ClCompile Include="..\..\ixml\src\ixmlparser.c" />
+ <ClCompile Include="..\..\ixml\src\namedNodeMap.c" />
+ <ClCompile Include="..\..\ixml\src\node.c" />
+ <ClCompile Include="..\..\ixml\src\nodeList.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\ixml\inc\ixml.h" />
+ <ClInclude Include="..\..\ixml\inc\ixmldebug.h" />
+ <ClInclude Include="..\..\ixml\src\inc\ixmlmembuf.h" />
+ <ClInclude Include="..\..\ixml\src\inc\ixmlparser.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/vc10/ixml.vcxproj.filters b/build/vc10/ixml.vcxproj.filters
new file mode 100644
index 0000000..5103cde
--- /dev/null
+++ b/build/vc10/ixml.vcxproj.filters
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\ixml\src\attr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\document.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\element.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixml.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixmldebug.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixmlmembuf.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixmlparser.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\namedNodeMap.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\node.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\nodeList.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\ixml\inc\ixml.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\ixml\inc\ixmldebug.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\ixml\src\inc\ixmlmembuf.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\ixml\src\inc\ixmlparser.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/vc10/libupnp.sln b/build/vc10/libupnp.sln
new file mode 100644
index 0000000..f91c307
--- /dev/null
+++ b/build/vc10/libupnp.sln
@@ -0,0 +1,147 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcxproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcxproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcxproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcxproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcxproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcxproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55AF07A8-18AA-45B8-A231-5082F1C6FC08}"
+ ProjectSection(SolutionItems) = preProject
+ ..\..\AUTHORS = ..\..\AUTHORS
+ ..\..\bootstrap = ..\..\bootstrap
+ ..\..\ChangeLog = ..\..\ChangeLog
+ ..\..\configure.ac = ..\..\configure.ac
+ ..\..\COPYING = ..\..\COPYING
+ ..\..\Doxyfile = ..\..\Doxyfile
+ ..\..\INSTALL = ..\..\INSTALL
+ ..\..\libupnp.pc.in = ..\..\libupnp.pc.in
+ ..\..\libupnp.spec = ..\..\libupnp.spec
+ ..\..\LICENSE = ..\..\LICENSE
+ ..\..\Makefile.am = ..\..\Makefile.am
+ ..\..\NEWS = ..\..\NEWS
+ ..\..\README = ..\..\README
+ ..\..\THANKS = ..\..\THANKS
+ ..\..\TODO = ..\..\TODO
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Lib|Win32 = Debug Lib|Win32
+ Debug Lib|x64 = Debug Lib|x64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release Lib|Win32 = Release Lib|Win32
+ Release Lib|x64 = Release Lib|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.Build.0 = Release Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.ActiveCfg = Release|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.Build.0 = Release|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.Build.0 = Debug|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.ActiveCfg = Debug|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.Build.0 = Debug|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.Build.0 = Release Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.ActiveCfg = Release|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.Build.0 = Release|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.ActiveCfg = Release|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.Build.0 = Release|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.Build.0 = Debug|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.ActiveCfg = Debug|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.Build.0 = Debug|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.Build.0 = Release Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.ActiveCfg = Release|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.Build.0 = Release|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.ActiveCfg = Release|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.Build.0 = Release|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.Build.0 = Debug|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.ActiveCfg = Debug|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.Build.0 = Debug|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.Build.0 = Release Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.ActiveCfg = Release|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.Build.0 = Release|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.ActiveCfg = Release|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.Build.0 = Release|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.Build.0 = Debug|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.ActiveCfg = Debug|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.Build.0 = Debug|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.Build.0 = Release Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.ActiveCfg = Release|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.Build.0 = Release|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.ActiveCfg = Release|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.Build.0 = Release|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.Build.0 = Debug|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.ActiveCfg = Debug|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.Build.0 = Debug|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.Build.0 = Release Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.ActiveCfg = Release|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.Build.0 = Release|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.ActiveCfg = Release|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/build/vc10/libupnp.vcxproj b/build/vc10/libupnp.vcxproj
new file mode 100644
index 0000000..31e0006
--- /dev/null
+++ b/build/vc10/libupnp.vcxproj
@@ -0,0 +1,706 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Lib|Win32">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Lib|x64">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|Win32">
+ <Configuration>Release Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|x64">
+ <Configuration>Release Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{6227F51A-1498-4C4A-B213-F6FDED605125}</ProjectGuid>
+ <RootNamespace>libupnp</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>pthreadvc2.lib;ws2_32.lib;iphlpapi.lib;ixml.lib;threadutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/libupnp.bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ <Message>Add pthreadVC2.dll to output</Message>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\inc;$(SolutionDir)\..\msvc;$(SolutionDir)\..\..\upnp\inc;$(SolutionDir)\..\..\upnp\src\inc;$(SolutionDir)\..\..\ixml\inc;$(SolutionDir)\..\..\ixml\src\inc;$(SolutionDir)\..\..\threadutil\inc;$(SolutionDir)\..\..\pthreads;$(SolutionDir)\..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>Mul...
[truncated message content] |
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 23:18:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via d5d680d13136ea9c3bea85470926bbb4f3f4837a (commit)
via 7ee266076d2d1dc220135d958d05a2d9e2047e0f (commit)
via 90fad896c45b1f5503e87ed4e6e2fc906cb6b8ab (commit)
from 0ea9c438e57f8de0fd5bb690c31fad22feee7f53 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=d5d680d13136ea9c3bea85470926bbb4f3f4837a
commit d5d680d13136ea9c3bea85470926bbb4f3f4837a
Author: Thijs Schreijer <th...@th...>
Date: Thu Apr 12 00:08:30 2012 +0200
Updated the readme regarding the newer visual studio versions and the 'VC runtime dependency hell'
(cherry picked from commit e570b7943d6835778c0055985cac5f83fa012535)
diff --git a/README b/README
index 30d0f67..6347b9c 100644
--- a/README
+++ b/README
@@ -266,12 +266,24 @@ In order to build libupnp under Windows the pthreads-w32 package is required.
You can download a self-extracting ZIP file from the following location:
ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-2-7-0-release.exe
+or possibly newer versions if available.
Execute the self-extracting archive and copy the Pre-build.2 folder to the
top level source folder.
Rename Pre-build.2 to pthreads.
Open the provided workspace build\libupnp.dsw with Visual C++ 6.0 and select
Build->Build libupnp.dll (F7)
+In the build directory there are also VC8, VC9 and VC10 folders containing
+solution files for Visual Studio 2005/2008/2010 respectively.
+
+If you use newer versions to build libupnp, eg Visual Studio 2003 or later,
+then you need to rebuild the pthreads package so it uses the same VC runtime
+as libupnp to prevent cross boundary runtime problems
+(see http://msdn.microsoft.com/en-us/library/ms235460%28v=VS.100%29.aspx).
+Just replace the files in the Pre-build.2 folder (renamed to pthreads as
+mentioned above) with the newly build versions.
+If you also use a newer version of pthreads-win32 then you should also
+replace the header files in that directory structure (obviously).
For building a static library instead of a DLL and for using the static
pthreads-w32 library following switches need to be defined additionally:
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=7ee266076d2d1dc220135d958d05a2d9e2047e0f
commit 7ee266076d2d1dc220135d958d05a2d9e2047e0f
Author: Thijs Schreijer <th...@th...>
Date: Wed Apr 11 23:47:07 2012 +0200
Added pthreads folder back in, put in on the ignore list this time so it won't be included in the repository
diff --git a/.gitignore b/.gitignore
index 44a3517..0515e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,9 +101,12 @@ upnp/inc/upnpconfig.h
upnp/sample/tv_combo
upnp/sample/tv_ctrlpt
upnp/sample/tv_device
+upnp/unittest/unittest
+upnp/unittest/*.pp.c
docs/doxygen
/build/vc10/out.vc9.Win32/Debug
/build/vc10/out.vc10.Win32
/build/vc10/out.vc10.x64
+/pthreads
\ No newline at end of file
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=90fad896c45b1f5503e87ed4e6e2fc906cb6b8ab
commit 90fad896c45b1f5503e87ed4e6e2fc906cb6b8ab
Author: Thijs Schreijer <th...@th...>
Date: Sun Mar 25 23:29:58 2012 +0200
- Copied the VC9 build directory and renamed to VC10 to prepare for Visual Studio 2010 update - Upgraded build/VC10 dir from VC9 to VC10 (using wizard) - Updated the Debug build configuration to be functional, including references for pthread.dll and the web example folders. Other build configurations still to be fixed. - Added output directory to GIT-ignore list. - Updated the Win32 build configurations to make them all work. x64 remains to be done. - Updated build process, after build events (copying sample files and pthreadVC2.dll to the target directory)
(cherry picked from commit e385d5a27e22049270a2ac71cca7924ce95073c5)
diff --git a/.gitignore b/.gitignore
index 5f6547b..44a3517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,7 @@ upnp/sample/tv_ctrlpt
upnp/sample/tv_device
docs/doxygen
+
+/build/vc10/out.vc9.Win32/Debug
+/build/vc10/out.vc10.Win32
+/build/vc10/out.vc10.x64
diff --git a/build/vc10/.gitignore b/build/vc10/.gitignore
new file mode 100644
index 0000000..102253c
--- /dev/null
+++ b/build/vc10/.gitignore
@@ -0,0 +1,3 @@
+
+*.suo
+*.user
\ No newline at end of file
diff --git a/build/vc10/ixml.vcxproj b/build/vc10/ixml.vcxproj
new file mode 100644
index 0000000..5054848
--- /dev/null
+++ b/build/vc10/ixml.vcxproj
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Lib|Win32">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Lib|x64">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|Win32">
+ <Configuration>Release Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|x64">
+ <Configuration>Release Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9C2C266D-35A3-465F-A297-0E21D54E5C89}</ProjectGuid>
+ <RootNamespace>ixml</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">true</EnableManagedIncrementalBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">true</EnableManagedIncrementalBuild>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ <BuildLog>
+ <Path>$(IntDir)$(MSBuildProjectName).log</Path>
+ </BuildLog>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir)..\lib;$(OutDir)..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\ixml\src\attr.c" />
+ <ClCompile Include="..\..\ixml\src\document.c" />
+ <ClCompile Include="..\..\ixml\src\element.c" />
+ <ClCompile Include="..\..\ixml\src\ixml.c" />
+ <ClCompile Include="..\..\ixml\src\ixmldebug.c" />
+ <ClCompile Include="..\..\ixml\src\ixmlmembuf.c" />
+ <ClCompile Include="..\..\ixml\src\ixmlparser.c" />
+ <ClCompile Include="..\..\ixml\src\namedNodeMap.c" />
+ <ClCompile Include="..\..\ixml\src\node.c" />
+ <ClCompile Include="..\..\ixml\src\nodeList.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\ixml\inc\ixml.h" />
+ <ClInclude Include="..\..\ixml\inc\ixmldebug.h" />
+ <ClInclude Include="..\..\ixml\src\inc\ixmlmembuf.h" />
+ <ClInclude Include="..\..\ixml\src\inc\ixmlparser.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/vc10/ixml.vcxproj.filters b/build/vc10/ixml.vcxproj.filters
new file mode 100644
index 0000000..5103cde
--- /dev/null
+++ b/build/vc10/ixml.vcxproj.filters
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\ixml\src\attr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\document.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\element.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixml.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixmldebug.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixmlmembuf.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\ixmlparser.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\namedNodeMap.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\node.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\ixml\src\nodeList.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\ixml\inc\ixml.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\ixml\inc\ixmldebug.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\ixml\src\inc\ixmlmembuf.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\ixml\src\inc\ixmlparser.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/vc10/libupnp.sln b/build/vc10/libupnp.sln
new file mode 100644
index 0000000..f91c307
--- /dev/null
+++ b/build/vc10/libupnp.sln
@@ -0,0 +1,147 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcxproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcxproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcxproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcxproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcxproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcxproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55AF07A8-18AA-45B8-A231-5082F1C6FC08}"
+ ProjectSection(SolutionItems) = preProject
+ ..\..\AUTHORS = ..\..\AUTHORS
+ ..\..\bootstrap = ..\..\bootstrap
+ ..\..\ChangeLog = ..\..\ChangeLog
+ ..\..\configure.ac = ..\..\configure.ac
+ ..\..\COPYING = ..\..\COPYING
+ ..\..\Doxyfile = ..\..\Doxyfile
+ ..\..\INSTALL = ..\..\INSTALL
+ ..\..\libupnp.pc.in = ..\..\libupnp.pc.in
+ ..\..\libupnp.spec = ..\..\libupnp.spec
+ ..\..\LICENSE = ..\..\LICENSE
+ ..\..\Makefile.am = ..\..\Makefile.am
+ ..\..\NEWS = ..\..\NEWS
+ ..\..\README = ..\..\README
+ ..\..\THANKS = ..\..\THANKS
+ ..\..\TODO = ..\..\TODO
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Lib|Win32 = Debug Lib|Win32
+ Debug Lib|x64 = Debug Lib|x64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release Lib|Win32 = Release Lib|Win32
+ Release Lib|x64 = Release Lib|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.Build.0 = Release Lib|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.ActiveCfg = Release|x64
+ {6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.Build.0 = Release|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.Build.0 = Debug|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.ActiveCfg = Debug|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.Build.0 = Debug|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.Build.0 = Release Lib|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.ActiveCfg = Release|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.Build.0 = Release|Win32
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.ActiveCfg = Release|x64
+ {9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.Build.0 = Release|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.Build.0 = Debug|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.ActiveCfg = Debug|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.Build.0 = Debug|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.Build.0 = Release Lib|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.ActiveCfg = Release|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.Build.0 = Release|Win32
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.ActiveCfg = Release|x64
+ {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.Build.0 = Release|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.Build.0 = Debug|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.ActiveCfg = Debug|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.Build.0 = Debug|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.Build.0 = Release Lib|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.ActiveCfg = Release|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.Build.0 = Release|Win32
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.ActiveCfg = Release|x64
+ {8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.Build.0 = Release|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.Build.0 = Debug|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.ActiveCfg = Debug|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.Build.0 = Debug|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.Build.0 = Release Lib|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.ActiveCfg = Release|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.Build.0 = Release|Win32
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.ActiveCfg = Release|x64
+ {7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.Build.0 = Release|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.Build.0 = Debug Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.Build.0 = Debug|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.ActiveCfg = Debug|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.Build.0 = Debug|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.Build.0 = Release Lib|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.ActiveCfg = Release Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.Build.0 = Release Lib|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.ActiveCfg = Release|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.Build.0 = Release|Win32
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.ActiveCfg = Release|x64
+ {6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/build/vc10/libupnp.vcxproj b/build/vc10/libupnp.vcxproj
new file mode 100644
index 0000000..31e0006
--- /dev/null
+++ b/build/vc10/libupnp.vcxproj
@@ -0,0 +1,706 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Lib|Win32">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Lib|x64">
+ <Configuration>Debug Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|Win32">
+ <Configuration>Release Lib</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release Lib|x64">
+ <Configuration>Release Lib</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{6227F51A-1498-4C4A-B213-F6FDED605125}</ProjectGuid>
+ <RootNamespace>libupnp</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\lib\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)\out.vc10.$(Platform)\$(Configuration)\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">$(SolutionDir)out.vc10.$(Platform)\$(Configuration)\tmp\$(ProjectName)\</IntDir>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>..\inc;..\msvc;..\..\upnp\inc;..\..\upnp\src\inc;..\..\ixml\inc;..\..\ixml\src\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>pthreadvc2.lib;ws2_32.lib;iphlpapi.lib;ixml.lib;threadutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\pthreads\;..\..\pthreads\lib;$(OutDir)..\lib\ixml;$(OutDir)..\lib\threadutil;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/libupnp.bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ <Message>Add pthreadVC2.dll to output</Message>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>.\Release/libupnp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\inc;$(SolutionDir)\..\msvc;$(SolutionDir)\..\..\upnp\inc;$(SolutionDir)\..\..\upnp\src\inc;$(SolutionDir)\..\..\ixml\inc;$(SolutionDir)\..\..\ixml\src\inc;$(SolutionDir)\..\..\threadutil\inc;$(SolutionDir)\..\..\pthreads;$(SolutionDir)\..\..\pthreads\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEP...
[truncated message content] |
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 20:47:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 4a07690dc4a1da0ff603b5657421e7426a849c35 (commit)
via b1646eb0a38772dd7e16eb9e34dd6a04d5679c9c (commit)
via acc6b4d009c124c621ecf76d45cc9b4932319ebd (commit)
via 615f5d18aca92ed588e7388d126c775edf164993 (commit)
from 4e251192371ddc0ecc9decde1038017a426a1550 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=4a07690dc4a1da0ff603b5657421e7426a849c35
commit 4a07690dc4a1da0ff603b5657421e7426a849c35
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Apr 11 17:42:22 2012 -0300
Update THANKS file
(cherry picked from commit 0ea9c438e57f8de0fd5bb690c31fad22feee7f53)
diff --git a/THANKS b/THANKS
index 2a7978f..4bacd2b 100644
--- a/THANKS
+++ b/THANKS
@@ -61,6 +61,7 @@ exempt of errors.
- Stefan Sommerfeld (zerocom)
- Stéphane Corthésy
- Steve Bresson
+- Thijs Schreijer
- Timothy Redaelli
- Titus Winters
- Tom (tomdev2)
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=b1646eb0a38772dd7e16eb9e34dd6a04d5679c9c
commit b1646eb0a38772dd7e16eb9e34dd6a04d5679c9c
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Apr 11 17:41:51 2012 -0300
Add errno.h inclusion in unixutil.h only in WIN32
(cherry picked from commit c661180d150231591fa39e7cff85d19155cdd327)
diff --git a/upnp/src/inc/unixutil.h b/upnp/src/inc/unixutil.h
index 30e4269..e94afff 100644
--- a/upnp/src/inc/unixutil.h
+++ b/upnp/src/inc/unixutil.h
@@ -35,9 +35,10 @@
/* Unix-specific network utilities */
#include "UpnpInet.h"
-#include <errno.h>
#ifdef WIN32
+ #include <errno.h>
+
typedef int socklen_t;
#ifndef EAFNOSUPPORT /* VS2010 has this defined */
#define EAFNOSUPPORT 97
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=acc6b4d009c124c621ecf76d45cc9b4932319ebd
commit acc6b4d009c124c621ecf76d45cc9b4932319ebd
Author: Thijs Schreijer <th...@th...>
Date: Tue Apr 10 23:54:34 2012 +0200
Fixed warning by adding an explicit cast to long; TimerThread.c ..\..\threadutil\src\TimerThread.c(110): warning C4244: '=' : conversion from 'time_t' to 'long', possible loss of data
(cherry picked from commit 1a98394781e15ed12ab7bceb7817bd9786650b87)
diff --git a/threadutil/src/TimerThread.c b/threadutil/src/TimerThread.c
index 0c2287a..cbbc3c8 100644
--- a/threadutil/src/TimerThread.c
+++ b/threadutil/src/TimerThread.c
@@ -107,7 +107,7 @@ static void *TimerThreadWorker(
}
if (nextEvent) {
timeToWait.tv_nsec = 0;
- timeToWait.tv_sec = nextEvent->eventTime;
+ timeToWait.tv_sec = (long)nextEvent->eventTime;
ithread_cond_timedwait( &timer->condition, &timer->mutex,
&timeToWait );
} else {
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=615f5d18aca92ed588e7388d126c775edf164993
commit 615f5d18aca92ed588e7388d126c775edf164993
Author: Thijs Schreijer <th...@th...>
Date: Tue Apr 10 23:31:10 2012 +0200
Fixed redefinition warnings for EAFNOSUPPORT and EADDRINUSE, Google turned up that they are newly defined in VS2010
unixutil.h, line 41
upnputil.h, line 125
Had a look here; http://bugs.ruby-lang.org/issues/3092 and added the mentioned fixes as found here; http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/win32.h?r1=27222&r2=27236&pathrev=27258&diff_format=h and here http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/win32.h?r1=27236&r2=27258&pathrev=27258&diff_format=h
(cherry picked from commit 89fe655aee4e424946e87235e2e0f4045378cba1)
diff --git a/upnp/src/inc/unixutil.h b/upnp/src/inc/unixutil.h
index da46b58..30e4269 100644
--- a/upnp/src/inc/unixutil.h
+++ b/upnp/src/inc/unixutil.h
@@ -35,10 +35,13 @@
/* Unix-specific network utilities */
#include "UpnpInet.h"
+#include <errno.h>
#ifdef WIN32
typedef int socklen_t;
- #define EAFNOSUPPORT 97
+ #ifndef EAFNOSUPPORT /* VS2010 has this defined */
+ #define EAFNOSUPPORT 97
+ #endif
#else
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/upnp/src/inc/upnputil.h b/upnp/src/inc/upnputil.h
index 7236d6d..76292f8 100644
--- a/upnp/src/inc/upnputil.h
+++ b/upnp/src/inc/upnputil.h
@@ -38,6 +38,7 @@
*/
#include "upnp.h"
+#include <errno.h>
/* usually used to specify direction of parameters in functions */
#ifndef IN
@@ -122,7 +123,9 @@ void linecopylen(
#ifndef S_ISDIR
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
- #define EADDRINUSE WSAEADDRINUSE
+ #ifndef EADDRINUSE /* VS2010 has this defined */
+ #define EADDRINUSE WSAEADDRINUSE
+ #endif
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define sleep(a) Sleep((a)*1000)
-----------------------------------------------------------------------
Summary of changes:
THANKS | 1 +
threadutil/src/TimerThread.c | 2 +-
upnp/src/inc/unixutil.h | 6 +++++-
upnp/src/inc/upnputil.h | 5 ++++-
4 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 20:47:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via 0ea9c438e57f8de0fd5bb690c31fad22feee7f53 (commit)
via c661180d150231591fa39e7cff85d19155cdd327 (commit)
via 1a98394781e15ed12ab7bceb7817bd9786650b87 (commit)
via 89fe655aee4e424946e87235e2e0f4045378cba1 (commit)
from d72bb5cff51bfc261de7725536cef53fd1f0b356 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=0ea9c438e57f8de0fd5bb690c31fad22feee7f53
commit 0ea9c438e57f8de0fd5bb690c31fad22feee7f53
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Apr 11 17:42:22 2012 -0300
Update THANKS file
diff --git a/THANKS b/THANKS
index 2a7978f..4bacd2b 100644
--- a/THANKS
+++ b/THANKS
@@ -61,6 +61,7 @@ exempt of errors.
- Stefan Sommerfeld (zerocom)
- Stéphane Corthésy
- Steve Bresson
+- Thijs Schreijer
- Timothy Redaelli
- Titus Winters
- Tom (tomdev2)
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=c661180d150231591fa39e7cff85d19155cdd327
commit c661180d150231591fa39e7cff85d19155cdd327
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Apr 11 17:41:51 2012 -0300
Add errno.h inclusion in unixutil.h only in WIN32
diff --git a/upnp/src/inc/unixutil.h b/upnp/src/inc/unixutil.h
index 30e4269..e94afff 100644
--- a/upnp/src/inc/unixutil.h
+++ b/upnp/src/inc/unixutil.h
@@ -35,9 +35,10 @@
/* Unix-specific network utilities */
#include "UpnpInet.h"
-#include <errno.h>
#ifdef WIN32
+ #include <errno.h>
+
typedef int socklen_t;
#ifndef EAFNOSUPPORT /* VS2010 has this defined */
#define EAFNOSUPPORT 97
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=1a98394781e15ed12ab7bceb7817bd9786650b87
commit 1a98394781e15ed12ab7bceb7817bd9786650b87
Author: Thijs Schreijer <th...@th...>
Date: Tue Apr 10 23:54:34 2012 +0200
Fixed warning by adding an explicit cast to long; TimerThread.c ..\..\threadutil\src\TimerThread.c(110): warning C4244: '=' : conversion from 'time_t' to 'long', possible loss of data
diff --git a/threadutil/src/TimerThread.c b/threadutil/src/TimerThread.c
index 0c2287a..cbbc3c8 100644
--- a/threadutil/src/TimerThread.c
+++ b/threadutil/src/TimerThread.c
@@ -107,7 +107,7 @@ static void *TimerThreadWorker(
}
if (nextEvent) {
timeToWait.tv_nsec = 0;
- timeToWait.tv_sec = nextEvent->eventTime;
+ timeToWait.tv_sec = (long)nextEvent->eventTime;
ithread_cond_timedwait( &timer->condition, &timer->mutex,
&timeToWait );
} else {
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=89fe655aee4e424946e87235e2e0f4045378cba1
commit 89fe655aee4e424946e87235e2e0f4045378cba1
Author: Thijs Schreijer <th...@th...>
Date: Tue Apr 10 23:31:10 2012 +0200
Fixed redefinition warnings for EAFNOSUPPORT and EADDRINUSE, Google turned up that they are newly defined in VS2010
unixutil.h, line 41
upnputil.h, line 125
Had a look here; http://bugs.ruby-lang.org/issues/3092 and added the mentioned fixes as found here; http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/win32.h?r1=27222&r2=27236&pathrev=27258&diff_format=h and here http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/win32.h?r1=27236&r2=27258&pathrev=27258&diff_format=h
diff --git a/upnp/src/inc/unixutil.h b/upnp/src/inc/unixutil.h
index da46b58..30e4269 100644
--- a/upnp/src/inc/unixutil.h
+++ b/upnp/src/inc/unixutil.h
@@ -35,10 +35,13 @@
/* Unix-specific network utilities */
#include "UpnpInet.h"
+#include <errno.h>
#ifdef WIN32
typedef int socklen_t;
- #define EAFNOSUPPORT 97
+ #ifndef EAFNOSUPPORT /* VS2010 has this defined */
+ #define EAFNOSUPPORT 97
+ #endif
#else
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/upnp/src/inc/upnputil.h b/upnp/src/inc/upnputil.h
index 7236d6d..76292f8 100644
--- a/upnp/src/inc/upnputil.h
+++ b/upnp/src/inc/upnputil.h
@@ -38,6 +38,7 @@
*/
#include "upnp.h"
+#include <errno.h>
/* usually used to specify direction of parameters in functions */
#ifndef IN
@@ -122,7 +123,9 @@ void linecopylen(
#ifndef S_ISDIR
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
- #define EADDRINUSE WSAEADDRINUSE
+ #ifndef EADDRINUSE /* VS2010 has this defined */
+ #define EADDRINUSE WSAEADDRINUSE
+ #endif
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define sleep(a) Sleep((a)*1000)
-----------------------------------------------------------------------
Summary of changes:
THANKS | 1 +
threadutil/src/TimerThread.c | 2 +-
upnp/src/inc/unixutil.h | 6 +++++-
upnp/src/inc/upnputil.h | 5 ++++-
4 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 17:41:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 4e251192371ddc0ecc9decde1038017a426a1550 (commit)
from 24715afab8af06e26279cd95abbbc6d51145b172 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=4e251192371ddc0ecc9decde1038017a426a1550
commit 4e251192371ddc0ecc9decde1038017a426a1550
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Thu Apr 12 01:47:26 2012 +0900
Avoid access violation after parser_parse_chunky_headers call.
In parser_parse_chunky_headers, parser->msg.msg.buf can be changed
by membuffer_delete call. Therefore if we save the pointer to
parser->msg.entity.buf before calling membuffer_delete, it will
induce access to released memory.
(cherry picked from commit d72bb5cff51bfc261de7725536cef53fd1f0b356)
diff --git a/ChangeLog b/ChangeLog
index eefe45c..ad1c244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,15 @@ Version 1.8.0
Version 1.6.18
*******************************************************************************
+2012-04-11 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Avoid access violation after parser_parse_chunky_headers call.
+
+ In parser_parse_chunky_headers, parser->msg.msg.buf can be changed
+ by membuffer_delete call. Therefore if we save the pointer to
+ parser->msg.entity.buf before calling membuffer_delete, it will
+ induce access to released memory.
+
2012-04-06 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Remove possibility of access violation.
diff --git a/upnp/src/genlib/net/http/httpparser.c b/upnp/src/genlib/net/http/httpparser.c
index 4ac73fe..1f74d8e 100644
--- a/upnp/src/genlib/net/http/httpparser.c
+++ b/upnp/src/genlib/net/http/httpparser.c
@@ -1684,14 +1684,14 @@ parser_parse_chunky_headers( INOUT http_parser_t * parser )
/* finally, done with the whole msg */
parser->position = POS_COMPLETE;
- /* save entity start ptr as the very last thing to do */
- parser->msg.entity.buf = parser->msg.msg.buf +
- parser->entity_start_position;
-
membuffer_delete( &parser->msg.msg, save_pos,
( parser->scanner.cursor - save_pos ) );
parser->scanner.cursor = save_pos;
+ /* save entity start ptr as the very last thing to do */
+ parser->msg.entity.buf = parser->msg.msg.buf +
+ parser->entity_start_position;
+
return PARSE_SUCCESS;
} else {
return status;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
upnp/src/genlib/net/http/httpparser.c | 8 ++++----
2 files changed, 13 insertions(+), 4 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Yoichi N. <yo...@us...> - 2012-04-11 16:53:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via d72bb5cff51bfc261de7725536cef53fd1f0b356 (commit)
from e02753736a02a9070957c4f0a51c496e87226f85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=d72bb5cff51bfc261de7725536cef53fd1f0b356
commit d72bb5cff51bfc261de7725536cef53fd1f0b356
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date: Thu Apr 12 01:47:26 2012 +0900
Avoid access violation after parser_parse_chunky_headers call.
In parser_parse_chunky_headers, parser->msg.msg.buf can be changed
by membuffer_delete call. Therefore if we save the pointer to
parser->msg.entity.buf before calling membuffer_delete, it will
induce access to released memory.
diff --git a/ChangeLog b/ChangeLog
index 406fc5b..84be080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
Version 1.6.18
*******************************************************************************
+2012-04-11 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+ Avoid access violation after parser_parse_chunky_headers call.
+
+ In parser_parse_chunky_headers, parser->msg.msg.buf can be changed
+ by membuffer_delete call. Therefore if we save the pointer to
+ parser->msg.entity.buf before calling membuffer_delete, it will
+ induce access to released memory.
+
2012-04-06 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Remove possibility of access violation.
diff --git a/upnp/src/genlib/net/http/httpparser.c b/upnp/src/genlib/net/http/httpparser.c
index 05ec861..430fd83 100644
--- a/upnp/src/genlib/net/http/httpparser.c
+++ b/upnp/src/genlib/net/http/httpparser.c
@@ -1682,14 +1682,14 @@ parser_parse_chunky_headers( INOUT http_parser_t * parser )
/* finally, done with the whole msg */
parser->position = POS_COMPLETE;
- /* save entity start ptr as the very last thing to do */
- parser->msg.entity.buf = parser->msg.msg.buf +
- parser->entity_start_position;
-
membuffer_delete( &parser->msg.msg, save_pos,
( parser->scanner.cursor - save_pos ) );
parser->scanner.cursor = save_pos;
+ /* save entity start ptr as the very last thing to do */
+ parser->msg.entity.buf = parser->msg.msg.buf +
+ parser->entity_start_position;
+
return PARSE_SUCCESS;
} else {
return status;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
upnp/src/genlib/net/http/httpparser.c | 8 ++++----
2 files changed, 13 insertions(+), 4 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 15:02:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, master has been updated
via 24715afab8af06e26279cd95abbbc6d51145b172 (commit)
from 88b94b5116f75572bcf14574535ecde437c2b4bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=24715afab8af06e26279cd95abbbc6d51145b172
commit 24715afab8af06e26279cd95abbbc6d51145b172
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Apr 11 12:00:33 2012 -0300
Update THANKS file.
(cherry picked from commit e02753736a02a9070957c4f0a51c496e87226f85)
diff --git a/THANKS b/THANKS
index f30bf1c..2a7978f 100644
--- a/THANKS
+++ b/THANKS
@@ -30,6 +30,7 @@ exempt of errors.
- Fabrice Fontaine (ffontaine)
- Fredrik Svensson
- Glen Masgai
+- Gustavo Zacarias (gustavoz)
- Hartmut Holzgraefe (hholzgra)
- Iain Denniston (ectotropic)
- Ingo Hofmann
-----------------------------------------------------------------------
Summary of changes:
THANKS | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
pupnp
|
|
From: Marcelo R. J. <mro...@us...> - 2012-04-11 15:02:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pupnp".
The branch, branch-1.6.x has been updated
via e02753736a02a9070957c4f0a51c496e87226f85 (commit)
from 1c21e6e54f035576afeb84bd90bdf5f754041105 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=e02753736a02a9070957c4f0a51c496e87226f85
commit e02753736a02a9070957c4f0a51c496e87226f85
Author: Marcelo Roberto Jimenez <mro...@us...>
Date: Wed Apr 11 12:00:33 2012 -0300
Update THANKS file.
diff --git a/THANKS b/THANKS
index f30bf1c..2a7978f 100644
--- a/THANKS
+++ b/THANKS
@@ -30,6 +30,7 @@ exempt of errors.
- Fabrice Fontaine (ffontaine)
- Fredrik Svensson
- Glen Masgai
+- Gustavo Zacarias (gustavoz)
- Hartmut Holzgraefe (hholzgra)
- Iain Denniston (ectotropic)
- Ingo Hofmann
-----------------------------------------------------------------------
Summary of changes:
THANKS | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
pupnp
|