[libdvdcss-devel] Require Windows 2000 as minimal Windows version.

Diego Biurrun

2014-11-16 21:22:27 UTC

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=fca3d72fe957f078618facea66c682f9b120ae4c

---

NEWS | 4 ++--
configure.ac | 6 +++---
libdvdcss.spec.in | 6 ++----
msvc/config.h | 2 +-
src/libdvdcss.c | 8 ++++----
5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index db7aab0..17dd7e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
Changes since 1.3.0:
--------------------
* Drop support for HP-UX.
- * Drop support for Windows 9x.
- Windows NT 4.0 SP4 with IE 5.0 is now required.
+ * Drop support for Windows 9x and Windows NT.
+ Windows 2000 is now required.
* Replace BeOS support by Haiku support.
* dvdcss_error() now returns "const char *" instad of "char *".
* Drop support for MSVC versions before 2010.
diff --git a/configure.ac b/configure.ac
index f37057f..63f0c5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,17 +106,17 @@ case x"${host_os}" in
;;
x*cygwin*)
CFLAGS="${CFLAGS} -mwin32"
- AC_DEFINE([_WIN32_IE], 0x0500, [Define to '0x0500' for IE 5.0 (and shell) APIs.])
+ AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.])
;;
xos2*)
LDFLAGS="-Zbin-files"
;;
x*msvc*)
SYS_MSVC=1
- AC_DEFINE([_WIN32_IE], 0x0500, [Define to '0x0500' for IE 5.0 (and shell) APIs.])
+ AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0500' for IE 5.01 (and shell) APIs.])
;;
x*mingw* | *wince* | *mingwce*)
- AC_DEFINE([_WIN32_IE], 0x0500, [Define to '0x0500' for IE 5.0 (and shell) APIs.])
+ AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0500' for IE 5.01 (and shell) APIs.])
;;
x*)
;;
diff --git a/libdvdcss.spec.in b/libdvdcss.spec.in
index 7734df0..0558661 100644
--- a/libdvdcss.spec.in
+++ b/libdvdcss.spec.in
@@ -32,8 +32,7 @@ Conflicts: libdvdcss0.0.1, libdvdcss0.0.2
libdvdcss is a simple library designed for accessing DVDs like a block device
without having to bother about the decryption. The important features are:
* Portability: Currently supported platforms are GNU/Linux, FreeBSD, NetBSD,
- OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows NT 4.0 SP4 (with
- IE 5.0) or later.
+ OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows 2000 or later.
* Adaptability: Unlike most similar projects, libdvdcss does not require the
region of your drive to be set and will try its best to read from the disc
even in the case of a region mismatch.
@@ -49,8 +48,7 @@ Provides: %name = %version-%release
libdvdcss is a simple library designed for accessing DVDs like a block device
without having to bother about the decryption. The important features are:
* Portability: Currently supported platforms are GNU/Linux, FreeBSD, NetBSD,
- OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows NT 4.0 SP4 (with
- IE 5.0) or later.
+ OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows 2000 or later.
* Adaptability: Unlike most similar projects, libdvdcss does not require the
region of your drive to be set and will try its best to read from the disc
even in the case of a region mismatch.
diff --git a/msvc/config.h b/msvc/config.h
index d65d53b..190b8f9 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -35,7 +35,7 @@
/* #undef SOLARIS_USCSI */
#define STDC_HEADERS 1
#define VERSION "1.3.0"
-#define _WIN32_IE 0x0500
+#define _WIN32_IE 0x0501
/* #undef const */
/* #undef inline */
/* #undef size_t */
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index 4a58675..4bc6821 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -31,7 +31,7 @@
* are:
* \li portability: Currently supported platforms are GNU/Linux, FreeBSD,
* NetBSD, OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows
- * NT 4.0 SP4 (with IE 5.0) or later.
+ * 2000 or later.
* \li adaptability: Unlike most similar projects, libdvdcss does not require
* the region of your drive to be set and will try its best to read from
* the disc even in the case of a region mismatch.
@@ -116,7 +116,7 @@
# include <unistd.h>
#endif

-#if defined(_WIN32_IE) && _WIN32_IE >= 0x500
+#ifdef WIN32
# include <shlobj.h>
#endif

@@ -200,7 +200,7 @@ static int set_cache_directory( dvdcss_t dvdcss )

if( psz_cache == NULL || psz_cache[0] == '\0' )
{
-#if defined(_WIN32_IE) && _WIN32_IE >= 0x500
+#ifdef WIN32
char psz_home[PATH_MAX];

/* Cache our keys in
@@ -255,7 +255,7 @@ static int set_cache_directory( dvdcss_t dvdcss )
dvdcss->psz_cachefile[PATH_MAX - 1] = '\0';
psz_cache = dvdcss->psz_cachefile;
}
-#endif /* ! defined(_WIN32_IE) && _WIN32_IE >= 0x500 */
+#endif /* ! defined( WIN32 ) */
}

/* Check that there is enough space for the cache directory path and the