Packman Build Service PMBS

makemkv.spec Changed

makemkv-bin-1.8.3.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.8.5.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.8.3.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.8.5.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.8.3.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.8.5.tar.gz/bin/i386/mmdtsdec Changed

makemkv-bin-1.8.3.tar.gz/src/ask_eula.sh -> makemkv-bin-1.8.5.tar.gz/src/ask_eula.sh Changed

makemkv-bin-1.8.3.tar.gz/src/share/makemkv_ita.mo.gz -> makemkv-bin-1.8.5.tar.gz/src/share/makemkv_ita.mo.gz Changed

makemkv-oss-1.8.5.tar.gz/libmmbd Added

makemkv-oss-1.8.5.tar.gz/libmmbd/inc Added

makemkv-oss-1.8.5.tar.gz/libmmbd/inc/libmmbd Added

makemkv-oss-1.8.5.tar.gz/libmmbd/inc/libmmbd/mmbd.h Added

@@ -0,0 +1,80 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#ifndef MMBD_H_
+#define MMBD_H_
+
+#include <stdint.h>
+
+#ifndef MMBD_PUBLIC
+#  define MMBD_PUBLIC
+#endif
+
+#if !defined(_MSC_VER) && !defined(__cdecl)
+#define __cdecl
+#endif
+
+typedef struct _mm_bd_context MMBD;
+
+#define MMBD_FILE_M2TS                   0 /* M2TS file, default value */
+#define MMBD_FILE_SSIF          0x80000000 /* SSIF file */
+#define MMBD_FLAG_AACS_ONLY     0x00100000 /* only apply AACS decryption, skip BD+ */
+#define MMBD_FLAG_BDPLUS_ONLY   0x00200000 /* only apply BD+ transform */
+#define MMBD_FLAG_AUTO_CPSID    0x10000000 /* for libaacs compatibility */
+
+/* This callback function will receive all diagnostic output
+    user_context    - value passed to mmbd_create_context
+    flags           - message priority and unique code
+    utf8_message    - message string as utf8
+    utf16_message   - message string as utf16
+*/
+#define MMBD_MESSAGE_FLAG_WARNING       0x10000000
+#define MMBD_MESSAGE_FLAG_ERROR         0x20000000
+#define MMBD_MESSAGE_FLAG_MMBD_ERROR    0x40000000
+typedef void (__cdecl * mmbd_output_proc_t)(void* user_context,uint32_t flags,const char* utf8_message,const uint16_t* utf16_message);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* MMBD library operations */
+MMBD_PUBLIC const char* __cdecl mmbd_get_version_string();
+
+/* MMBD Context operations */
+MMBD_PUBLIC MMBD* __cdecl mmbd_create_context(void* user_context,mmbd_output_proc_t output_proc,const char* argp[]);
+MMBD_PUBLIC void  __cdecl mmbd_destroy_context(MMBD *mmbd);
+MMBD_PUBLIC const char* __cdecl mmbd_get_engine_version_string(MMBD *mmbd);
+
+/* Disc operations */
+MMBD_PUBLIC int   __cdecl mmbd_open(MMBD *mmbd,const char *locator);
+MMBD_PUBLIC int   __cdecl mmbd_close(MMBD *mmbd);
+MMBD_PUBLIC unsigned int    __cdecl mmbd_get_mkb_version(MMBD *mmbd);
+MMBD_PUBLIC const uint8_t*  __cdecl mmbd_get_disc_id(MMBD *mmbd);
+MMBD_PUBLIC int   __cdecl mmbd_decrypt_unit(MMBD *mmbd,uint32_t name_flags,uint64_t file_offset,uint8_t* buf);
+
+/* libaacs/libbdplus compatibility API*/
+MMBD_PUBLIC void  __cdecl mmbd_libaacs_reset_cpsid(MMBD *mmbd);
+MMBD_PUBLIC const uint8_t*  __cdecl mmbd_get_encoded_ipc_handle(MMBD *mmbd);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MMBD_H_ */

makemkv-oss-1.8.5.tar.gz/libmmbd/src Added

makemkv-oss-1.8.5.tar.gz/libmmbd/src/ConvertUTF.c Added

@@ -0,0 +1,573 @@
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/* ---------------------------------------------------------------------
+
+    Conversions between UTF32, UTF-16, and UTF-8. Source code file.
+    Author: Mark E. Davis, 1994.
+    Rev History: Rick McGowan, fixes & updates May 2001.
+    Sept 2001: fixed const & error conditions per
+	mods suggested by S. Parent & A. Lillich.
+    June 2002: Tim Dodd added detection and handling of incomplete
+	source sequences, enhanced error detection, added casts
+	to eliminate compiler warnings.
+    July 2003: slight mods to back out aggressive FFFE detection.
+    Jan 2004: updated switches in from-UTF8 conversions.
+    Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
+
+    See the header file "ConvertUTF.h" for complete documentation.
+
+------------------------------------------------------------------------ */
+
+
+#include "ConvertUTF.h"
+#ifdef CVTUTF_DEBUG
+#include <stdio.h>
+#endif
+
+static const int halfShift  = 10; /* used for shifting by 10 bits */
+
+static const UTF32 halfBase = 0x0010000UL;
+static const UTF32 halfMask = 0x3FFUL;
+
+#define UNI_SUR_HIGH_START  (UTF32)0xD800
+#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
+#define UNI_SUR_LOW_START   (UTF32)0xDC00
+#define UNI_SUR_LOW_END     (UTF32)0xDFFF
+//#define false	   0
+//#define true	    1
+
+/* --------------------------------------------------------------------- */
+
+static
+ConversionResult ConvertUTF32toUTF16 (
+	const UTF32** sourceStart, const UTF32* sourceEnd, 
+	UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF32* source = *sourceStart;
+    UTF16* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch;
+	if (target >= targetEnd) {
+	    result = targetExhausted; break;
+	}
+	ch = *source++;
+	if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+	    /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+		if (flags == strictConversion) {
+		    --source; /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		} else {
+		    *target++ = UNI_REPLACEMENT_CHAR;
+		}
+	    } else {
+		*target++ = (UTF16)ch; /* normal case */
+	    }
+	} else if (ch > UNI_MAX_LEGAL_UTF32) {
+	    if (flags == strictConversion) {
+		result = sourceIllegal;
+	    } else {
+		*target++ = UNI_REPLACEMENT_CHAR;
+	    }
+	} else {
+	    /* target is a character in range 0xFFFF - 0x10FFFF. */
+	    if (target + 1 >= targetEnd) {
+		--source; /* Back up source pointer! */
+		result = targetExhausted; break;
+	    }
+	    ch -= halfBase;
+	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+	}
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+static
+ConversionResult ConvertUTF16toUTF32 (
+	const UTF16** sourceStart, const UTF16* sourceEnd, 
+	UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF16* source = *sourceStart;
+    UTF32* target = *targetStart;
+    UTF32 ch, ch2;
+    while (source < sourceEnd) {
+	const UTF16* oldSource = source; /*  In case we have to back up because of target overflow. */
+	ch = *source++;
+	/* If we have a surrogate pair, convert to UTF32 first. */
+	if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+	    /* If the 16 bits following the high surrogate are in the source buffer... */
+	    if (source < sourceEnd) {
+		ch2 = *source;
+		/* If it's a low surrogate, convert to UTF32. */
+		if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+		    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+			+ (ch2 - UNI_SUR_LOW_START) + halfBase;
+		    ++source;
+		} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+		    --source; /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		}
+	    } else { /* We don't have the 16 bits following the high surrogate. */
+		--source; /* return to the high surrogate */
+		result = sourceExhausted;
+		break;
+	    }
+	} else if (flags == strictConversion) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+		--source; /* return to the illegal value itself */
+		result = sourceIllegal;
+		break;
+	    }
+	}
+	if (target >= targetEnd) {
+	    source = oldSource; /* Back up source pointer! */
+	    result = targetExhausted; break;
+	}
+	*target++ = ch;
+    }
+    *sourceStart = source;
+    *targetStart = target;
+#ifdef CVTUTF_DEBUG
+if (result == sourceIllegal) {
+    fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
+    fflush(stderr);
+}
+#endif
+    return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
+ * left as-is for anyone who may want to do such conversion, which was
+ * allowed in earlier algorithms.
+ */
+static const char trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/*
+ * Magic values subtracted from a buffer value during UTF8 conversion.
+ * This table contains as many values as there might be trailing bytes
+ * in a UTF-8 sequence.
+ */
+static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
+		     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+
+/*
+ * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
+ * into the first byte, depending on how many bytes follow.  There are
+ * as many entries in this table as there are UTF-8 sequence types.
+ * (I.e., one byte sequence, two byte... etc.). Remember that sequencs

makemkv-oss-1.8.5.tar.gz/libmmbd/src/ConvertUTF.h Added

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/* ---------------------------------------------------------------------
+
+    Conversions between UTF32, UTF-16, and UTF-8.  Header file.
+
+    Several funtions are included here, forming a complete set of
+    conversions between the three formats.  UTF-7 is not included
+    here, but is handled in a separate source file.
+
+    Each of these routines takes pointers to input buffers and output
+    buffers.  The input buffers are const.
+
+    Each routine converts the text between *sourceStart and sourceEnd,
+    putting the result into the buffer between *targetStart and
+    targetEnd. Note: the end pointers are *after* the last item: e.g. 
+    *(sourceEnd - 1) is the last item.
+
+    The return result indicates whether the conversion was successful,
+    and if not, whether the problem was in the source or target buffers.
+    (Only the first encountered problem is indicated.)
+
+    After the conversion, *sourceStart and *targetStart are both
+    updated to point to the end of last text successfully converted in
+    the respective buffers.
+
+    Input parameters:
+	sourceStart - pointer to a pointer to the source buffer.
+		The contents of this are modified on return so that
+		it points at the next thing to be converted.
+	targetStart - similarly, pointer to pointer to the target buffer.
+	sourceEnd, targetEnd - respectively pointers to the ends of the
+		two buffers, for overflow checking only.
+
+    These conversion functions take a ConversionFlags argument. When this
+    flag is set to strict, both irregular sequences and isolated surrogates
+    will cause an error.  When the flag is set to lenient, both irregular
+    sequences and isolated surrogates are converted.
+
+    Whether the flag is strict or lenient, all illegal sequences will cause
+    an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
+    or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
+    must check for illegal sequences.
+
+    When the flag is set to lenient, characters over 0x10FFFF are converted
+    to the replacement character; otherwise (when the flag is set to strict)
+    they constitute an error.
+
+    Output parameters:
+	The value "sourceIllegal" is returned from some routines if the input
+	sequence is malformed.  When "sourceIllegal" is returned, the source
+	value will point to the illegal value that caused the problem. E.g.,
+	in UTF-8 when a sequence is malformed, it points to the start of the
+	malformed sequence.  
+
+    Author: Mark E. Davis, 1994.
+    Rev History: Rick McGowan, fixes & updates May 2001.
+		 Fixes & updates, Sept 2001.
+
+------------------------------------------------------------------------ */
+
+/* ---------------------------------------------------------------------
+    The following 4 definitions are compiler-specific.
+    The C standard does not guarantee that wchar_t has at least
+    16 bits, so wchar_t is no less portable than unsigned short!
+    All should be unsigned values to avoid sign extension during
+    bit mask & shift operations.
+------------------------------------------------------------------------ */
+
+#if 0
+typedef unsigned long	UTF32;	/* at least 32 bits */
+typedef unsigned short	UTF16;	/* at least 16 bits */
+typedef unsigned char	UTF8;	/* typically 8 bits */
+typedef unsigned char	Boolean; /* 0 or 1 */
+#endif
+
+/* Some fundamental constants */
+#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
+#define UNI_MAX_BMP (UTF32)0x0000FFFF
+#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
+#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
+#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
+
+typedef enum {
+	conversionOK, 		/* conversion successful */
+	sourceExhausted,	/* partial character in source, but hit end */
+	targetExhausted,	/* insuff. room in target for conversion */
+	sourceIllegal		/* source sequence is illegal/malformed */
+} ConversionResult;
+
+typedef enum {
+	strictConversion = 0,
+	lenientConversion
+} ConversionFlags;
+
+/* This is for C++ and does no harm in C */
+/*
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ConversionResult ConvertUTF8toUTF16 (
+		const UTF8** sourceStart, const UTF8* sourceEnd, 
+		UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF16toUTF8 (
+		const UTF16** sourceStart, const UTF16* sourceEnd, 
+		UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+		
+ConversionResult ConvertUTF8toUTF32 (
+		const UTF8** sourceStart, const UTF8* sourceEnd, 
+		UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF32toUTF8 (
+		const UTF32** sourceStart, const UTF32* sourceEnd, 
+		UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+		
+ConversionResult ConvertUTF16toUTF32 (
+		const UTF16** sourceStart, const UTF16* sourceEnd, 
+		UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF32toUTF16 (
+		const UTF32** sourceStart, const UTF32* sourceEnd, 
+		UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
+
+Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
+
+#ifdef __cplusplus
+}
+#endif
+*/
+
+/* --------------------------------------------------------------------- */

