shithub: libdvdcss

Download patch

ref: fca3d72fe957f078618facea66c682f9b120ae4c
parent: 6b95108d3de1755beab102b3a02ca7ef02494bd1
author: Diego Biurrun <diego@biurrun.de>
date: Sun Nov 16 13:56:43 EST 2014

Require Windows 2000 as minimal Windows version.

--- 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.
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@
     ;;
   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"
@@ -113,10 +113,10 @@
     ;;
   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*)
     ;;
--- a/libdvdcss.spec.in
+++ b/libdvdcss.spec.in
@@ -32,8 +32,7 @@
 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 @@
 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.
--- 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 */
--- 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 @@
 
     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 @@
             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