Request 5470 (accepted)

Overview

Request 5470 (accepted)

- Update to version 1.16.5
* Miscellaneous UI improvements
* WinCDArb update, fixes occasional "no optical drives" error
* LibMMBD stability improvements
* Many small bug-fixes

Created by manfred.h about 3 years ago
In state accepted
Package maintainers: manfred-h and microchip8

Submit MakeMKV

Submit package home:manfred.h / MakeMKV to package Multimedia / MakeMKV

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.16.4.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.16.5.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.16.4.tar.gz/bin/arm64/makemkvcon -> makemkv-bin-1.16.5.tar.gz/bin/arm64/makemkvcon Changed

makemkv-bin-1.16.4.tar.gz/bin/armel/makemkvcon -> makemkv-bin-1.16.5.tar.gz/bin/armel/makemkvcon Changed

makemkv-bin-1.16.4.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.16.5.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.16.4.tar.gz/src/share/blues.jar -> makemkv-bin-1.16.5.tar.gz/src/share/blues.jar Changed

makemkv-oss-1.16.4.tar.gz/Makefile.in -> makemkv-oss-1.16.5.tar.gz/Makefile.in Changed

makemkv-oss-1.16.4.tar.gz/libmmbd/src/aacs.cpp -> makemkv-oss-1.16.5.tar.gz/libmmbd/src/aacs.cpp Changed

@@ -20,6 +20,7 @@
 */
 #include <libmmbd/mmbd.h>
 #include "aacs.h"
+#include "aacslog.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -38,46 +39,44 @@
     is discouraged.
 */
 
-static void __cdecl stderr_print(void* user_context,uint32_t flags,const char* message,const void*)
-{
-    fprintf(stderr,"MMBD: %s\n",message);
-    fflush(stderr);
-}
-
-#ifdef MMBD_WIN32_DEBUG
-#include <Windows.h>
-static void __cdecl windbg_print(void* user_context,uint32_t flags,const char* message,const void*)
-{
-    OutputDebugStringA(message);
-    OutputDebugStringA(L"\n");
-}
+#if defined(_MSC_VER) && defined(_WIN32)
+#include <intrin.h>
+#define CALLERADDR _ReturnAddress()
+#else
+#define CALLERADDR __builtin_return_address(0)
 #endif
 
-static mmbd_output_proc_t get_output_proc()
+static mmbd_output_proc_t get_output_proc(void** p_context,void* caller)
 {
+    mmbd_output_proc_t p = NULL;
+
     if (getenv("MMBD_TRACE")) {
-        return stderr_print;
-    } else {
-#ifdef MMBD_WIN32_DEBUG
-        return windbg_print;
-#else
-        return NULL;
-#endif
+        p = aacs_log_stderr();
+        if (NULL != p) return p;
     }
+
+    p = aacs_log_jriver(p_context);
+    if (NULL != p) return p;
+
+    p = aacs_log_libbluray(p_context,caller);
+    if (NULL != p) return p;
+
+    p = aacs_log_windbg();
+    if (NULL != p) return p;
+
+    return NULL;
 }
 
 AACS_PUBLIC AACS * __cdecl aacs_init(void)
 {
-    MMBD* mmbd = mmbd_create_context(NULL,get_output_proc(),NULL);
+    void* caller = CALLERADDR;
+    void* out_ctx = NULL;
+    mmbd_output_proc_t out_proc = get_output_proc(&out_ctx, caller);
+    MMBD* mmbd = mmbd_create_context(out_ctx, out_proc, NULL);
     return (AACS*)mmbd;
 }
 
-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)
+static AACS * __cdecl aacs_open(const char *path, const char *keyfile_path, int *error_code,void* caller)
 {
     const char* args[3];
     const char** p_args;
@@ -92,7 +91,10 @@
         p_args = NULL;
     }
 
-    mmbd = mmbd_create_context(NULL,get_output_proc(),p_args);
+    void* out_ctx = NULL;
+    mmbd_output_proc_t out_proc = get_output_proc(&out_ctx, caller);
+
+    mmbd = mmbd_create_context(out_ctx,out_proc,p_args);
     if (mmbd) {
         if (error_code) *error_code=AACS_SUCCESS;
     } else {
@@ -110,6 +112,18 @@
     return (AACS*)mmbd;
 }
 