makemkv-oss-1.8.5.tar.gz/libmmbd/src/aacs.cpp Added

@@ -0,0 +1,151 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <libmmbd/mmbd.h>
+#include "aacs.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+    WARNING!
+    The sole purpose of this file is to emulate libaacs API.
+    Please note that this API has limitations and consider
+    using the mmbd API.
+
+    The way libaacs emulation is implemented, the AACS and MMBD
+    handles are fully interchangeable. So you may use aacs_open
+    to obtain AACS handle and then call mmbd_decrypt_unit; or
+    you can use mmbd_create_context/mmbd_open to create MMBD
+    context and then use aacs_decrypt_unit . However this practice
+    is discouraged.
+*/
+
+static void __cdecl stderr_print(void* user_context,uint32_t flags,const char* message,const uint16_t*)
+{
+    fprintf(stderr,"MMBD: %s\n",message);
+    fflush(stderr);
+}
+
+AACS_PUBLIC AACS * __cdecl aacs_open(const char *path, const char *keyfile_path)
+{
+    return aacs_open2(path,keyfile_path,NULL);
+}
+
+AACS_PUBLIC AACS * __cdecl aacs_open2(const char *path, const char *keyfile_path, int *error_code)
+{
+    const char* args[3];
+    const char** p_args;
+    MMBD* mmbd;
+
+    if (keyfile_path) {
+        args[0]="--libaacs-keyfile";
+        args[1]=keyfile_path;
+        args[2]=NULL;
+        p_args = args;
+    } else {
+        p_args = NULL;
+    }
+
+    if (getenv("MMBD_TRACE")) {
+        mmbd = mmbd_create_context(NULL,stderr_print,p_args);
+    } else {
+        mmbd = mmbd_create_context(NULL,NULL,p_args);
+    }
+    if (mmbd) {
+        if (error_code) *error_code=AACS_SUCCESS;
+    } else {
+        if (error_code) *error_code=AACS_ERROR_MMC_FAILURE;
+        mmbd_destroy_context(mmbd);
+        return NULL;
+    }
+
+    if (mmbd_open(mmbd,path)) {
+        if (error_code) *error_code=AACS_ERROR_CORRUPTED_DISC;
+        mmbd_destroy_context(mmbd);
+        return NULL;
+    }
+
+    return (AACS*)mmbd;
+}
+
+AACS_PUBLIC void __cdecl aacs_close(AACS *aacs)
+{
+    mmbd_destroy_context((MMBD*)aacs);
+}
+
+AACS_PUBLIC void __cdecl aacs_select_title(AACS *aacs, uint32_t title)
+{
+    mmbd_libaacs_reset_cpsid((MMBD*)aacs);
+}
+
+AACS_PUBLIC int  __cdecl aacs_decrypt_unit(AACS *aacs, uint8_t *buf)
+{
+    return mmbd_decrypt_unit((MMBD*)aacs,MMBD_FLAG_AUTO_CPSID|MMBD_FLAG_AACS_ONLY,0,buf)?0:1;
+}
+
+AACS_PUBLIC int __cdecl aacs_get_mkb_version(AACS *aacs)
+{
+    return mmbd_get_mkb_version((MMBD*)aacs);
+}
+
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_disc_id(AACS *aacs)
+{
+    return mmbd_get_disc_id((MMBD*)aacs);
+}
+
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_vid(AACS *aacs)
+{
+    return mmbd_get_encoded_ipc_handle((MMBD*)aacs);
+}
+
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_pmsn(AACS *aacs)
+{
+    return NULL;
+}
+
+static AACS_RL_ENTRY fake_rl_entry = { 0,{0} };
+
+AACS_PUBLIC AACS_RL_ENTRY * __cdecl aacs_get_hrl(int *num_entries, int *mkb_version)
+{
+    *num_entries = 0;
+    *mkb_version = 1;
+    return &fake_rl_entry;
+}
+
+AACS_PUBLIC AACS_RL_ENTRY * __cdecl aacs_get_drl(int *num_entries, int *mkb_version)
+{
+    *num_entries = 0;
+    *mkb_version = 1;
+    return &fake_rl_entry;
+}
+
+AACS_PUBLIC void __cdecl aacs_get_version(int *major, int *minor, int *micro)
+{
+    const char* p = strchr(mmbd_get_version_string(),' ')+1;
+    *major = (int)strtoul(p,NULL,10)+100;
+
+    p=strchr(p,'.')+1;
+    *minor = (int)strtoul(p,NULL,10);
+
+    p=strchr(p,'.')+1;
+    *micro = (int)strtoul(p,NULL,10);
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/aacs.h Added

@@ -0,0 +1,76 @@
+/*
+ * This file is part of libaacs
+ * Copyright (C) 2009-2010  Obliter0n
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AACS_H_
+#define AACS_H_
+
+#include <stdint.h>
+
+#ifndef AACS_PUBLIC
+#  define AACS_PUBLIC
+#endif
+
+#if !defined(_MSC_VER) && !defined(__cdecl)
+#define __cdecl
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* aacs_open2() error codes */
+#define AACS_SUCCESS               0 /* no errors */
+#define AACS_ERROR_CORRUPTED_DISC -1 /* opening or reading of AACS files failed */
+#define AACS_ERROR_NO_CONFIG      -2 /* missing config file */
+#define AACS_ERROR_NO_PK          -3 /* no matching processing key */
+#define AACS_ERROR_NO_CERT        -4 /* no valid certificate */
+#define AACS_ERROR_CERT_REVOKED   -5 /* certificate has been revoked */
+#define AACS_ERROR_MMC_OPEN       -6 /* MMC open failed (no MMC drive ?) */
+#define AACS_ERROR_MMC_FAILURE    -7 /* MMC failed */
+
+typedef struct aacs AACS;
+
+AACS_PUBLIC void __cdecl aacs_get_version(int *major, int *minor, int *micro);
+
+AACS_PUBLIC AACS * __cdecl aacs_open(const char *path, const char *keyfile_path);
+AACS_PUBLIC AACS * __cdecl aacs_open2(const char *path, const char *keyfile_path, int *error_code);
+AACS_PUBLIC void __cdecl aacs_close(AACS *aacs);
+AACS_PUBLIC void __cdecl aacs_select_title(AACS *aacs, uint32_t title); /* 0 - top menu, 0xffff - first play */
+AACS_PUBLIC int  __cdecl aacs_decrypt_unit(AACS *aacs, uint8_t *buf);
+
+/* Disc information */
+AACS_PUBLIC int __cdecl aacs_get_mkb_version(AACS *aacs);
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_disc_id(AACS *aacs);
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_vid(AACS *aacs);  /* may fail even if disc can be decrypted */
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_pmsn(AACS *aacs); /* may fail even if disc can be decrypted */
+
+/* revocation lists */
+typedef struct {
+    uint16_t  range;
+    uint8_t   id[6];
+} AACS_RL_ENTRY;
+
+AACS_PUBLIC AACS_RL_ENTRY * __cdecl aacs_get_hrl(int *num_entries, int *mkb_version);
+AACS_PUBLIC AACS_RL_ENTRY * __cdecl aacs_get_drl(int *num_entries, int *mkb_version);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AACS_H_ */

makemkv-oss-1.8.5.tar.gz/libmmbd/src/bdplus.cpp Added

@@ -0,0 +1,97 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <libmmbd/mmbd.h>
+#include "aacs.h"
+#include "bdplus.h"
+#include "mmbdipc.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+    WARNING!
+    The sole purpose of this file is to emulate libbdplus API.
+    Specifically, assumptions are made on how the functions
+    in this library are called from libbluray.
+    Do not use this API.
+*/
+
+typedef struct _BDPLUS_CTX
+{
+    IMMBDIpc*   mmbd;
+    uint32_t    clip_id;
+    uint64_t    offset;
+} BDPLUS_CTX;
+
+/*
+    This function requires aacs_vid value produced by aacs_get_vid, not an actual disc VID.
+*/
+AACS_PUBLIC BDPLUS_CTX* __cdecl bdplus_init(const char *path, const char *keyfile_path,const uint8_t* aacs_vid)
+{
+    BDPLUS_CTX* ctx = (BDPLUS_CTX*)malloc(sizeof(BDPLUS_CTX));
+    if (!ctx) return NULL;
+
+    ctx->mmbd = IMMBDIpc::decode_handle(aacs_vid);
+    if (!ctx->mmbd) {
+        free(ctx);
+        return NULL;
+    }
+    ctx->clip_id = 0xffffffff;
+    ctx->offset = 0;
+    return ctx;
+}
+
+AACS_PUBLIC void __cdecl bdplus_free(BDPLUS_CTX* ctx)
+{
+    free(ctx);
+}
+
+AACS_PUBLIC void __cdecl bdplus_set_title(BDPLUS_CTX* ctx,uint32_t clip_id)
+{
+    ctx->clip_id = clip_id;
+    ctx->offset = 0;
+}
+
+AACS_PUBLIC void __cdecl bdplus_seek(BDPLUS_CTX* ctx,uint64_t offset)
+{
+    ctx->offset = offset;
+}
+
+AACS_PUBLIC uint32_t __cdecl bdplus_fixup(BDPLUS_CTX* ctx,size_t len,uint8_t* buffer)
+{
+    if ((ctx->offset%6144)!=0) {
+        ctx->mmbd->error_message(101,"bdplus_fixup: offset is not aligned");
+        return 0;
+    }
+    if ((len%6144)!=0) {
+        ctx->mmbd->error_message(102,"bdplus_fixup: length is not aligned");
+        return 0;
+    }
+
+    for (size_t i=0;i<len;i+=6144) {
+        if (ctx->mmbd->decrypt_unit(ctx->clip_id|MMBD_FILE_M2TS|MMBD_FLAG_BDPLUS_ONLY,ctx->offset,buffer+i)) {
+            ctx->mmbd->error_message(103,"bdplus_fixup: mmbd_decrypt_unit failed");
+        }
+        ctx->offset+=6144;
+    }
+    return 1;
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/bdplus.h Added

@@ -0,0 +1,40 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include "aacs.h"
+#include <string.h>
+
+struct _BDPLUS_CTX;
+typedef struct _BDPLUS_CTX BDPLUS_CTX;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+AACS_PUBLIC BDPLUS_CTX* __cdecl bdplus_init(const char *path, const char *keyfile_path,const uint8_t* aacs_vid);
+AACS_PUBLIC void __cdecl bdplus_free(BDPLUS_CTX* ctx);
+AACS_PUBLIC void __cdecl bdplus_set_title(BDPLUS_CTX* ctx,uint32_t clip_id);
+AACS_PUBLIC void __cdecl bdplus_seek(BDPLUS_CTX* ctx,uint64_t offset);
+AACS_PUBLIC uint32_t __cdecl bdplus_fixup(BDPLUS_CTX* ctx,size_t len,uint8_t* buffer);
+
+#ifdef __cplusplus
+}
+#endif
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/crypto.h Added

@@ -0,0 +1,30 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#ifndef MMBD_CRYPTO_H_
+#define MMBD_CRYPTO_H_
+
+#include <stdint.h>
+
+typedef void (*aes_cbc_d_proc_t)(const uint8_t* key,const uint8_t* iv,uint8_t* data,unsigned int size);
+
+aes_cbc_d_proc_t mmbd_init_aes_cbcd();
+
+#endif // MMBD_CRYPTO_H_

makemkv-oss-1.8.5.tar.gz/libmmbd/src/crypto_ossl.cpp Added

@@ -0,0 +1,40 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <stdint.h>
+#include <openssl/aes.h>
+#include <string.h>
+#include "crypto.h"
+
+static void aes_cbcd_ossl(const uint8_t* key,const uint8_t* iv,uint8_t* data,unsigned int size)
+{
+    AES_KEY akey;
+    uint8_t ivec[16];
+
+    AES_set_decrypt_key(key,128,&akey);
+    memcpy(ivec,iv,16);
+    AES_cbc_encrypt(data,data,size,&akey,ivec,0);
+}
+
+aes_cbc_d_proc_t mmbd_init_aes_cbcd()
+{
+    return aes_cbcd_ossl;
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/libmmbd.def Added

makemkv-oss-1.8.5.tar.gz/libmmbd/src/libmmbd.vers Added

makemkv-oss-1.8.5.tar.gz/libmmbd/src/marmmbd.cpp Added

@@ -0,0 +1,107 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <lgpl/aproxy.h>
+#include <strings.h>
+
+void CMMBDApClient::SetTrackInfo(unsigned int id,unsigned int trkid,uint64_t handle)
+{
+}
+
+void CMMBDApClient::SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle)
+{
+}
+
+void CMMBDApClient::SetTitleInfo(unsigned int id,uint64_t handle,unsigned int TrackCount,unsigned int ChapterCount,uint64_t chap_handle)
+{
+}
+
+void CMMBDApClient::SetTitleCollInfo(uint64_t handle,unsigned int Count)
+{
+    m_TitleCount = Count;
+}
+
+bool CMMBDApClient::OpenMMBD(const utf16_t* Source)
+{
+    memcpy((void*)m_mem->strbuf,Source,(utf16len(Source)+1)*sizeof(utf16_t));
+    ExecCmd(apCallOpenMMBD);
+    return (m_mem->args[0]!=0);
+}
+
+bool CMMBDApClient::InitMMBD(const uint16_t* argp[])
+{
+    if (argp==NULL)
+    {
+        m_mem->args[0]=0;
+    } else {
+        unsigned int count =0;
+        unsigned int offset = 0;
+        while(argp[count]!=NULL)
+        {
+            size_t len;
+
+            len = utf16len(argp[count])+1;
+
+            memcpy((void*)(m_mem->strbuf+offset),argp[count],len*sizeof(uint16_t));
+            m_mem->args[1+count] = offset;
+            offset += len;
+            count ++;
+        }
+        m_mem->args[0] = count;
+    }
+
+    ExecCmd(apCallInitMMBD);
+    return (m_mem->args[0]!=0);
+}
+
+const uint8_t* CMMBDApClient::DiscInfoMMBD(uint32_t *Flags,uint8_t *BusKey,uint8_t *DiscId,uint32_t *MkbVersion,uint32_t* ClipCount)
+{
+    ExecCmd(apCallDiscInfoMMBD);
+
+    if (m_mem->args[0]==0) return NULL;
+
+    *Flags = (uint32_t)m_mem->args[1];
+    *MkbVersion = (uint32_t)m_mem->args[2];
+    *ClipCount = (uint32_t)m_mem->args[3];
+
+    const uint8_t* p = (const uint8_t*)m_mem->strbuf;
+
+    memcpy(BusKey,p,16);
+    memcpy(DiscId,p+16,20);
+
+    return p+36;
+}
+
+const uint8_t* CMMBDApClient::DecryptUnitMMBD(uint32_t NameFlags,uint32_t* ClipInfo,uint64_t FileOffset,const uint8_t* Data,unsigned int Size)
+{
+    m_mem->args[0]=NameFlags;
+    m_mem->args[1]=*ClipInfo;
+    m_mem->args[2]=FileOffset;
+    if (Size) memcpy((void*)(m_mem->args+4),Data,Size);
+
+    ExecCmd(apCallDecryptUnitMMBD);
+
+    if (m_mem->args[0]==0) return NULL;
+
+    *ClipInfo = (uint32_t)m_mem->args[1];
+
+    return (const uint8_t*)(m_mem->args+4);
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/mmbd.cpp Added

@@ -0,0 +1,160 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <libmmbd/mmbd.h>
+#include "mmconn.h"
+#include <stdlib.h>
+#include <ver_num.h>
+
+/*  mmbd_create_context
+    Allocates and initializes MMBD context. Locates and launches MakeMKV instance in background.
+    user_context    - arbitrary value, will be passed back to output_proc callback.
+    output_proc     - a callback to receive diagnostic output, may be NULL.
+    argp            - NULL-terminated array of strings specifying additional options. May be NULL.
+*/
+MMBD_PUBLIC MMBD* __cdecl mmbd_create_context(void* user_context,mmbd_output_proc_t output_proc,const char* argp[])
+{
+    CMMBDConn* mmbd = (CMMBDConn*)malloc(sizeof(CMMBDConn));
+    if (!mmbd) {
+        return NULL;
+    }
+
+    new(mmbd) CMMBDConn(output_proc,user_context);
+
+    if (!mmbd->initialize(argp)) {
+        free(mmbd);
+        return NULL;
+    }
+
+    return (MMBD*)mmbd;
+}
+
+/*  mmbd_destroy_context
+    Deallocates MMBD context, terminates MakeMKV instance.
+*/
+MMBD_PUBLIC void  __cdecl mmbd_destroy_context(MMBD *mmbd)
+{
+    if (mmbd==NULL) return;
+
+    CMMBDConn* p = ((CMMBDConn*)mmbd);
+
+    p->terminate();
+    p->~CMMBDConn();
+
+    memset(mmbd,0xbb,sizeof(CMMBDConn));
+    free(mmbd);
+}
+
+/*  mmbd_get_engine_version_string
+    Get MakeMKV version (not the version of this lib)
+*/
+MMBD_PUBLIC const char* __cdecl mmbd_get_engine_version_string(MMBD *mmbd)
+{
+    if (mmbd==NULL) return NULL;
+    return ((CMMBDConn*)mmbd)->get_version_string();
+}
+
+/*  mmbd_open
+    Opens a disc. One MMBD context may have at most one disc opened.
+    If there is already an open disc in the context, it is closed first.
+    locator         - a string pointing to the disc. May be a path to
+                      disc root; disc AACS or BDMV directories, or any
+                      M2TS file. In addition MakeMKV locators may be used:
+                      disc:id - open disc by id
+                      dev:name - open disc by OS device name
+                      iso:path - open ISO file
+    Return value    - 0 if success, non-zero if failed
+*/
+MMBD_PUBLIC int __cdecl mmbd_open(MMBD *mmbd,const char *locator)
+{
+    if (mmbd==NULL) return -1;
+    return ((CMMBDConn*)mmbd)->open(locator);
+}
+
+/*  mmbd_close
+    Closes a disc. Retains the context, so another disc may be opened
+    in the same context later.
+    Return value    - 0 if success, non-zero if failed
+*/
+MMBD_PUBLIC int __cdecl mmbd_close(MMBD *mmbd)
+{
+    if (mmbd==NULL) return -1;
+    return ((CMMBDConn*)mmbd)->close();
+}
+
+/*  mmbd_decrypt_unit
+    Decrypt a single BD aligned unit. Depending on the flags removes
+    AACS bus encryption, AACS encryption, and applies BD+ transforms.
+    name_flags      - Name of the object and additional flags.
+    file_offset     - offset of the unit inside the file, required only for BD+
+    buf             - buffer containing BD aligned unit data (6144 bytes)
+    Return value    - 0 if success, non-zero if failed
+*/
+MMBD_PUBLIC int __cdecl mmbd_decrypt_unit(MMBD *mmbd,uint32_t name_flags,uint64_t file_offset,uint8_t* buf)
+{
+    if (mmbd==NULL) return -1;
+    return ((CMMBDConn*)mmbd)->decrypt_unit(name_flags,file_offset,buf);
+}
+
+/*  mmbd_get_mkb_version
+    Returns AACS MKB version for currently opened disc.
+*/
+MMBD_PUBLIC unsigned int __cdecl mmbd_get_mkb_version(MMBD *mmbd)
+{
+    if (mmbd==NULL) return 0;
+    return ((CMMBDConn*)mmbd)->get_mkb_version();
+}
+
+/*  mmbd_get_disc_id
+    Returns disc id as used by libaacs and some metadata services.
+*/
+MMBD_PUBLIC const uint8_t* __cdecl mmbd_get_disc_id(MMBD *mmbd)
+{
+    if (mmbd==NULL) return NULL;
+    return ((CMMBDConn*)mmbd)->get_disc_id();
+}
+
+/*  mmbd_get_version_string
+    Get a version string of this library
+*/
+MMBD_PUBLIC const char* __cdecl mmbd_get_version_string()
+{
+    static const char version[]="libmmbd " LIBMMBD_VERSION_NUMBER;
+    return version;
+}
+
+/*  mmbd_libaacs_reset_cpsid
+    An internal support function for libaacs emulation
+*/
+MMBD_PUBLIC void __cdecl mmbd_libaacs_reset_cpsid(MMBD *mmbd)
+{
+    if (mmbd==NULL) return;
+    ((CMMBDConn*)mmbd)->reset_cpsid();
+}
+
+/*  mmbd_get_encoded_ipc_handle
+    An internal support function for libbdplus emulation
+*/
+MMBD_PUBLIC const uint8_t*  __cdecl mmbd_get_encoded_ipc_handle(MMBD *mmbd)
+{
+    if (mmbd==NULL) return NULL;
+    return ((CMMBDConn*)mmbd)->get_encoded_ipc_handle();
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/mmbdipc.cpp Added

@@ -0,0 +1,82 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include "mmbdipc.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <memory.h>
+
+static uint64_t crc64(const uint8_t *data,size_t len)
+{
+    static const uint64_t poly = 0x42F0E1EBA9EA3693ll;
+
+    uint64_t crc = 0x12345678abcdef00ll;
+
+    for (size_t i=0;i<len;i++) {
+        crc ^= ((uint64_t)data[i]) << 56;
+        for (int j = 0; j < 8; j++) {
+            crc = (crc << 1) ^ (poly & (((int64_t) crc) >> 63));
+        }
+    }
+
+    return crc;
+}
+
+void IMMBDIpc::encode_handle(uint8_t* data,IMMBDIpc* ipc)
+{
+    uint64_t v[2];
+    uintptr_t nthis = (uintptr_t)(void*)ipc;
+
+    v[0] = nthis;
+
+    ((uint8_t*)v)[0]^='M';
+    ((uint8_t*)v)[1]^='M';
+    ((uint8_t*)v)[2]^='B';
+    ((uint8_t*)v)[3]^='D';
+    ((uint8_t*)v)[4]^='M';
+    ((uint8_t*)v)[5]^='M';
+    ((uint8_t*)v)[6]^='B';
+    ((uint8_t*)v)[7]^='D';
+
+    v[1] = crc64((uint8_t*)v,8);
+    memcpy(data,v,16);
+}
+
+IMMBDIpc* IMMBDIpc::decode_handle(const uint8_t* data)
+{
+    uint64_t v[2];
+
+    if (!data) return NULL;
+
+    memcpy(v,data,16);
+    if (crc64((uint8_t*)v,8)!=v[1]) return NULL;
+
+    ((uint8_t*)v)[0]^='M';
+    ((uint8_t*)v)[1]^='M';
+    ((uint8_t*)v)[2]^='B';
+    ((uint8_t*)v)[3]^='D';
+    ((uint8_t*)v)[4]^='M';
+    ((uint8_t*)v)[5]^='M';
+    ((uint8_t*)v)[6]^='B';
+    ((uint8_t*)v)[7]^='D';
+
+    return (IMMBDIpc*)(void*)(uintptr_t)v[0];
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/mmbdipc.h Added

@@ -0,0 +1,34 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <stdint.h>
+#include <libmmbd/mmbd.h>
+
+class IMMBDIpc
+{
+public:
+    virtual int  mmbdipc_version()=0;
+    virtual void error_message(uint32_t error_code,const char* message)=0;
+    virtual int  decrypt_unit(uint32_t name_flags,uint64_t file_offset,uint8_t* buf)=0;
+public:
+    static IMMBDIpc* decode_handle(const uint8_t* data);
+    static void encode_handle(uint8_t* data,IMMBDIpc* ipc);
+};
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/mmconn.cpp Added

@@ -0,0 +1,460 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include "mmconn.h"
+#include "utf8.h"
+#include <alloca.h>
+#include <lgpl/sstring.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+CMMBDConn::CMMBDConn(mmbd_output_proc_t OutputProc,void* OutputUserContext)
+    : m_active(false)
+    , m_job(false)
+    , m_output_proc(OutputProc)
+    , m_output_context(OutputUserContext)
+    , m_version(NULL)
+    , m_aes_cbcd(NULL)
+    , m_clip_info(NULL)
+    , m_clip_count(0)
+{
+    m_apc.SetUiNotifier(this);
+    encode_handle(m_ipc_handle,this);
+
+    m_last_clip_info[0]=0xffffffff;
+    m_auto_clip_info[0]=0;
+    m_auto_clip_info[1]=0x0000ffff;
+}
+
+CMMBDConn::~CMMBDConn()
+{
+    free(m_version);
+    free(m_clip_info);
+}
+
+static char* append_utf16(char* pd,char* pe,const uint16_t* p)
+{
+    size_t len;
+
+    len = utf16toutf8len(p);
+
+    if (len>=((size_t)(pe-pd))) return pd;
+
+    utf16toutf8(pd,len,p,utf16len(p));
+
+    return pd+len;
+}
+
+static char* append_utf8(char* pd,char* pe,const char* p)
+{
+    size_t len;
+
+    len = strlen(p);
+
+    if (len>=((size_t)(pe-pd))) return pd;
+
+    memcpy(pd,p,len);
+
+    return pd+len;
+}
+
+bool CMMBDConn::initialize(const char* argp[])
+{
+    const uint16_t* argu[30];
+    unsigned int count=0;
+
+    if (!argp) return initializeU(NULL);
+
+    while((argp[count]!=NULL) && (count<29)) {
+        size_t      len;
+        uint16_t*   p;
+
+        len = utf8toutf16len(argp[count])+2;
+        p=(uint16_t*)alloca(len*sizeof(uint16_t));
+        utf8toutf16(p,len,argp[count],strlen(argp[count])+1);
+        argu[count]=p;
+        count++;
+    }
+    argu[count]=NULL;
+    return initializeU(argu);
+}
+
+bool CMMBDConn::initializeU(const uint16_t* argp[])
+{
+    const utf16_t*  p;
+    char            strbuf[300],*pd,*pe;
+    unsigned int    err;
+    const char*     errtxt;
+
+    if (!m_apc.Init('C',":makemkvcon",&err)) {
+        switch(err) {
+            case 1:  errtxt="Can't locate makemkvcon executable"; break;
+            case 2:  errtxt="Version mismatch"; break;
+            default: errtxt="Unknown error"; break;
+        }
+        sprintf_s(strbuf,sizeof(strbuf),"Failed to launch MakeMKV in background : %s",errtxt);
+        error_message(err,strbuf);
+        return false;
+    }
+
+    if (!m_apc.InitMMBD(argp)) {
+        error_message(20,"MakeMKV initialization failed");
+        return false;
+    }
+
+    WaitJob();
+
+    pd = strbuf;
+    pe = strbuf + sizeof(strbuf);
+
+    pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_Name));
+    pd=append_utf8(pd,pe," ");
+    pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_Version));
+    pd=append_utf8(pd,pe," [");
+    pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_Platform));
+    pd=append_utf8(pd,pe,"] ");
+    pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_KeyType));
+
+    p=m_apc.GetAppString(AP_vastr_KeyExpiration);
+    if (*p) {
+        pd=append_utf8(pd,pe," (");
+        pd=append_utf16(pd,pe,m_apc.GetAppString(0x10000+APP_IFACE_EVAL_EXPIRATION));
+        pd=append_utf8(pd,pe," ");
+        pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_KeyExpiration));
+        pd=append_utf8(pd,pe,")");
+    } else {
+        p=m_apc.GetAppString(AP_vastr_ProgExpiration);
+        if (*p) {
+            pd=append_utf8(pd,pe," (");
+            pd=append_utf16(pd,pe,m_apc.GetAppString(0x10000+APP_IFACE_PROG_EXPIRATION));
+            pd=append_utf8(pd,pe," ");
+            pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_ProgExpiration));
+            pd=append_utf8(pd,pe,")");
+        }
+    }
+
+    m_version = (char*)malloc((pd-strbuf)+1);
+    if (m_version) {
+        memcpy(m_version,strbuf,pd-strbuf);
+        m_version[pd-strbuf]=0;
+    }
+
+    m_aes_cbcd = mmbd_init_aes_cbcd();
+    if (!m_aes_cbcd) {
+        error_message(21,"Failed to initialize AES cipher");
+        return false;
+    }
+
+    m_active = true;
+
+    return true;
+}
+
+const char* CMMBDConn::get_version_string()
+{
+    return m_version;
+}
+
+int CMMBDConn::open(const char *locator)
+{
+    size_t len = utf8toutf16len(locator);
+
+    uint16_t* p = (uint16_t*)alloca((len+2)*sizeof(uint16_t));
+
+    utf8toutf16(p,len+2,locator,strlen(locator)+1);
+
+    return openU(p);
+}
+
+int CMMBDConn::openU(const uint16_t *locator)
+{
+    const uint8_t* clip_info;
+
+    if (!m_active) return -2;
+
+    close();
+
+    if (!m_apc.UpdateAvailableDrives()) {
+        return -3;
+    }
+    WaitJob();
+
+    if (!m_apc.OpenMMBD(locator)) {

makemkv-oss-1.8.5.tar.gz/libmmbd/src/mmconn.h Added

@@ -0,0 +1,86 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <stdint.h>
+#include <lgpl/aproxy.h>
+#include <libmmbd/mmbd.h>
+#include "crypto.h"
+#include "mmbdipc.h"
+
+class CMMBDConn : private CApClient::INotifier , public IMMBDIpc
+{
+    static const uint32_t BD_SECTOR_SIZE = 2048;
+private:
+    CMMBDApClient       m_apc;
+    mmbd_output_proc_t  m_output_proc;
+    void*               m_output_context;
+    aes_cbc_d_proc_t    m_aes_cbcd;
+    char*               m_version;
+    uint32_t            m_disc_flags;
+    uint8_t             m_bus_key[16];
+    uint8_t             m_disc_id[20];
+    uint8_t             m_ipc_handle[16];
+    uint32_t*           m_clip_info;
+    unsigned int        m_clip_count;
+    uint32_t            m_last_clip_info[2];
+    uint32_t            m_auto_clip_info[2];
+    uint32_t            m_mkb_version;
+    bool                m_active;
+    bool                m_job;
+public:
+    inline void* operator new(size_t,CMMBDConn* p) {
+        return p;
+    }
+    inline void operator delete(void*,CMMBDConn*) {
+    }
+    inline void operator delete(void*) {
+    }
+    CMMBDConn(mmbd_output_proc_t OutputProc,void* OutputUserContext);
+    ~CMMBDConn();
+    bool initialize(const char* argp[]);
+    bool initializeU(const uint16_t* argp[]);
+    const char* get_version_string();
+    int open(const char *locator);
+    int openU(const uint16_t *locator);
+    int close();
+    void terminate();
+    int decrypt_unit(uint32_t name_flags,uint64_t file_offset,uint8_t* buf);
+    unsigned int get_mkb_version();
+    const uint8_t* get_disc_id();
+    void reset_cpsid();
+    int mmbdipc_version();
+    const uint8_t* get_encoded_ipc_handle();
+private:
+    void SetTotalName(unsigned long Name);
+    void UpdateCurrentBar(unsigned int Value);
+    void UpdateTotalBar(unsigned int Value);
+    void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names);
+    void UpdateCurrentInfo(unsigned int Index,const utf16_t* Value);
+    void EnterJobMode(unsigned int Flags);
+    void LeaveJobMode();
+    void ExitApp();
+    void UpdateDrive(unsigned int Index,const utf16_t *DriveName,AP_DriveState DriveState,const utf16_t *DiskName,const utf16_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize);
+    int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text);
+private:
+    void WaitJob();
+    uint32_t* GetClipInfo(uint32_t Name);
+    void error_message(uint32_t error_code,const char* message);
+};
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/nstring.cpp Added

@@ -0,0 +1,29 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <lgpl/aproxy.h>
+
+static const utf16_t error_string[]={'-','-','-',' ','e','r','r','o','r',' ','-','-','-',0};
+
+extern const utf16_t* AppGetString(unsigned int code)
+{
+    return error_string;
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/utf8.cpp Added

@@ -0,0 +1,97 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <stdint.h>
+#include <lgpl/aproxy.h>
+#include "utf8.h"
+
+typedef uint32_t    UTF32;
+typedef uint16_t    UTF16;
+typedef uint8_t     UTF8;
+typedef bool        Boolean;
+
+#include "ConvertUTF.c"
+
+size_t utf16toutf8len(const uint16_t *src_string)
+{
+    const UTF16* s_start = (const UTF16*)src_string;
+    const UTF16* s_end   = s_start + utf16len(src_string);
+    UTF8* d_start = NULL;
+    UTF8* d_end   = d_start + 0x0fffffff;
+
+    ConversionResult r = ConvertUTF16toUTF8(&s_start,s_end,&d_start,d_end,lenientConversion,false);
+
+    if (r!=conversionOK)
+    {
+        return 0;
+    }
+
+    return (size_t) ((uintptr_t)d_start);
+}
+
+void utf16toutf8(char *dst_string,size_t dst_len,const uint16_t *src_string,size_t src_len)
+{
+    const UTF16* s_start = (const UTF16*)src_string;
+    const UTF16* s_end   = s_start + src_len;
+    UTF8* d_start = (UTF8*)dst_string;
+    UTF8* d_end   = d_start + dst_len;
+
+    ConversionResult r = ConvertUTF16toUTF8(&s_start,s_end,&d_start,d_end,lenientConversion,true);
+
+    if (r!=conversionOK)
+    {
+        *dst_string = 0;
+    }
+}
+
+void utf8toutf16(uint16_t *dst_string,size_t dst_len,const char *src_string,size_t src_len)
+{
+    if (!dst_len) return;
+
+    const UTF8* s_start = (const UTF8*)src_string;
+    const UTF8* s_end   = s_start + src_len;
+    UTF16* d_start = (UTF16*) dst_string;
+    UTF16* d_end   = d_start + dst_len;
+
+    ConversionResult r = ConvertUTF8toUTF16(&s_start,s_end,&d_start,d_end,lenientConversion,true);
+
+    if (r!=conversionOK)
+    {
+        *dst_string = 0;
+    }
+}
+
+size_t utf8toutf16len(const char *src_string)
+{
+    const UTF8* s_start = (const UTF8*)src_string;
+    const UTF8* s_end   = s_start + strlen(src_string);
+    UTF16* d_start = NULL;
+    UTF16* d_end   = d_start + 0x0fffffff;
+
+    ConversionResult r = ConvertUTF8toUTF16(&s_start,s_end,&d_start,d_end,lenientConversion,false);
+
+    if (r!=conversionOK)
+    {
+        return 0;
+    }
+
+    return (size_t) ( ((uintptr_t)d_start) / sizeof(uint16_t) );
+}
+

makemkv-oss-1.8.5.tar.gz/libmmbd/src/utf8.h Added

@@ -0,0 +1,27 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmmbd@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+size_t utf16toutf8len(const uint16_t *src_string);
+size_t utf8toutf16len(const char *src_string);
+void utf16toutf8(char *dst_string,size_t dst_len,const uint16_t *src_string,size_t src_len);
+void utf8toutf16(uint16_t *dst_string,size_t dst_len,const char *src_string,size_t src_len);
+
+

makemkv-oss-1.8.3.tar.gz/makefile.common -> makemkv-oss-1.8.5.tar.gz/makefile.common Changed

@@ -55,7 +55,7 @@
 MAKEMKVGUI_SRC=makemkvgui/src/aboutbox.cpp makemkvgui/src/client.cpp makemkvgui/src/dirselectbox.cpp \
   makemkvgui/src/logic.cpp makemkvgui/src/logtext.cpp makemkvgui/src/main.cpp makemkvgui/src/nativefiledialog.cpp \
   makemkvgui/src/mainwnd.cpp makemkvgui/src/marshall.cpp makemkvgui/src/progress.cpp makemkvgui/src/scsiinfo.cpp \
-  makemkvgui/src/settingdlg.cpp makemkvgui/src/uisync.cpp makemkvgui/src/viteminfo.cpp \
+  makemkvgui/src/settingdlg.cpp makemkvgui/src/uisync.cpp makemkvgui/src/viteminfo.cpp makemkvgui/src/margui.cpp \
   makemkvgui/src/backupdlg.cpp makemkvgui/src/lstring.cpp makemkvgui/src/notify.cpp makemkvgui/src/str/en_utf16.cpp \
   makemkvgui/src/image.cpp makemkvgui/src/abutton.cpp makemkvgui/src/lineeditk.cpp
 
@@ -68,3 +68,12 @@
   makemkvgui/src/notify_linux.cpp makemkvgui/src/image_linux.cpp \
   tmp/image_data.o
 
+LIBMMBD_INC=-Ilibmmbd/inc
+
+LIBMMBD_SRC=makemkvgui/src/client.cpp makemkvgui/src/marshall.cpp libmmbd/src/marmmbd.cpp libmmbd/src/nstring.cpp \
+  libmmbd/src/mmbd.cpp libmmbd/src/mmconn.cpp libmmbd/src/mmbdipc.cpp libmmbd/src/utf8.cpp libmmbd/src/aacs.cpp \
+  libmmbd/src/bdplus.cpp libmmbd/src/crypto_ossl.cpp
+
+LIBMMBD_SRC_LINUX=makemkvgui/src/api_posix.cpp makemkvgui/src/api_linux.cpp makemkvgui/src/sem_posix.cpp \
+  makemkvgui/src/spawn_posix.cpp
+

makemkv-oss-1.8.3.tar.gz/makefile.linux -> makemkv-oss-1.8.5.tar.gz/makefile.linux Changed

@@ -16,7 +16,7 @@
 LIBDIR=${PREFIX}/lib
 
 
-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
+all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv out/libmmbd.so.0
 	@echo "type \"sudo make -f makefile.linux install\" to install"
 
 clean:
@@ -25,6 +25,7 @@
 install: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
 	install -D -m 644 out/libdriveio.so.0 $(DESTDIR)$(LIBDIR)/libdriveio.so.0
 	install -D -m 644 out/libmakemkv.so.1 $(DESTDIR)$(LIBDIR)/libmakemkv.so.1
+	install -D -m 644 out/libmmbd.so.0 $(DESTDIR)$(LIBDIR)/libmmbd.so.0
 ifndef DESTDIR
 	ldconfig
 endif
@@ -55,6 +56,13 @@
 	-fPIC -Xlinker -dy -Xlinker --version-script=libmakemkv/src/libmakemkv.vers \
 	-Xlinker -soname=libmakemkv.so.1 -lc -lstdc++ -lcrypto -lz -lexpat
 
+out/libmmbd.so.0.full:
+	mkdir -p out
+	$(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
+	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
+	-fPIC -Xlinker -dy -Xlinker --version-script=libmmbd/src/libmmbd.vers \
+	-Xlinker -soname=libmmbd.so.0 -lc -lstdc++ -lrt -lpthread -lcrypto
+
 out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h
 	mkdir -p out
 	$(GCC) $(CXXOPTS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \

makemkv-oss-1.8.3.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.8.5.tar.gz/makemkvgui/inc/lgpl/apdefs.h Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.8.5.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

@@ -77,8 +77,7 @@
     uint8_t     abort_nomem;
     uint8_t     exit;
     uint8_t     pad0[1];
-    uint32_t    counter;
-    uint32_t    pad1[3];
+    uint32_t    pad1[4];
     uint64_t    args[32];
     utf16_t     strbuf[32768];
 } ALIGN_PACKED AP_SHMEM;
@@ -131,6 +130,10 @@
     apCallGetProfileString,
     apCallSetUiItemInfo,
     apCallSetProfile,
+    apCallInitMMBD,
+    apCallOpenMMBD,
+    apCallDiscInfoMMBD,
+    apCallDecryptUnitMMBD,
 
     apBackEnterJobMode=192,
     apBackLeaveJobMode,
@@ -154,8 +157,8 @@
     apUnknown
 } AP_CMD;
 
-#define AP_CRE_VER "C0011"
-#define AP_GUI_VER "G0011"
+#define AP_CRE_VER "C0012"
+#define AP_GUI_VER "G0012"
 
 typedef uint32_t AP_DiskFsFlags;
 typedef uint32_t AP_DriveState;
@@ -169,7 +172,7 @@
 
 class AP_UiItem
 {
-    friend class CApClient;
+    friend class CGUIApClient;
 public:
     static const unsigned int   AP_ItemMaxCount = 64;
     static const unsigned int   BmpBitsPerItem = 32;
@@ -221,7 +224,7 @@
 
 class AP_UiTitle : public AP_UiItem
 {
-    friend class CApClient;
+    friend class CGUIApClient;
 private:
     AP_UiItem               m_ChaptersContainer;
     std::vector<AP_UiItem>  m_Tracks;
@@ -251,7 +254,7 @@
 
 class AP_UiTitleCollection : public AP_UiItem
 {
-    friend class CApClient;
+    friend class CGUIApClient;
 private:
     std::vector<AP_UiTitle> m_Titles;
 public:
@@ -259,7 +262,7 @@
 public:
     unsigned int GetCount()
     {
-        return (unsigned int) m_Titles.size();
+        return (unsigned int)m_Titles.size();
     }
     AP_UiTitle* GetTitle(unsigned int Index)
     {
@@ -300,51 +303,77 @@
     AP_CMD FatalCommError();
 public:
     bool EnableDebug(const char* LogName);
-    bool Init(char Type,const char* AppName);
+    bool Init(char Type,const char* AppName,unsigned int* Code);
     void SetUiNotifier(CApClient::INotifier* Notifier);
     CApClient();
     void AppExiting();
 public:
-    AP_UiTitleCollection    m_TitleCollection;
-public:
     void SignalExit();
     void CancelAllJobs();
     void OnIdle();
-    void UpdateCounter();
+    bool UpdateAvailableDrives();
+    bool CloseDisk(unsigned int EjectEd);
+    int GetSettingInt(ApSettingId id);
+    const utf16_t* GetSettingString(ApSettingId id);
+    void SetSettingInt(ApSettingId id,int Value);
+    void SetSettingString(ApSettingId id,const utf16_t* Value);
+    bool SaveSettings();
+    const utf16_t* GetAppString(unsigned int Id);
+private:
+    virtual void SetTitleCollInfo(uint64_t handle,unsigned int Count)=0;
+    virtual void SetTitleInfo(unsigned int id,uint64_t handle,unsigned int TrackCount,unsigned int ChapterCount,uint64_t chap_handle)=0;
+    virtual void SetTrackInfo(unsigned int id,unsigned int trkid,uint64_t handle)=0;
+    virtual void SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle)=0;
+private:
+    void DebugFailRoutine(uintptr_t arg0,const char* arg1,int line);
+    void DebugOut(const char* string);
+};
+#define DebugFail(arg0,arg1) DebugFailRoutine(arg0,arg1,__LINE__)
 
+class CGUIApClient : public CApClient
+{
+public:
+    AP_UiTitleCollection    m_TitleCollection;
+private:
+    void SetTitleCollInfo(uint64_t handle,unsigned int Count);
+    void SetTitleInfo(unsigned int id,uint64_t handle,unsigned int TrackCount,unsigned int ChapterCount,uint64_t chap_handle);
+    void SetTrackInfo(unsigned int id,unsigned int trkid,uint64_t handle);
+    void SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle);
+public:
     void SetOutputFolder(const utf16_t *Name);
-
-    bool UpdateAvailableDrives();
     bool OpenFile(const utf16_t* FileName);
     bool OpenCdDisk(unsigned int Id);
     bool OpenTitleCollection(const utf16_t* Source);
-    bool CloseDisk(unsigned int EjectEd);
     bool EjectDisk(unsigned int Id);
     bool SaveAllSelectedTitlesToMkv();
     bool StartStreaming();
     bool BackupDisc(unsigned int Id,const utf16_t* Folder,uint32_t Flags);
-    int GetSettingInt(ApSettingId id);
-    const utf16_t* GetSettingString(ApSettingId id);
-    void SetSettingInt(ApSettingId id,int Value);
-    void SetSettingString(ApSettingId id,const utf16_t* Value);
-    bool SaveSettings();
-    const utf16_t* GetAppString(unsigned int Id);
     bool GetInterfaceLanguage(unsigned int Id,utf16_t** Name,uint64_t** Param);
     const void* GetInterfaceLanguageData(unsigned int Id,unsigned int* Size1,unsigned int* Size2);
     const utf16_t* GetProfileString(unsigned int Index,unsigned int Id);
     int SetProfile(unsigned int Index);
+};
+
+class CMMBDApClient : public CApClient
+{
+public:
+    unsigned int            m_TitleCount;
 private:
     void SetTitleCollInfo(uint64_t handle,unsigned int Count);
     void SetTitleInfo(unsigned int id,uint64_t handle,unsigned int TrackCount,unsigned int ChapterCount,uint64_t chap_handle);
     void SetTrackInfo(unsigned int id,unsigned int trkid,uint64_t handle);
     void SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle);
-    void DebugFailRoutine(uintptr_t arg0,const char* arg1,int line);
-    void DebugOut(const char* string);
+public:
+    bool InitMMBD(const uint16_t* argp[]);
+    bool OpenMMBD(const utf16_t* Source);
+    const uint8_t* DiscInfoMMBD(uint32_t *Flags,uint8_t *BusKey,uint8_t *DiscId,uint32_t *MkbVersion,uint32_t* ClipCount);
+    const uint8_t* DecryptUnitMMBD(uint32_t NameFlags,uint32_t* ClipInfo,uint64_t FileOffset,const uint8_t* Data,unsigned int Size);
 };
-#define DebugFail(arg0,arg1) DebugFailRoutine(arg0,arg1,__LINE__)
 
 
+#ifndef AP_SEM_TIMEOUT
 #define AP_SEM_TIMEOUT 29
+#endif
 
 //
 // API
@@ -356,12 +385,13 @@
 bool ApSemDec(AP_SGRP *sgrp,uintptr_t sid);
 uintptr_t ApDebugOpen(const char* name);
 void ApDebugOut(uintptr_t file,const char* string);
+int ApCreatePipe(uint64_t* data);
 
 //
 // UI
 //
 extern const utf16_t* AppGetString(unsigned int code);
-extern bool AppGetInterfaceLanguageData(CApClient* app);
+extern bool AppGetInterfaceLanguageData(CGUIApClient* app);
 
 #define AP_UI_STRING(msg) AppGetString(msg)

makemkv-oss-1.8.3.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.8.5.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/aboutbox.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/aboutbox.cpp Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/api_linux.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/api_linux.cpp Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/api_posix.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/api_posix.cpp Changed

@@ -15,6 +15,7 @@
 #include <lgpl/aproxy.h>
 #include <lgpl/smem.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -25,39 +26,85 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <lgpl/sysabi.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+const char* const* ApGetAppLocations();
+
+static mode_t mstat(const char* path)
+{
+    struct stat buf;
+
+    if (stat(path,&buf)!=0) return 0;
+    return buf.st_mode;
+}
 
 int ApSpawnApp(const char* verstr,const char* AppName,char* response,size_t responselength)
 {
     int     pipe_fd[2],err;
     char    app_path[1024+32];
     char*   argv[4];
-    char*   p;
     char    str_guiserver[sizeof("guiserver")+2];
     char    str_apver[8];
-    int     app_len;
 
     if (pipe(pipe_fd))
     {
         return errno|0x80000000;
     }
 
-    app_len = SYS_posix_getmyname(app_path,(int)(sizeof(app_path)-1));
-    if (app_len<=0)
+    if (AppName[0]==':')
     {
-        return -2;
-    }
-    app_path[app_len]=0;
-    p=app_path+app_len;
-    while(p!=app_path)
-    {
-        if(*p=='/')
+        bool app_found = false;
+        const char* const* app_locations = ApGetAppLocations();
+        const char* p_env = getenv("MAKEMKVCON");
+
+        AppName++;
+
+        if (p_env!=NULL)
+        {
+            strcpy(app_path,p_env);
+            app_found = true;
+        } else {
+            for (size_t i=0;app_locations[i]!=NULL;i++)
+            {
+                strcpy(app_path,app_locations[i]);
+                strcat(app_path,"/");
+                strcat(app_path,AppName);
+
+                if ( (mstat(app_path)&(S_IFREG|S_IXUSR|S_IXGRP|S_IXOTH)) ==
+                    (S_IFREG|S_IXUSR|S_IXGRP|S_IXOTH) )
+                {
+                    app_found = true;
+                    break;
+                }
+            }
+        }
+        if (app_found==false)
         {
-            p++;
-            break;
+            return -4;
         }
-        p--;
+    } else {
+        char*   p;
+        int     app_len;
+
+        app_len = SYS_posix_getmyname(app_path,(int)(sizeof(app_path)-1));
+        if (app_len<=0)
+        {
+            return -2;
+        }
+        app_path[app_len]=0;
+        p=app_path+app_len;
+        while(p!=app_path)
+        {
+            if(*p=='/')
+            {
+                p++;
+                break;
+            }
+            p--;
+        }
+        strcpy(p,AppName);
     }
-    strcpy(p,AppName);
 
     strcpy(str_guiserver,"guiserver");
     strcpy(str_apver,verstr);
@@ -168,3 +215,18 @@
     }
 }
 