+AACS_PUBLIC AACS * __cdecl aacs_open2(const char *path, const char *keyfile_path, int *error_code)
+{
+    void* caller = CALLERADDR;
+    return aacs_open(path, keyfile_path, error_code, caller);
+}
+
+AACS_PUBLIC AACS * __cdecl aacs_open(const char *path, const char *keyfile_path)
+{
+    void* caller = CALLERADDR;
+    return aacs_open(path, keyfile_path, NULL, caller);
+}
+
 static int __cdecl mmbd_aacs_read_file(void** user_data,const char* file_path,uint8_t* buffer,uint64_t offset,unsigned int size)
 {
     void*           handle;
@@ -145,6 +159,10 @@
 {
     int err;
 
+    if (NULL == aacs) {
+        return AACS_ERROR_MMC_OPEN;
+    }
+
     if (keyfile_path) {
         const char* args[3];
 
@@ -155,8 +173,7 @@
             return AACS_ERROR_NO_CONFIG;
         }
     }
-    if (NULL==path)
-    {
+    if (NULL==path) {
         err = mmbd_open_autodiscover((MMBD*)aacs,mmbd_aacs_read_file);
     } else {
         err = mmbd_open((MMBD*)aacs,path);
@@ -244,8 +261,10 @@
 AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, AACS_FILE_OPEN2 p)
 {
     void** p_user_data = mmbd_user_data((MMBD*)aacs);
-    p_user_data[0] = handle;
-    p_user_data[1] = (void*)p;
+    if (NULL != p_user_data) {
+        p_user_data[0] = handle;
+        p_user_data[1] = (void*)p;
+    }
 }
 
 static AACS_FILE_OPEN file_open = NULL;

makemkv-oss-1.16.5.tar.gz/libmmbd/src/aacslog.cpp Added

@@ -0,0 +1,259 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2021 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 <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <lgpl/utf8.h>
+#include <alloca.h>
+#include "aacslog.h"
+#include "fakejni.h"
+
+//
+// stderr logger
+//
+static void __cdecl stderr_print(void* user_context, uint32_t flags, const char* message, const void*)
+{
+    fprintf(stderr, "MMBD: %s\n", message);
+    fflush(stderr);
+}
+
+mmbd_output_proc_t aacs_log_stderr()
+{
+    return stderr_print;
+}
+
+//
+// windbg logger
+//
+#ifdef MMBD_WIN32_DEBUG
+#include <Windows.h>
+static void __cdecl windbg_print(void* user_context, uint32_t flags, const char* message, const void*)
+{
+    OutputDebugStringA(message);
+    OutputDebugStringA("\n");
+}
+mmbd_output_proc_t aacs_log_windbg()
+{
+    return stderr_print;
+}
+#else
+mmbd_output_proc_t aacs_log_windbg()
+{
+    return NULL;
+}
+#endif
+
+//
+// Dll access
+//
+#ifdef _WIN32
+
+#include <Windows.h>
+
+static void* GetDllByAddr(void* caller)
+{
+    MEMORY_BASIC_INFORMATION mi;
+
+    bzero(&mi, sizeof(mi));
+    if (0 == VirtualQuery(caller, &mi, sizeof(mi))) {
+        return NULL;
+    }
+    return mi.AllocationBase;
+}
+
+static inline void* GetDllByName(const char* name)
+{
+    return GetModuleHandleA(name);
+}
+
+static inline void* GetFunctionByName(void* dll, const char* name)
+{
+    return GetProcAddress((HMODULE)dll, name);
+}
+
+#else
+
+#include <dlfcn.h>
+
+static void* GetDllByName(const char* name)
+{
+    void* p = dlopen(name, RTLD_NOLOAD);
+    if (NULL != p) {
+        dlclose(p);
+    }
+    return p;
+}
+
+
+static void* GetDllByAddr(void* caller)
+{
+    Dl_info mi;
+
+    bzero(&mi, sizeof(mi));
+    if (0 == dladdr(caller, &mi)) {
+        return NULL;
+    }
+    if (NULL == mi.dli_fname) {
+        return NULL;
+    }
+    return GetDllByName(mi.dli_fname);
+}
+
+static inline void* GetFunctionByName(void* dll, const char* name)
+{
+    return dlsym(dll, name);
+}
+
+#endif
+
+//
+// JRiver logger
+//
+
+typedef int (__cdecl *JRLogExternal_t)(const uint16_t* strAction, const uint16_t* strLogOutput);
+
+#ifdef _WIN32
+
+static void __cdecl jriver_print(void* user_context, uint32_t flags, const char* message, const void*)
+{
+    size_t slen = strlen(message);
+    size_t wlen = utf8toutf16len(message);
+
+    uint16_t*   wbuf;
+    void*       fbuf;
+    if (wlen < 256)
+    {
+        wbuf = (uint16_t*)alloca((wlen + 1) * sizeof(uint16_t*));
+        fbuf = NULL;
+    } else {
+        wbuf = (uint16_t*)malloc((wlen + 1) * sizeof(uint16_t*));
+        if (NULL == wbuf) return;
+        fbuf = wbuf;
+    }
+
+    size_t clen = utf8toutf16(wbuf, wlen, message, slen);
+    wbuf[clen] = 0;
+    wbuf[wlen] = 0;
+    const uint16_t* tag;
+    switch (flags&(MMBD_MESSAGE_FLAG_WARNING|MMBD_MESSAGE_FLAG_ERROR|MMBD_MESSAGE_FLAG_MMBD_ERROR))
+    {
+    case MMBD_MESSAGE_FLAG_WARNING: tag = (const uint16_t*)L"libmmbd_warning"; break;
+    case MMBD_MESSAGE_FLAG_ERROR:
+    case MMBD_MESSAGE_FLAG_MMBD_ERROR: tag = (const uint16_t*)L"libmmbd_error"; break;
+    default: tag = (const uint16_t*)L"libmmbd_info"; break;
+    }
+
+    JRLogExternal_t JRLogExternal = (JRLogExternal_t)user_context;
+
+    (*JRLogExternal)(tag, wbuf);
+
+    if (NULL!=fbuf) free(fbuf);
+}
+
+mmbd_output_proc_t aacs_log_jriver(void** p_context)
+{
+    void* dll = GetDllByName("JRTools.dll");
+    if (NULL == dll) return NULL;
+
+    void* func = GetFunctionByName(dll, "JRLogExternal");
+
+    if (NULL == func) {
+        return NULL;
+    }
+
+    *p_context = func;
+    return jriver_print;
+}
+
+#else
+
+mmbd_output_proc_t aacs_log_jriver(void** p_context)
+{
+    return NULL;
+}
+
+#endif
+
+//
+// libbluray logger
+//
+// This is a (stable) hack that should be removed once libbluray would call mmbd_create_context in place of aacs_init
+//
+
+typedef void (JNICALL *Java_org_videolan_Logger_logN_t)(JNIEnv *env, void* cls, jboolean error, jstring jfile, jint line, jstring string);
+
+static jsize JNICALL jniGetStringLength(JNIEnv *, jstring str)
+{
+    return (jsize)strlen(str);
+}
+
+static const char* JNICALL jniGetStringUTFChars(JNIEnv *, jstring str, jboolean *isCopy)
+{
+    if (NULL != isCopy) *isCopy = 0;
+    return str;
+}
+
+static void JNICALL jniReleaseStringUTFChars(JNIEnv *, jstring , const char* )
+{
+}
+
+static void __cdecl libbluray_print(void* user_context, uint32_t flags, const char* message, const void*)
+{
+    jboolean error = 1; // 0;
+    if (0 != (flags & (MMBD_MESSAGE_FLAG_ERROR| MMBD_MESSAGE_FLAG_MMBD_ERROR))) error = 1;
+
+    struct JNINativeInterface_s jenv;
+
+    bzero(&jenv, sizeof(jenv));
+    jenv.GetStringLength = jniGetStringLength;
+    jenv.GetStringUTFLength = jniGetStringLength;
+    jenv.GetStringUTFChars = jniGetStringUTFChars;
+    jenv.ReleaseStringUTFChars = jniReleaseStringUTFChars;
+
+    Java_org_videolan_Logger_logN_t Java_org_videolan_Logger_logN = (Java_org_videolan_Logger_logN_t)user_context;
+
+    uintptr_t penv = ((uintptr_t)(void*)&jenv) - JNINativeInterfaceOffset;
+
+    (*Java_org_videolan_Logger_logN)(&penv, NULL, error, "LibMMBD", flags & 0x00ffffff, message);
+}
+
+mmbd_output_proc_t aacs_log_libbluray(void** p_context,void* caller)
+{
+    void* dll = GetDllByAddr(caller);
+    if (NULL == dll) return NULL;
+
+    void* func = GetFunctionByName(dll, "Java_org_videolan_Logger_logN");
+    if (NULL == func) {
+        func = GetFunctionByName(dll, "_Java_org_videolan_Logger_logN");
+    }
+    if (NULL == func) {
+        func = GetFunctionByName(dll, "Java_org_videolan_Logger_logN@24");
+    }
+
+    if (NULL == func) {
+        return NULL;
+    }
+
+    *p_context = func;
+    return libbluray_print;
+}
+

makemkv-oss-1.16.5.tar.gz/libmmbd/src/aacslog.h Added

@@ -0,0 +1,28 @@
+/*
+    libMMBD - MakeMKV BD decryption API library
+
+    Copyright (C) 2007-2021 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 <stdint.h>
+
+mmbd_output_proc_t aacs_log_stderr();
+mmbd_output_proc_t aacs_log_libbluray(void** p_context,void* caller);
+mmbd_output_proc_t aacs_log_jriver(void** p_context);
+mmbd_output_proc_t aacs_log_windbg();
+

makemkv-oss-1.16.5.tar.gz/libmmbd/src/fakejni.h Added

@@ -0,0 +1,87 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Java Runtime Interface.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation and Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 1993-1996
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef FAKEJNI_H
+#define FAKEJNI_H
+
+#include <stdint.h>
+
+#ifdef _WIN32
+#define JNICALL   __stdcall
+#else
+#define JNICALL
+#endif
+
+/*
+ * JNI Types
+ */
+
+typedef int             jint;
+typedef jint            jsize;
+typedef const char*     jstring;
+typedef unsigned char	jboolean;
+typedef uint16_t        jchar;
+
+/*
+ * JNI Native Method Interface.
+ */
+
+typedef uintptr_t JNIEnv;
+
+static const unsigned int  JNINativeInterfaceOffset = 164 * sizeof(void*);
+
+struct JNINativeInterface_s {
+
+    jsize (JNICALL *GetStringLength)
+      (JNIEnv *env, jstring str);
+    const jchar *(JNICALL *GetStringChars)
+      (JNIEnv *env, jstring str, jboolean *isCopy);
+    void (JNICALL *ReleaseStringChars)
+      (JNIEnv *env, jstring str, const jchar *chars);
+
+    jstring (JNICALL *NewStringUTF)
+      (JNIEnv *env, const char *utf);
+    jsize (JNICALL *GetStringUTFLength)
+      (JNIEnv *env, jstring str);
+    const char* (JNICALL *GetStringUTFChars)
+      (JNIEnv *env, jstring str, jboolean *isCopy);
+    void (JNICALL *ReleaseStringUTFChars)
+      (JNIEnv *env, jstring str, const char* chars);
+};
+
+#endif /* FAKEJNI_H */
+
+

makemkv-oss-1.16.4.tar.gz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.16.5.tar.gz/libmmbd/src/mmconn.cpp Changed

makemkv-oss-1.16.4.tar.gz/makefile.common -> makemkv-oss-1.16.5.tar.gz/makefile.common Changed

@@ -47,7 +47,7 @@
 MAKEMKVGUI_INC=makemkvgui/inc
 
 MAKEMKVGUI_SRC=makemkvgui/src/aboutbox.cpp makemkvgui/src/client.cpp makemkvgui/src/clt_pipe.cpp makemkvgui/src/clt_shm.cpp \
-  makemkvgui/src/clt_std.cpp makemkvgui/src/utf8.cpp makemkvgui/src/dirselectbox.cpp \
+  makemkvgui/src/clt_std.cpp makemkvgui/src/utf8.cpp makemkvgui/src/dirselectbox.cpp makemkvgui/src/regbox.cpp \
   makemkvgui/src/logic.cpp makemkvgui/src/logtext.cpp makemkvgui/src/main.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/margui.cpp \
@@ -57,7 +57,8 @@
 
 MAKEMKVGUI_GEN=\
   tmp/moc_mainwnd.cpp tmp/moc_logtext.cpp tmp/moc_dirselectbox.cpp tmp/moc_aboutbox.cpp tmp/moc_settingdlg.cpp \
-  tmp/moc_backupdlg.cpp tmp/moc_lineeditk.cpp tmp/moc_dvdbox.cpp tmp/moc_drivebox.cpp tmp/moc_toolbuttonp.cpp
+  tmp/moc_backupdlg.cpp tmp/moc_lineeditk.cpp tmp/moc_dvdbox.cpp tmp/moc_drivebox.cpp tmp/moc_toolbuttonp.cpp \
+  tmp/moc_regbox.cpp
 
 MAKEMKVGUI_SRC_LINUX=makemkvgui/src/api_posix.cpp makemkvgui/src/api_linux.cpp makemkvgui/src/sem_posix.cpp \
   makemkvgui/src/spawn_posix.cpp makemkvgui/src/logic_posix.cpp libabi/src/sys_linux.cpp makemkvgui/src/api_posix_shm.cpp \
@@ -69,7 +70,7 @@
 LIBMMBD_SRC=makemkvgui/src/client.cpp makemkvgui/src/clt_pipe.cpp makemkvgui/src/clt_std.cpp \
   makemkvgui/src/utf8.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/aacs.cpp \
-  libmmbd/src/bdplus.cpp libmmbd/src/crypto_ossl.cpp
+  libmmbd/src/bdplus.cpp libmmbd/src/crypto_ossl.cpp libmmbd/src/aacslog.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.16.4.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.16.5.tar.gz/makemkvgui/inc/lgpl/apdefs.h Changed

@@ -19,6 +19,7 @@
 static const unsigned int AP_UIMSG_BOXWARNING=1028;
 static const unsigned int AP_UIMSG_BOXYESNO=776;
 static const unsigned int AP_UIMSG_BOXYESNO_ERR=1288;
+static const unsigned int AP_UIMSG_BOXYESNO_REG=1544;
 static const unsigned int AP_UIMSG_YES=0;
 static const unsigned int AP_UIMSG_NO=1;
 static const unsigned int AP_UIMSG_DEBUG=32;
@@ -54,6 +55,7 @@
 static const unsigned int AP_vastr_ExternalAppItem=22;
 static const unsigned int AP_vastr_InterfaceLanguage=23;
 static const unsigned int AP_vastr_ProfileString=24;
+static const unsigned int AP_vastr_KeyString=25;
 //
 typedef enum _AP_ItemAttributeId
 {
@@ -156,6 +158,7 @@
 static const unsigned long APP_FOLDER_INVALID=5016;
 static const unsigned long PROGRESS_APP_SAVE_MKV_FREE_SPACE=5033;
 static const unsigned long PROT_DEMO_KEY_EXPIRED=5021;
+static const unsigned long APP_KEYTYPE_INVALID=5095;
 static const unsigned long APP_EVAL_TIME_NEVER=5067;
 static const unsigned long APP_BACKUP_FAILED=5069;
 static const unsigned long APP_BACKUP_COMPLETED=5070;
@@ -303,6 +306,10 @@
 static const unsigned long APP_IFACE_SETTINGS_TAB_INTEGRATION=6190;
 static const unsigned long APP_IFACE_SETTINGS_INT_TEXT=6191;
 static const unsigned long APP_IFACE_SETTINGS_INT_HDR_PATH=6192;
+static const unsigned long APP_IFACE_KEY_TEXT=6179;
+static const unsigned long APP_IFACE_KEY_NAME=6182;
+static const unsigned long APP_IFACE_KEY_TYPE=6183;
+static const unsigned long APP_IFACE_KEY_DATE=6184;
 static const unsigned long APP_IFACE_BACKUPDLG_TEXT_CAPTION=6137;
 static const unsigned long APP_IFACE_BACKUPDLG_TEXT=6138;
 static const unsigned long APP_IFACE_BACKUPDLG_FOLDER=6139;

makemkv-oss-1.16.4.tar.gz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.16.5.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

@@ -97,6 +97,7 @@
     apCallDecryptUnitMMBD,
     apCallSetExternAppFlags,
     apCallManageState,
+    apCallAppSetString,
 
     apBackEnterJobMode=192,
     apBackLeaveJobMode,
@@ -303,10 +304,14 @@
     void SetSettingInt(ApSettingId id,int Value);
     void SetSettingString(ApSettingId id, const utf8_t* Value);
     void SetSettingString(ApSettingId id, const utf16_t* Value);
+    void SetAppString(unsigned int id, const utf8_t* Value, unsigned int Index1 = 0, unsigned int Index2 = 0);
+    void SetAppString(unsigned int id, const utf16_t* Value, unsigned int Index1 = 0, unsigned int Index2 = 0);
+    void SetAppString(unsigned int id, size_t Size, const utf8_t* Value, unsigned int Index1 = 0, unsigned int Index2 = 0);
     bool SaveSettings();
     const utf8_t* GetAppString(unsigned int Id,unsigned int Index1=0,unsigned int Index2=0);
 private:
     void SetSettingString(ApSettingId id, size_t ValueSize);
+    void SetAppString(size_t ValueSize, unsigned int Id, unsigned int Index1, unsigned int Index2);
 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;

makemkv-oss-1.16.4.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.16.5.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.16.4.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.16.5.tar.gz/makemkvgui/src/mainwnd.cpp Changed

@@ -18,6 +18,7 @@
 #include "settingdlg.h"
 #include "backupdlg.h"
 #include "aboutbox.h"
+#include "regbox.h"
 #include "notify.h"
 #include "abutton.h"
 #include "lineeditk.h"
@@ -25,8 +26,6 @@
 #include "drivebox.h"
 #include "image_defs.h"
 
-#define AP_KEY_STRING_LEN 68
-
 MainWnd* MainWnd::m_myself_static=NULL;
 
 static const Qt::WindowFlags mainWindowFlags =
@@ -382,6 +381,11 @@
     return info.absoluteFilePath();
 }
 
+static inline QString FixFilePath(QString path)
+{
+    return path.trimmed();
+}
+
 void MainWnd::SlotBackup()
 {
     CBackupDialog dlg(m_app,mainIcon,this);
@@ -397,7 +401,7 @@
 
     if (dlg.exec()==QDialog::Accepted)
     {
-        dlg.backupDir->setText(dlg.backupDir->text(),true);
+        dlg.backupDir->setText(FixFilePath(dlg.backupDir->text()),true);
         m_app->SetSettingString(apset_path_BackupDirMRU,Utf16FromQString(dlg.backupDir->getMRU()));
         m_app->BackupDisc(ndx,Utf16FromQString(dlg.backupDir->text()),dlg.backupDecrypt);
     }
@@ -405,7 +409,7 @@
 
 void MainWnd::SlotSaveAllMkv()
 {
-    m_FileInfo.setFile(saveFolderBox->text());
+    m_FileInfo.setFile(FixFilePath(saveFolderBox->text()));
 
     QString defPath = QStringFromUtf8(m_app->GetAppString(AP_vastr_OutputFolderName));
     bool custPath = (defPath != saveFolderBox->text());
@@ -1094,22 +1098,37 @@
         return 0;
     }
 
-    if ( (Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO )
+    if (((Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO ) ||
+        ((Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO_ERR) ||
+        ((Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO_REG))
     {
         m_disable_onidle++;
-        int v=QMessageBox::question(this,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf8(Text),QMessageBox::Yes|QMessageBox::No);
-        m_disable_onidle--;
-        switch(v)
+        int v;
+        switch (Flags&AP_UIMSG_BOX_MASK)
         {
-            case QMessageBox::Yes : return AP_UIMSG_YES;
-            case QMessageBox::No  : return AP_UIMSG_NO;
-            default: return -1;
+        case AP_UIMSG_BOXYESNO:
+            v = QMessageBox::question(this, UI_QSTRING(APP_CAPTION_MSG), QStringFromUtf8(Text), QMessageBox::Yes | QMessageBox::No);
+            break;
+        case AP_UIMSG_BOXYESNO_ERR:
+            v = QMessageBox::critical(this, UI_QSTRING(APP_CAPTION_MSG), QStringFromUtf8(Text), QMessageBox::Yes | QMessageBox::No);
+            break;
+        case AP_UIMSG_BOXYESNO_REG:
+            {
+                QMessageBox mBox(QMessageBox::Question, UI_QSTRING(APP_CAPTION_MSG), QStringFromUtf8(Text), QMessageBox::Yes | QMessageBox::No, this);
+                mBox.setEscapeButton(QMessageBox::No);
+                mBox.addButton(UI_QSTRING(APP_IFACE_ACT_REGISTER_NAME).remove(QLatin1Char('&')), QMessageBox::RejectRole);
+                v=mBox.exec();
+            }
+            if (0 == v)
+            {
+                QTimer::singleShot(0, this, &MainWnd::SlotRegister);
+                v = QMessageBox::No;
+            }
+            break;
+        default:
+            v = 0;
+            break;
         }
-    }
-    if ( (Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO_ERR )
-    {
-        m_disable_onidle++;
-        int v=QMessageBox::critical(this,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf8(Text),QMessageBox::Yes|QMessageBox::No);
         m_disable_onidle--;
         switch(v)
         {
@@ -1211,58 +1230,19 @@
     m_disable_onidle--;
 }
 
-static inline char KeyBitsToChar(uint8_t c)
-{
-    if (c==0) return '_';
-    if (c<11) return '0' + (c-1);
-    if (c<38) return '@'+(c-11);
-    return 'a'+(c-38);
-}
-
-static inline uint8_t KeyIsValidChar(utf16_t c)
+void MainWnd::SlotRegister()
 {
-    if (c=='_') return true;
-    if ( (c>='0') && (c<='9') ) return true;
-    if ( (c>='@') && (c<='Z') ) return true;
-    if ( (c>='a') && (c<='z') ) return true;
-    return false;
-}
+    CRegBox box(this, mainIcon);
 
-// PLEASE, do not copy&paste this function into keygen code :)
-static inline bool KeyCheckStringCrc(const utf16_t* str)
-{
-    size_t len = utf16len(str);
+    QString reg_code;
 
-    if (len != AP_KEY_STRING_LEN )
+    if (box.exec() == QDialog::Accepted)
     {
-        return false;
+        reg_code = box.key();
     }
 
-    uint16_t crc=0;
-
-    for (unsigned int i=0;i<(AP_KEY_STRING_LEN-2);i++)
-    {
-        if ( (i>=2) && (KeyIsValidChar(str[i])==false)) return false;
-
-        crc += ((uint8_t)str[i]) & 0x7f;
-
-        crc = (uint16_t) (((crc*(11+i)))%4093);
-    }
-
-    if (KeyBitsToChar( (uint8_t) (crc&0x3f) ) != str[AP_KEY_STRING_LEN-2]) return false;
-    if (KeyBitsToChar( (uint8_t) ((crc>>6)&0x3f)) != str[AP_KEY_STRING_LEN-1]) return false;
-
-    return true;
-}
-
-void MainWnd::SlotRegister()
-{
-    bool ok = false;
     QString key_string = QStringFromUtf8(m_app->GetSettingString(apset_app_Key));
 
-    QString reg_code = QInputDialog::getText(this,UI_QSTRING(APP_CAPTION_MSG),UI_QSTRING(APP_IFACE_REGISTER_TEXT),QLineEdit::Normal,key_string,&ok);
-    if ( (false==ok) || (reg_code.isEmpty()) ) return;
-
     reg_code = reg_code.trimmed();
     if (reg_code.isEmpty()) return;

makemkv-oss-1.16.4.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.16.5.tar.gz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.16.4.tar.gz/makemkvgui/src/marshall.cpp -> makemkv-oss-1.16.5.tar.gz/makemkvgui/src/marshall.cpp Changed

@@ -89,6 +89,41 @@
     ExecCmd(apCallSetSettingString,2,ValueSize);
 }
 
+void CApClient::SetAppString(unsigned int id, const utf8_t* Value, unsigned int Index1, unsigned int Index2)
+{
+    SetAppString(SetUtf8(Value), id, Index1, Index2);
+}
+
+void CApClient::SetAppString(unsigned int id, const utf16_t* Value, unsigned int Index1, unsigned int Index2)
+{
+    SetAppString(SetUtf16(Value), id, Index1, Index2);
+}
+
+void CApClient::SetAppString(unsigned int id, size_t Size, const utf8_t* Value, unsigned int Index1, unsigned int Index2)
+{
+    if (Size > 65000)
+    {
+        Size = 65000;
+    }
+    memcpy((uint8_t*)m_mem->strbuf, Value, Size);
+    SetAppString(Size, id, Index1, Index2);
+}
+
+void CApClient::SetAppString(size_t ValueSize, unsigned int Id, unsigned int Index1, unsigned int Index2)
+{
+    m_mem->args[0] = Id;
+    m_mem->args[1] = Index1;
+    m_mem->args[2] = Index2;
+    m_mem->args[3] = 0;
+    if (0 == ValueSize)
+    {
+        m_mem->args[4] = 0;
+    } else {
+        m_mem->args[4] = 1;
+    }
+    ExecCmd(apCallAppSetString, 5, ValueSize);
+}
+
 bool CApClient::SaveSettings()
 {
     ExecCmd(apCallSaveSettings,0,0);

makemkv-oss-1.16.4.tar.gz/makemkvgui/src/qtgui.h -> makemkv-oss-1.16.5.tar.gz/makemkvgui/src/qtgui.h Changed

makemkv-oss-1.16.5.tar.gz/makemkvgui/src/regbox.cpp Added

@@ -0,0 +1,290 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2021 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 "qtapp.h"
+#include "regbox.h"
+
+CRegBox::CRegBox(MainWnd *mainWnd,QIcon* icon) : QDialog(mainWnd)
+{
+    setWindowIcon(*icon);
+    setWindowTitle(UI_QSTRING(APP_IFACE_REGISTER_TEXT));
+    m_MainWnd = mainWnd;
+    m_HaveValidator = ((*mainWnd->app()->GetAppString(AP_vastr_KeyString, 1)) == 'y');
+
+    this->setAcceptDrops(true);
+
+    QGridLayout* lay = new QGridLayout();
+    lay->setSizeConstraint(QLayout::SetFixedSize);
+
+    lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_KEY_TEXT)), 0, 1, 1, 1, Qt::AlignLeft);
+
+    lay->addWidget(createHLine(),1,0,1,2);
+
+    m_Key = new QLineEdit();
+    QFont f = m_Key->font();
+    f.setFamily(QFontDatabase::systemFont(QFontDatabase::FixedFont).family());
+    m_Key->setFont(f);
+    m_Key->setMinimumWidth(m_Key->fontMetrics().averageCharWidth() * (AP_KEY_STRING_LEN+2));
+
+    lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_KEY_NAME)), 2, 0, Qt::AlignRight);
+    lay->addWidget(m_Key, 2, 1);
+
+    lay->addWidget(createHLine(), 3, 0, 1, 2);
+
+    m_KeyType = createLabel(QString());
+    lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_KEY_TYPE)),4,0,Qt::AlignRight);
+    lay->addWidget(m_KeyType, 4, 1, Qt::AlignLeft);
+
+    m_KeyDate = createLabel(QString());
+    lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_KEY_DATE)), 5, 0, Qt::AlignRight);
+    lay->addWidget(m_KeyDate, 5, 1, Qt::AlignLeft);
+
+    lay->addWidget(createHLine(),6,0,1,2);
+
+    QDialogButtonBox* btn_box = new QDialogButtonBox(
+        QDialogButtonBox::Open| QDialogButtonBox::Ok| QDialogButtonBox::Cancel,Qt::Horizontal);
+
+    m_ButtonOk = btn_box->button(QDialogButtonBox::Ok);
+
+    QPushButton* bpurchase = new QPushButton(UI_QSTRING(APP_IFACE_ACT_PURCHASE_NAME), this);
+    QPushButton *bopen = btn_box->button(QDialogButtonBox::Open);
+
+    if (false == m_HaveValidator)
+    {
+        bopen->setDisabled(true);
+    }
+
+    btn_box->addButton(bpurchase, QDialogButtonBox::ActionRole);
+
+    lay->addWidget(btn_box,7,1);
+
+    setLayout(lay);
+
+    check(connect(m_Key, &QLineEdit::textChanged, this, &CRegBox::RefreshKey));
+
+    check(connect(bpurchase, &QPushButton::clicked, this, &CRegBox::SlotPurchase));
+    check(connect(bopen, &QPushButton::clicked, this, &CRegBox::SlotLoadFile));
+    check(connect(btn_box, &QDialogButtonBox::rejected, this, &CRegBox::reject));
+    check(connect(m_ButtonOk, &QPushButton::clicked, this, &CRegBox::accept));
+
+    QString key_string = QStringFromUtf8(m_MainWnd->app()->GetSettingString(apset_app_Key));
+    m_Key->setText(key_string);
+}
+
+void CRegBox::SlotPurchase()
+{
+    if (m_MainWnd->purchaseAct->isEnabled())
+    {
+        m_MainWnd->purchaseAct->trigger();
+    }
+    reject();
+}
+
+void CRegBox::SlotLoadFile()
+{
+    QString filter = QLatin1String("*.txt *.eml *.pdf *.html *.htm");
+
+    QString fileName = QFileDialog::getOpenFileName(this,
+        UI_QSTRING(APP_IFACE_OPENFILE_TITLE),
+        QString(),
+        filter);
+
+    if (fileName.isEmpty())
+    {
+        return;
+    }
+
+    LoadFromFile(fileName);
+}
+
+void CRegBox::RefreshKey(const QString& )
+{
+    QString key = m_Key->text();
+
+    if (KeyIsValid(key))
+    {
+        if (key != m_Key->text())
+        {
+            m_Key->setText(key);
+            return;
+        }
+        m_KeyType->setText(QStringFromUtf8(m_MainWnd->app()->GetAppString(AP_vastr_KeyString, 4)));
+        m_KeyDate->setText(QStringFromUtf8(m_MainWnd->app()->GetAppString(AP_vastr_KeyString, 5)));
+        m_ButtonOk->setEnabled(true);
+    } else {
+        if (key.isEmpty())
+        {
+            m_KeyType->setText(QString());
+        } else {
+            m_KeyType->setText(UI_QSTRING(APP_KEYTYPE_INVALID));
+        }
+        m_KeyDate->setText(QString());
+        m_ButtonOk->setEnabled(false);
+    }
+}
+
+bool CRegBox::KeyIsValid(QString& key)
+{
+    if (m_HaveValidator && (key.length()>=(AP_KEY_STRING_LEN-2)))
+    {
+        m_MainWnd->app()->SetAppString(AP_vastr_KeyString, key.utf16());
+        const utf8_t* r = m_MainWnd->app()->GetAppString(AP_vastr_KeyString, 2);
+        if (r[0] == '-') return false;
+        if (r[0] != 0)
+        {
+            key = QStringFromUtf8(r);
+        }
+    }
+
+    if (key.length() != AP_KEY_STRING_LEN) return false;
+    if (false == KeyCheckStringCrc(key.utf16())) return false;
+
+    return true;
+}
+
+static bool acceptFileName(const QString name)
+{
+    if (name.endsWith(QLatin1String(".txt"))) return true;
+    if (name.endsWith(QLatin1String(".htm"))) return true;
+    if (name.endsWith(QLatin1String(".html"))) return true;
+    if (name.endsWith(QLatin1String(".eml"))) return true;
+    if (name.endsWith(QLatin1String(".pdf"))) return true;
+    return false;
+}
+
+static QString extractFileName(const QMimeData& md)
+{
+    QByteArray ba;
+
+    ba = md.data(QLatin1String("application/x-qt-windows-mime;value=\"FileNameW\""));
+    if (ba.size()>(1*sizeof(uint16_t)))
+    {
+        unsigned int sz = ba.size() / sizeof(uint16_t);
+        const uint16_t* src = (const uint16_t*)ba.data();
+        while ((sz != 0) && (src[sz - 1] == 0)) sz--;
+        return QString::fromUtf16(src,sz);
+    }
+
+    if (md.hasUrls())
+    {
+        for (auto url : md.urls())
+        {
+            if (url.isLocalFile())
+            {
+                return url.toLocalFile();
+            }
+        }
+    }
+
+    return QString();
+}
+
+static inline bool isText(const QMimeData& md)
+{
+    if (md.hasHtml()) return true;
+    if (md.hasText()) return true;
+    return false;
+}
+
+static QByteArray getText(const QMimeData& md)
+{
+    QByteArray ba;
+
+    ba = md.data(QLatin1String("application/x-qt-windows-mime;value=\"RTF As Text\""));
+    if (ba.size() < 1)
+    {
+        ba = md.data(QLatin1String("text/plain;charset=utf-8"));
+    }
+    if (ba.size() < 1)
+    {
+        ba = md.data(QLatin1String("text/unicode"));
+    }
+    if (ba.size() < 1)
+    {
+        ba = md.data(QLatin1String("text/html"));
+    }
+    if (ba.size() < 1)
+    {
+        ba = md.data(QLatin1String("text/plain"));
+    }
+    return ba;
+}
+
+
+void CRegBox::dragEnterEvent(QDragEnterEvent *e)
+{
+    const QMimeData* md = e->mimeData();
+
+    if (false == m_HaveValidator) return;
+
+    QString fn = extractFileName(*md);
+    if ((false == fn.isEmpty()) && acceptFileName(fn))
+    {
+        e->acceptProposedAction();
+        return;
+    }
+
+    if (true == isText(*md))
+    {
+        e->acceptProposedAction();
+        return;
+    }
+}
+
+void CRegBox::dropEvent(QDropEvent *e)
+{
+    const QMimeData* md = e->mimeData();
+
+    if (false == m_HaveValidator) return;
+
+    QString fn = extractFileName(*md);
+    if ((false == fn.isEmpty()) && acceptFileName(fn))
+    {
+        LoadFromFile(fn);
+        e->acceptProposedAction();
+        return;
+    }
+
+    if (true == isText(*md))
+    {
+        LoadFromBuffer(getText(*md));
+        e->acceptProposedAction();
+        return;
+    }
+}
+
+void CRegBox::LoadFromFile(const QString& fileName)
+{
+    if (false == m_HaveValidator) return;
+    m_MainWnd->app()->SetAppString(AP_vastr_KeyString, fileName.utf16(), 1);
+    LoadCommon();
+}
+
+void CRegBox::LoadFromBuffer(const QByteArray& data)
+{
+    if (false == m_HaveValidator) return;
+    m_MainWnd->app()->SetAppString(AP_vastr_KeyString, data.size(), data.data(), 0);
+    LoadCommon();
+}
+
+void CRegBox::LoadCommon()
+{
+    const utf8_t* r = m_MainWnd->app()->GetAppString(AP_vastr_KeyString, 2);
+    if (r[0] == '-') return;
+    if (r[0] != 0)
+    {
+        m_Key->setText(QStringFromUtf8(r));
+    }
+}
+