+int ApCreatePipe(uint64_t* data)
+{
+    int fd[2];
+
+    if (pipe(fd)!=0)
+    {
+        return errno | 0x80000000;
+    }
+
+    data[0]=fd[0];
+    data[1]=fd[1];
+
+    return 0;
+}
+

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/client.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/client.cpp Changed

@@ -62,13 +62,16 @@
     return false;
 }
 
-bool CApClient::Init(char Type,const char* AppName)
+bool CApClient::Init(char Type,const char* AppName,unsigned int* Code)
 {
     char *p;
     const char *args[2];
     const char *verstr= NULL;
     int error;
     char response[512];
+    uint64_t pipeh[2];
+
+    *Code = 0;
 
     switch(Type)
     {
@@ -82,10 +85,17 @@
         return false;
     }
 
+    if (0!=(error=ApCreatePipe(pipeh)))
+    {
+        DebugFail(error,NULL);
+        return false;
+    }
+
     error = ApSpawnApp(verstr,AppName,response,512);
     if (error!=0)
     {
         DebugFail(error,NULL);
+        *Code = 1;
         return false;
     }
 
@@ -97,6 +107,7 @@
     {
         DebugFail(0,verstr);
         DebugFail(0,args[0]);
+        *Code = 2;
         return false;
     }
 
@@ -113,6 +124,8 @@
         return false;
     }
 
+    m_mem->args[24]=pipeh[0];
+    m_mem->args[25]=pipeh[1];
     m_mem->start=1;
     m_shutdown = false;
 
@@ -311,11 +324,3 @@
     ApDebugOut(m_debug,buffer);
 }
 
-void CApClient::UpdateCounter()
-{
-    if (m_mem)
-    {
-        ++m_mem->counter;
-    }
-}
-

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/lstring.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/lstring.cpp Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/main.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/main.cpp Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/mainwnd.cpp Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.8.5.tar.gz/makemkvgui/src/margui.cpp Added

@@ -0,0 +1,371 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com>
+
+    You may use this file in accordance with the end user license
+    agreement provided with the Software. For licensing terms and
+    conditions see License.txt
+
+    This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+    OF ANY KIND, either express or implied. See the License.txt for
+    the specific language governing rights and limitations.
+
+*/
+#include <lgpl/aproxy.h>
+#include <strings.h>
+
+void CGUIApClient::SetOutputFolder(const utf16_t *Name)
+{
+    memcpy((void*)m_mem->strbuf,Name,(utf16len(Name)+1)*sizeof(utf16_t));
+    ExecCmd(apCallSetOutputFolder);
+}
+
+bool CGUIApClient::OpenFile(const utf16_t* FileName)
+{
+    memcpy((void*)m_mem->strbuf,FileName,(utf16len(FileName)+1)*sizeof(utf16_t));
+    ExecCmd(apCallOpenFile);
+    return (m_mem->args[0]!=0);
+}
+
+bool CGUIApClient::OpenTitleCollection(const utf16_t* Source)
+{
+    memcpy((void*)m_mem->strbuf,Source,(utf16len(Source)+1)*sizeof(utf16_t));
+    ExecCmd(apCallOpenTitleCollection);
+    return (m_mem->args[0]!=0);
+}
+
+bool CGUIApClient::OpenCdDisk(unsigned int Id)
+{
+    m_mem->args[0]=Id;
+    ExecCmd(apCallOpenCdDisk);
+    return (m_mem->args[0]!=0);
+}
+
+bool CGUIApClient::EjectDisk(unsigned int Id)
+{
+    m_mem->args[0]=Id;
+    ExecCmd(apCallEjectDisk);
+    return (m_mem->args[0]!=0);
+}
+
+bool CGUIApClient::SaveAllSelectedTitlesToMkv()
+{
+    ExecCmd(apCallSaveAllSelectedTitlesToMkv);
+    return (m_mem->args[0]!=0);
+}
+
+bool CGUIApClient::StartStreaming()
+{
+    ExecCmd(apCallStartStreaming);
+    return (m_mem->args[0]!=0);
+}
+
+bool CGUIApClient::BackupDisc(unsigned int Id,const utf16_t* Folder,uint32_t Flags)
+{
+    m_mem->args[0]=Id;
+    m_mem->args[1]=Flags;
+    memcpy((void*)m_mem->strbuf,Folder,(utf16len(Folder)+1)*sizeof(utf16_t));
+    ExecCmd(apCallBackupDisc);
+    return (m_mem->args[0]!=0);
+}
+
+void AP_UiItem::syncFlags()
+{
+    if (!isset(&m_flags,7))
+    {
+        m_client->m_mem->args[0] = m_handle;
+        m_client->ExecCmd(apCallGetUiItemState);
+        m_flags = (bmp_type_t)(m_client->m_mem->args[0]) | 0x80;
+    }
+}
+
+void AP_UiItem::set_Flag(unsigned int Index,bool State)
+{
+    uint32_t oldFlags;
+
+    syncFlags();
+
+    oldFlags = m_flags;
+
+    if (State)
+    {
+        setone(&m_flags,Index);
+    } else {
+        setzero(&m_flags,Index);
+    }
+    if (oldFlags != m_flags)
+    {
+        m_client->m_mem->args[0] = m_handle;
+        m_client->m_mem->args[1] = m_flags;
+        m_client->ExecCmd(apCallSetUiItemState);
+    }
+}
+
+bool AP_UiItem::get_Enabled()
+{
+    syncFlags();
+    return isset(&m_flags,0);
+}
+
+bool AP_UiItem::get_Expanded()
+{
+    syncFlags();
+    return isset(&m_flags,1);
+}
+
+void AP_UiItem::set_Enabled(bool State)
+{
+    set_Flag(0,State);
+}
+
+void AP_UiItem::set_Expanded(bool State)
+{
+    set_Flag(1,State);
+}
+
+bool AP_UiItem::isset(bmp_type_t bmp[],unsigned int Index)
+{
+    return ((bmp[Index/BmpBitsPerItem]&(1<<(Index%BmpBitsPerItem)))!=0);
+}
+
+void AP_UiItem::setone(bmp_type_t bmp[],unsigned int Index)
+{
+    bmp[Index/BmpBitsPerItem] |= (1<<(Index%BmpBitsPerItem));
+}
+
+void AP_UiItem::setzero(bmp_type_t bmp[],unsigned int Index)
+{
+    bmp[Index/BmpBitsPerItem] |= (1<<(Index%BmpBitsPerItem));
+    bmp[Index/BmpBitsPerItem] ^= (1<<(Index%BmpBitsPerItem));
+}
+
+AP_UiItem::AP_UiItem()
+{
+    bzero(m_infos_alloc,sizeof(m_infos_alloc));
+    Clear();
+}
+
+AP_UiItem::AP_UiItem(const AP_UiItem&)
+{
+    bzero(m_infos_alloc,sizeof(m_infos_alloc));
+    Clear();
+}
+
+AP_UiItem::~AP_UiItem()
+{
+    Clear();
+}
+
+void AP_UiItem::Clear()
+{
+    for (unsigned int i=0;i<ap_iaMaxValue;i++)
+    {
+        if (isset(m_infos_alloc,i))
+        {
+            delete[] m_infos[i];
+        }
+    }
+    bzero(m_infos_known,sizeof(m_infos_known));
+    bzero(m_infos_alloc,sizeof(m_infos_alloc));
+    bzero(m_infos_write,sizeof(m_infos_write));
+    bzero(m_infos_change,sizeof(m_infos_change));
+    m_flags = 0;
+}
+
+const utf16_t* AP_UiItem::GetInfo(AP_ItemAttributeId Id)
+{
+    if (isset(m_infos_known,Id)) return m_infos[Id];
+
+    m_client->m_mem->args[0]=m_handle;
+    m_client->m_mem->args[1]=Id;
+    m_client->ExecCmd(apCallGetUiItemInfo);
+    setone(m_infos_known,Id);
+    if (0!=m_client->m_mem->args[0])
+    {
+        m_infos[Id]=(utf16_t*)AppGetString((unsigned long)m_client->m_mem->args[0]);
+        setzero(m_infos_alloc,Id);
+    } else {
+        if (0==m_client->m_mem->args[1])
+        {
+            m_infos[Id]=NULL;
+            setzero(m_infos_alloc,Id);
+        } else {
+            size_t len = utf16len((utf16_t*)m_client->m_mem->strbuf);
+            m_infos[Id]=new utf16_t[len+1];
+            memcpy(m_infos[Id],(void*)m_client->m_mem->strbuf,(len+1)*sizeof(utf16_t));
+            setone(m_infos_alloc,Id);
+        }
+    }

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/marshall.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/marshall.cpp Changed

@@ -31,39 +31,12 @@
     ExecCmd(apCallOnIdle);
 }
 