makemkv-oss-1.16.5.tar.gz/makemkvgui/src/regbox.h Added

@@ -0,0 +1,106 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2021 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.
+
+*/
+#ifndef APP_REGBOX_H
+#define APP_REGBOX_H
+
+#include <lgpl/aproxy.h>
+#include "mainwnd.h"
+#include "qtgui.h"
+
+class CRegBox : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CRegBox(MainWnd *MainWnd,QIcon* icon);
+
+private:
+    MainWnd*        m_MainWnd;
+    bool            m_HaveValidator;
+    QLineEdit*      m_Key;
+    QLabel*         m_KeyType;
+    QLabel*         m_KeyDate;
+    QPushButton*    m_ButtonOk;
+
+public:
+    inline QString key()
+    {
+        return m_Key->text();
+    }
+
+private:
+    void dragEnterEvent(QDragEnterEvent *e) override;
+    void dropEvent(QDropEvent *e) override;
+
+private:
+    void RefreshKey(const QString& key);
+    bool KeyIsValid(QString& key);
+    void LoadFromFile(const QString& fileName);
+    void LoadFromBuffer(const QByteArray& data);
+    void LoadCommon();
+
+private slots:
+    void SlotPurchase();
+    void SlotLoadFile();
+};
+
+static inline char KeyBitsToChar(uint8_t c)
+{
+    if (c==0) return '_';
+    if (c<11) return '0' + (c-1);
+    if (c<38) return '@'+(c-11);
+    return 'a'+(c-38);
+}
+
+static inline uint8_t KeyIsValidChar(utf16_t c)
+{
+    if (c=='_') return true;
+    if ( (c>='0') && (c<='9') ) return true;
+    if ( (c>='@') && (c<='Z') ) return true;
+    if ( (c>='a') && (c<='z') ) return true;
+    return false;
+}
+
+static const unsigned int AP_KEY_STRING_LEN = 68;
+
+// PLEASE, do not copy&paste this function into keygen code :)
+static inline bool KeyCheckStringCrc(const utf16_t* str)
+{
+    size_t len = utf16len(str);
+
+    if (len != AP_KEY_STRING_LEN )
+    {
+        return false;
+    }
+
+    uint16_t crc=0;
+
+    for (unsigned int i=0;i<(AP_KEY_STRING_LEN-2);i++)
+    {
+        if ( (i>=2) && (KeyIsValidChar(str[i])==false)) return false;
+
+        crc += ((uint8_t)str[i]) & 0x7f;
+
+        crc = (uint16_t) (((crc*(11+i)))%4093);
+    }
+
+    if (KeyBitsToChar( (uint8_t) (crc&0x3f) ) != str[AP_KEY_STRING_LEN-2]) return false;
+    if (KeyBitsToChar( (uint8_t) ((crc>>6)&0x3f)) != str[AP_KEY_STRING_LEN-1]) return false;
+
+    return true;
+}
+
+
+#endif