-void CApClient::SetOutputFolder(const utf16_t *Name)
-{
-    memcpy((void*)m_mem->strbuf,Name,(utf16len(Name)+1)*sizeof(utf16_t));
-    ExecCmd(apCallSetOutputFolder);
-}
-
 bool CApClient::UpdateAvailableDrives()
 {
     ExecCmd(apCallUpdateAvailableDrives);
     return (m_mem->args[0]!=0);
 }
 
-bool CApClient::OpenFile(const utf16_t* FileName)
-{
-    memcpy((void*)m_mem->strbuf,FileName,(utf16len(FileName)+1)*sizeof(utf16_t));
-    ExecCmd(apCallOpenFile);
-    return (m_mem->args[0]!=0);
-}
-
-bool CApClient::OpenTitleCollection(const utf16_t* Source)
-{
-    memcpy((void*)m_mem->strbuf,Source,(utf16len(Source)+1)*sizeof(utf16_t));
-    ExecCmd(apCallOpenTitleCollection);
-    return (m_mem->args[0]!=0);
-}
-
-bool CApClient::OpenCdDisk(unsigned int Id)
-{
-    m_mem->args[0]=Id;
-    ExecCmd(apCallOpenCdDisk);
-    return (m_mem->args[0]!=0);
-}
-
 bool CApClient::CloseDisk(unsigned int EjectId)
 {
     m_mem->args[0]=EjectId;
@@ -71,286 +44,6 @@
     return (m_mem->args[0]!=0);
 }
 