makemkv-oss-1.16.4.tar.gz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.16.5.tar.gz/makemkvgui/src/scsiinfo.cpp Changed

@@ -17,7 +17,7 @@
 #include <driveio/driveio.h>
 #include <lgpl/smem.h>
 
-static inline void append_item(QString &Qstr,const char *Str)
+static void append_item(QString &Qstr,const char *Str)
 {
     if (Qstr.length()>0)
     {
@@ -137,7 +137,7 @@
     append_const(Qstr,(const char*)Str,Size);
 }
 
-static inline void append_trimmed(QString &Qstr,const char *Str,size_t Size)
+static void append_trimmed(QString &Qstr,const char *Str,size_t Size)
 {
     while ( (Size!=0) && (Str[Size-1]==' ') )
     {
@@ -151,6 +151,20 @@
     append_trimmed(Qstr,(const char*)Str,Size);
 }
 
+static void append_tc(QString &Qstr, const utf16_t *Str)
+{
+    size_t size = utf16len(Str);
+    if ((size>2) && (Str[size - 2] == ' ') && (Str[size - 1] == ':'))
+    {
+        append_const(Qstr, Str, size - 2);
+        append_const(Qstr, ":");
+    } else {
+        append_const(Qstr, Str);
+    }
+    append_const(Qstr, " ");
+}
+
+
 static const char* GetMMCProfileString(unsigned int id)
 {
     switch(id)
@@ -416,16 +430,7 @@
 
         if (!strLabel.isEmpty())
         {
-            const utf16_t* label = AP_UI_STRING(APP_IFACE_EMPTY_FRAME_LABEL);
-            size_t label_size = utf16len(label);
-            if ((label_size>2) && (label[label_size-2]==' ') && (label[label_size-1]==':'))
-            {
-                append_const(str,label,label_size-2);
-                append_const(str,":");
-            } else {
-                append_const(str,label);
-            }
-            append_const(str," ");
+            append_tc(str, AP_UI_STRING(APP_IFACE_EMPTY_FRAME_LABEL));
             str.append(strLabel);
             append_const(str,"<br>");
         }
@@ -438,6 +443,13 @@
             append_const(str,"<br>");
         }
 
+        if (!strProt.isEmpty())
+        {
+            append_tc(str, AP_UI_STRING(APP_IFACE_EMPTY_FRAME_PROTECTION));
+            str.append(strProt);
+            append_const(str, "<br>");
+        }
+
         // capacity
         if (items.capacity.Size>=8)
         {

Build Results
RPM Lint

Refresh

Comments for request 5470 0

Request History

manfred.h created request about 3 years ago

- Update to version 1.16.5
* Miscellaneous UI improvements
* WinCDArb update, fixes occasional "no optical drives" error
* LibMMBD stability improvements
* Many small bug-fixes

microchip8 accepted request about 3 years ago