-bool CApClient::EjectDisk(unsigned int Id)
-{
-    m_mem->args[0]=Id;
-    ExecCmd(apCallEjectDisk);
-    return (m_mem->args[0]!=0);
-}
-
-bool CApClient::SaveAllSelectedTitlesToMkv()
-{
-    ExecCmd(apCallSaveAllSelectedTitlesToMkv);
-    return (m_mem->args[0]!=0);
-}
-
-bool CApClient::StartStreaming()
-{
-    ExecCmd(apCallStartStreaming);
-    return (m_mem->args[0]!=0);
-}
-
-bool CApClient::BackupDisc(unsigned int Id,const utf16_t* Folder,uint32_t Flags)
-{
-    m_mem->args[0]=Id;
-    m_mem->args[1]=Flags;
-    memcpy((void*)m_mem->strbuf,Folder,(utf16len(Folder)+1)*sizeof(utf16_t));
-    ExecCmd(apCallBackupDisc);
-    return (m_mem->args[0]!=0);
-}
-
-void AP_UiItem::syncFlags()
-{
-    if (!isset(&m_flags,7))
-    {
-        m_client->m_mem->args[0] = m_handle;
-        m_client->ExecCmd(apCallGetUiItemState);
-        m_flags = (bmp_type_t)(m_client->m_mem->args[0]) | 0x80;
-    }
-}
-
-void AP_UiItem::set_Flag(unsigned int Index,bool State)
-{
-    uint32_t oldFlags;
-
-    syncFlags();
-
-    oldFlags = m_flags;
-
-    if (State)
-    {
-        setone(&m_flags,Index);
-    } else {
-        setzero(&m_flags,Index);
-    }
-    if (oldFlags != m_flags)
-    {
-        m_client->m_mem->args[0] = m_handle;
-        m_client->m_mem->args[1] = m_flags;
-        m_client->ExecCmd(apCallSetUiItemState);
-    }
-}
-
-bool AP_UiItem::get_Enabled()
-{
-    syncFlags();
-    return isset(&m_flags,0);
-}
-
-bool AP_UiItem::get_Expanded()
-{
-    syncFlags();
-    return isset(&m_flags,1);
-}
-
-void AP_UiItem::set_Enabled(bool State)
-{
-    set_Flag(0,State);
-}
-
-void AP_UiItem::set_Expanded(bool State)
-{
-    set_Flag(1,State);
-}
-
-bool AP_UiItem::isset(bmp_type_t bmp[],unsigned int Index)
-{
-    return ((bmp[Index/BmpBitsPerItem]&(1<<(Index%BmpBitsPerItem)))!=0);
-}
-
-void AP_UiItem::setone(bmp_type_t bmp[],unsigned int Index)
-{
-    bmp[Index/BmpBitsPerItem] |= (1<<(Index%BmpBitsPerItem));
-}
-
-void AP_UiItem::setzero(bmp_type_t bmp[],unsigned int Index)
-{
-    bmp[Index/BmpBitsPerItem] |= (1<<(Index%BmpBitsPerItem));
-    bmp[Index/BmpBitsPerItem] ^= (1<<(Index%BmpBitsPerItem));
-}
-
-AP_UiItem::AP_UiItem()
-{
-    bzero(m_infos_alloc,sizeof(m_infos_alloc));
-    Clear();
-}
-
-AP_UiItem::AP_UiItem(const AP_UiItem&)
-{
-    bzero(m_infos_alloc,sizeof(m_infos_alloc));
-    Clear();
-}
-
-AP_UiItem::~AP_UiItem()
-{
-    Clear();
-}
-
-void AP_UiItem::Clear()
-{
-    for (unsigned int i=0;i<ap_iaMaxValue;i++)
-    {
-        if (isset(m_infos_alloc,i))
-        {
-            delete[] m_infos[i];
-        }
-    }
-    bzero(m_infos_known,sizeof(m_infos_known));
-    bzero(m_infos_alloc,sizeof(m_infos_alloc));
-    bzero(m_infos_write,sizeof(m_infos_write));
-    bzero(m_infos_change,sizeof(m_infos_change));
-    m_flags = 0;
-}
-
-const utf16_t* AP_UiItem::GetInfo(AP_ItemAttributeId Id)
-{
-    if (isset(m_infos_known,Id)) return m_infos[Id];
-
-    m_client->m_mem->args[0]=m_handle;
-    m_client->m_mem->args[1]=Id;
-    m_client->ExecCmd(apCallGetUiItemInfo);
-    setone(m_infos_known,Id);
-    if (0!=m_client->m_mem->args[0])
-    {
-        m_infos[Id]=(utf16_t*)AppGetString((unsigned long)m_client->m_mem->args[0]);
-        setzero(m_infos_alloc,Id);
-    } else {
-        if (0==m_client->m_mem->args[1])
-        {
-            m_infos[Id]=NULL;
-            setzero(m_infos_alloc,Id);
-        } else {
-            size_t len = utf16len((utf16_t*)m_client->m_mem->strbuf);
-            m_infos[Id]=new utf16_t[len+1];
-            memcpy(m_infos[Id],(void*)m_client->m_mem->strbuf,(len+1)*sizeof(utf16_t));
-            setone(m_infos_alloc,Id);
-        }
-    }
-    if (m_client->m_mem->args[2])

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/settingdlg.cpp -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/settingdlg.cpp Changed

makemkv-oss-1.8.3.tar.gz/makemkvgui/src/settingdlg.h -> makemkv-oss-1.8.5.tar.gz/makemkvgui/src/settingdlg.h Changed

Changes of Revision 22