Request 5338 (accepted)

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.15.4.tar.gz/Makefile -> makemkv-bin-1.16.0.tar.gz/Makefile Changed

makemkv-bin-1.15.4.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.16.0.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.16.0.tar.gz/bin/arm64 Added

makemkv-bin-1.16.0.tar.gz/bin/arm64/makemkvcon Added

makemkv-bin-1.16.0.tar.gz/bin/armel Added

makemkv-bin-1.16.0.tar.gz/bin/armel/makemkvcon Added

makemkv-bin-1.15.4.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.16.0.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.15.4.tar.gz/src/share/appdata.tar -> makemkv-bin-1.16.0.tar.gz/src/share/appdata.tar Changed

makemkv-bin-1.15.4.tar.gz/src/share/blues.jar -> makemkv-bin-1.16.0.tar.gz/src/share/blues.jar Changed

makemkv-oss-1.15.4.tar.gz/libmmbd/src/utf8.cpp Deleted

@@ -1,97 +0,0 @@
-/*
-    libMMBD - MakeMKV BD decryption API library
-
-    Copyright (C) 2007-2020 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.15.4.tar.gz/libmmbd/src/utf8.h Deleted

@@ -1,27 +0,0 @@
-/*
-    libMMBD - MakeMKV BD decryption API library
-
-    Copyright (C) 2007-2020 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.15.4.tar.gz/libabi/pssl/ec_lib.c -> makemkv-oss-1.16.0.tar.gz/libabi/pssl/ec_lib.c Changed

makemkv-oss-1.15.4.tar.gz/libabi/pssl/ec_mult.c -> makemkv-oss-1.16.0.tar.gz/libabi/pssl/ec_mult.c Changed

@@ -208,7 +208,7 @@
 	
 	if (BN_is_zero(scalar))
 		{
-		r = OPENSSL_malloc(1);
+		r = (signed char *) OPENSSL_malloc(1);
 		if (!r)
 			{
 			ECerr(EC_F_COMPUTE_WNAF, ERR_R_MALLOC_FAILURE);
@@ -240,7 +240,7 @@
 		}
 
 	len = BN_num_bits(scalar);
-	r = OPENSSL_malloc(len + 1); /* modified wNAF may be one digit longer than binary representation
+	r = (signed char *)OPENSSL_malloc(len + 1); /* modified wNAF may be one digit longer than binary representation
 	                              * (*ret_len will be set to the actual length, i.e. at most
 	                              * BN_num_bits(scalar) + 1) */
 	if (r == NULL)
@@ -433,10 +433,10 @@
 	
 	totalnum = num + numblocks;
 
-	wsize    = OPENSSL_malloc(totalnum * sizeof wsize[0]);
-	wNAF_len = OPENSSL_malloc(totalnum * sizeof wNAF_len[0]);
-	wNAF     = OPENSSL_malloc((totalnum + 1) * sizeof wNAF[0]); /* includes space for pivot */
-	val_sub  = OPENSSL_malloc(totalnum * sizeof val_sub[0]);
+	wsize    = (size_t*)OPENSSL_malloc(totalnum * sizeof wsize[0]);
+	wNAF_len = (size_t*)OPENSSL_malloc(totalnum * sizeof wNAF_len[0]);
+	wNAF     = (signed char **)OPENSSL_malloc((totalnum + 1) * sizeof wNAF[0]); /* includes space for pivot */
+	val_sub  = (EC_POINT ***)OPENSSL_malloc(totalnum * sizeof val_sub[0]);
 		 
 	if (!wsize || !wNAF_len || !wNAF || !val_sub)
 		{
@@ -552,7 +552,7 @@
 						wNAF_len[i] = tmp_len;
 					
 					wNAF[i + 1] = NULL;
-					wNAF[i] = OPENSSL_malloc(wNAF_len[i]);
+					wNAF[i] = (signed char*)OPENSSL_malloc(wNAF_len[i]);
 					if (wNAF[i] == NULL)
 						{
 						ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
@@ -581,7 +581,7 @@
 	/* All points we precompute now go into a single array 'val'.
 	 * 'val_sub[i]' is a pointer to the subarray for the i-th point,
 	 * or to a subarray of 'pre_comp->points' if we already have precomputation. */
-	val = OPENSSL_malloc((num_val + 1) * sizeof val[0]);
+	val = (EC_POINT**)OPENSSL_malloc((num_val + 1) * sizeof val[0]);
 	if (val == NULL)
 		{
 		ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
@@ -817,7 +817,7 @@
 	pre_points_per_block = (size_t)1 << (w - 1);
 	num = pre_points_per_block * numblocks; /* number of points to compute and store */
 
-	points = OPENSSL_malloc(sizeof (EC_POINT*)*(num + 1));
+	points = (EC_POINT**)OPENSSL_malloc(sizeof (EC_POINT*)*(num + 1));
 	if (!points)
 		{
 		ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, ERR_R_MALLOC_FAILURE);

makemkv-oss-1.15.4.tar.gz/libabi/pssl/ecp_smpl.c -> makemkv-oss-1.16.0.tar.gz/libabi/pssl/ecp_smpl.c Changed

makemkv-oss-1.15.4.tar.gz/libabi/pssl/ecs_ossl.c -> makemkv-oss-1.16.0.tar.gz/libabi/pssl/ecs_ossl.c Changed

makemkv-oss-1.15.4.tar.gz/libmakemkv/src/libmakemkv.vers -> makemkv-oss-1.16.0.tar.gz/libmakemkv/src/libmakemkv.vers Changed

makemkv-oss-1.15.4.tar.gz/libmmbd/inc/libmmbd/mmbd.h -> makemkv-oss-1.16.0.tar.gz/libmmbd/inc/libmmbd/mmbd.h Changed

makemkv-oss-1.15.4.tar.gz/libmmbd/src/aacs.cpp -> makemkv-oss-1.16.0.tar.gz/libmmbd/src/aacs.cpp Changed

makemkv-oss-1.15.4.tar.gz/libmmbd/src/marmmbd.cpp -> makemkv-oss-1.16.0.tar.gz/libmmbd/src/marmmbd.cpp Changed

@@ -38,42 +38,52 @@
     m_TitleCount = Count;
 }
 
-bool CMMBDApClient::OpenMMBD(const utf16_t* Source)
+bool CMMBDApClient::OpenMMBD(const utf8_t* Prefix,const utf8_t* Locator)
 {
-    memcpy((void*)m_mem->strbuf,Source,(utf16len(Source)+1)*sizeof(utf16_t));
-    ExecCmd(apCallOpenMMBD);
+    size_t len = 0, slen;
+
+    if (NULL != Prefix)
+    {
+        slen = strlen(Prefix);
+        memcpy( ((char*)m_mem->strbuf) + len, Prefix, slen);
+        len += slen;
+    }
+    slen = strlen(Locator) + 1;
+    memcpy(((char*)m_mem->strbuf) + len, Locator, slen);
+    len += slen;
+
+    ExecCmd(apCallOpenMMBD,0,len);
     return (m_mem->args[0]!=0);
 }
 
-bool CMMBDApClient::InitMMBD(const uint16_t* argp[])
+bool CMMBDApClient::InitMMBD(const utf8_t* argp[])
 {
+    char* p = (char*)m_mem->strbuf;
     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;
+            len = strlen(argp[count]) + 1;
+            memcpy(p, argp[count], len);
+            p += len;
 
-            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);
+    ExecCmd(apCallInitMMBD, 1, p-((char*)m_mem->strbuf) );
     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);
+    ExecCmd(apCallDiscInfoMMBD,0,0);
 
     if (m_mem->args[0]==0) return NULL;
 
@@ -93,15 +103,16 @@
 {
     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);
+    m_mem->args[2]=(uint32_t)FileOffset;
+    m_mem->args[3]=(uint32_t)(FileOffset>>32);
+    if (Size) memcpy((void*)(m_mem->strbuf),Data,Size);
 
-    ExecCmd(apCallDecryptUnitMMBD);
+    ExecCmd(apCallDecryptUnitMMBD,4,Size);
 
     if (m_mem->args[0]==0) return NULL;
 
     *ClipInfo = (uint32_t)m_mem->args[1];
 
-    return (const uint8_t*)(m_mem->args+4);
+    return (const uint8_t*)(m_mem->strbuf);
 }

makemkv-oss-1.15.4.tar.gz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.16.0.tar.gz/libmmbd/src/mmconn.cpp Changed

@@ -19,7 +19,6 @@
 
 */
 #include "mmconn.h"
-#include "utf8.h"
 #include <alloca.h>
 #include <lgpl/sstring.h>
 #include <stdlib.h>
@@ -73,19 +72,6 @@
     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;
@@ -99,41 +85,13 @@
     return pd+len;
 }
 
-bool CMMBDConn::convertArg(const char* argp[],CMMBDConn::argp_proc_t Proc)
-{
-    const uint16_t* argu[30];
-    unsigned int count=0;
-
-    if (!argp) {
-        return (this->*Proc)(NULL);
-    } else {
-        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 (this->*Proc)(argu);
-    }
-}
-
-bool CMMBDConn::initialize(const char* argp[])
-{
-    return convertArg(argp,&CMMBDConn::initializeU);
-}
-
 bool CMMBDConn::launch()
 {
     char            strbuf[300];
     unsigned int    err;
     const char*     errtxt;
 
-    if (!m_apc.Init('C',":makemkvcon",&err)) {
+    if (!m_apc.Init(&m_std,":makemkvcon",&err)) {
         switch (err) {
         case 1:  errtxt="Can't locate makemkvcon executable"; break;
         case 2:  errtxt="Version mismatch"; break;
@@ -146,9 +104,9 @@
     return true;
 }
 
-bool CMMBDConn::initializeU(const uint16_t* argp[])
+bool CMMBDConn::initialize(const char* argp[])
 {
-    const utf16_t*  p;
+    const utf8_t*   p;
     char            strbuf[300],*pd,*pe;
 
     if (!launch()) return false;
@@ -163,28 +121,28 @@
     pd = strbuf;
     pe = strbuf + sizeof(strbuf);
 
-    pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_Name));
+    pd=append_utf8(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,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,m_apc.GetAppString(AP_vastr_Platform));
     pd=append_utf8(pd,pe,"] ");
-    pd=append_utf16(pd,pe,m_apc.GetAppString(AP_vastr_KeyType));
+    pd=append_utf8(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,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,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,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_apc.GetAppString(AP_vastr_ProgExpiration));
             pd=append_utf8(pd,pe,")");
         }
     }
@@ -208,11 +166,6 @@
 
 bool CMMBDConn::reinitialize(const char* argp[])
 {
-    return convertArg(argp,&CMMBDConn::reinitializeU);
-}
-
-bool CMMBDConn::reinitializeU(const uint16_t* argp[])
-{
     if (!m_active) return false;
 
     if (!m_apc.InitMMBD(argp)) {
@@ -230,22 +183,7 @@
     return m_version;
 }
 
-int CMMBDConn::open(const char *prefix,const char *locator)
-{
-    size_t plen = (prefix)?utf8toutf16len(prefix):0;
-    size_t len = utf8toutf16len(locator);
-
-    uint16_t* p = (uint16_t*)alloca((plen+len+2)*sizeof(uint16_t));
-
-    if (prefix) {
-        utf8toutf16(p,plen,prefix,strlen(prefix));
-    }
-    utf8toutf16(p+plen,len+2,locator,strlen(locator)+1);
-
-    return openU(p);
-}
-
-int CMMBDConn::openU(const uint16_t *locator)
+int CMMBDConn::open(const char *prefix, const char *locator)
 {
     const uint8_t* clip_info;
 
@@ -253,12 +191,12 @@
 
     close();
 
-    if (!m_apc.UpdateAvailableDrives()) {
+    if (!m_apc.UpdateAvailableDrives(AP_UpdateDrivesFlagNoScan|AP_UpdateDrivesFlagNoSingleDrive)) {
         return -3;
     }
     WaitJob();
 
-    if (!m_apc.OpenMMBD(locator)) {
+    if (!m_apc.OpenMMBD(prefix,locator)) {
         return -4;
     }
 
@@ -323,7 +261,7 @@
 {
 }
 
-void CMMBDConn::UpdateCurrentInfo(unsigned int Index,const utf16_t* Value)
+void CMMBDConn::UpdateCurrentInfo(unsigned int Index,const utf8_t* Value)
 {
 }
 
@@ -342,7 +280,7 @@
     m_active = false;
 }
 
-void CMMBDConn::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)
+void CMMBDConn::UpdateDrive(unsigned int Index,const utf8_t *DriveName,AP_DriveState DriveState,const utf8_t *DiskName,const utf8_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize)
 {
     if ((NULL!=m_scan_ctx) && (AP_DriveStateInserted==DriveState))
     {
@@ -350,30 +288,27 @@
     }
 }
 
-int CMMBDConn::ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text,uint64_t)
+int CMMBDConn::ReportUiMessage(unsigned long Code,unsigned long Flags,const utf8_t* Text,uint64_t)
 {
     if (Flags&(AP_UIMSG_HIDDEN|AP_UIMSG_EVENT)) return 0;
 
     if (m_output_proc)
     {
-        size_t  len;
-        char*   str;
-        uint32_t flags;
-
-        len = utf16toutf8len(Text);
-        str = (char*)alloca(len+2);
-
-        utf16toutf8(str,len+2,Text,utf16len(Text)+1);
-
-        flags = Code & 0x000fffff;
+        uint32_t flags = Code & 0x000fffff;
 
-        (*m_output_proc)(m_output_context,flags,str,Text);
+        (*m_output_proc)(m_output_context,flags,Text,NULL);
     }
     return 0;
 }
 
-int CMMBDConn::ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer)
+int CMMBDConn::ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const unsigned int* Codes,const utf8_t* Text[],utf8_t* Buffer)
 {
+#if defined(_darwin_) && defined(HAVE_DARWIN_SANDBOX)
+    if (Code==APP_FOLDER_INVALID)
+    {
+        return DarwinOpenDirectoryPanel(Buffer,Text[0],Text[1],Text[2]);
+    }
+#endif
     return -1;
 }
 
@@ -562,42 +497,32 @@
 {
     ScanContext scan_ctx(this->m_user_data,read_file_proc);
 
-    CMMBDConn* mmbd_scan = CMMBDConn::create_instance(this->m_output_proc,this->m_output_context);
-    if (!mmbd_scan) {
-        return -1;
-    }
+    if (!m_active) return -2;
 
-    warning_message(31,"No device path provided, scanning all inserted discs...");
+    close();
 
-    if (!mmbd_scan->launch())
-    {
-        CMMBDConn::destroy_instance(mmbd_scan);
-        return -2;
-    }
-    mmbd_scan->m_active = true;
+    warning_message(31,"No device path provided, scanning all inserted discs...");
 
-    mmbd_scan->m_scan_ctx = &scan_ctx;
-    if (!mmbd_scan->m_apc.UpdateAvailableDrives())
+    this->m_scan_ctx = &scan_ctx;
+    if (!m_apc.UpdateAvailableDrives(AP_UpdateDrivesFlagNoSingleDrive))
     {
-        mmbd_scan->m_scan_ctx = NULL;
-        CMMBDConn::destroy_instance(mmbd_scan);
+        m_scan_ctx = NULL;
         return -31;
     }
 
-    mmbd_scan->WaitJob();
-    mmbd_scan->WaitJob();
+    WaitJob();
+    WaitJob();
 
-    mmbd_scan->m_scan_ctx = NULL;
-    CMMBDConn::destroy_instance(mmbd_scan);
+    m_scan_ctx = NULL;
 
-    const uint16_t* locator = scan_ctx.GetLocator();
+    const char* locator = scan_ctx.GetLocator();
     if (!locator)
     {
         error_message(30,"Failed to locate disc using user-specified file access callback");
         return -30;
     }
 
-    return openU(locator);
+    return open(NULL,locator);
 }
 
 CMMBDConn::ScanContext::ScanContext(void** user_data,mmbd_read_file_proc_t file_proc)
@@ -609,13 +534,13 @@
     m_cache_cert0.size=0;
 }
 
-const uint16_t* CMMBDConn::ScanContext::GetLocator()
+const char* CMMBDConn::ScanContext::GetLocator()
 {
     if (0==m_auto_locator[0]) return NULL;
     return m_auto_locator;
 }
 
-void CMMBDConn::ScanContext::TestDisc(const utf16_t *DeviceName,const void* DiskData,unsigned int DiskDataSize)
+void CMMBDConn::ScanContext::TestDisc(const char *DeviceName,const void* DiskData,unsigned int DiskDataSize)
 {
     DriveInfoItem item_mkb,item_cert0;
 
@@ -652,14 +577,14 @@
     }
 
     // found!
-    size_t len = utf16len(DeviceName);
+    size_t len = strlen(DeviceName);
     if (len>(MaxLocatorLen-4)) return;
 
     m_auto_locator[0]='d';
     m_auto_locator[1]='e';
     m_auto_locator[2]='v';
     m_auto_locator[3]=':';
-    memcpy(m_auto_locator+4,DeviceName,(len+1)*sizeof(uint16_t));
+    memcpy(m_auto_locator+4,DeviceName,len+1);
     return;
 }

makemkv-oss-1.15.4.tar.gz/libmmbd/src/mmconn.h -> makemkv-oss-1.16.0.tar.gz/libmmbd/src/mmconn.h Changed

@@ -40,17 +40,18 @@
     private:
         void**                  m_user_data;
         mmbd_read_file_proc_t   m_file_proc;
-        uint16_t                m_auto_locator[MaxLocatorLen+1];
+        char                    m_auto_locator[MaxLocatorLen+1];
         cache_entry_t           m_cache_mkb;
         cache_entry_t           m_cache_cert0;
     public:
         ScanContext(void** user_data,mmbd_read_file_proc_t file_proc);
-        const uint16_t* GetLocator();
-        void TestDisc(const utf16_t *DeviceName,const void* DiskData,unsigned int DiskDataSize);
+        const char* GetLocator();
+        void TestDisc(const char *DeviceName,const void* DiskData,unsigned int DiskDataSize);
         bool CompareItem(const DriveInfoItem* item,CMMBDConn::cache_entry_t* cache_entry,const char* file_name);
     };
 private:
     CMMBDApClient       m_apc;
+    CStdPipeTransport   m_std;
     mmbd_output_proc_t  m_output_proc;
     void*               m_output_context;
     aes_cbc_d_proc_t    m_aes_cbcd;
@@ -83,13 +84,10 @@
     static void destroy_instance(CMMBDConn*);
 public:
     bool initialize(const char* argp[]);
-    bool initializeU(const uint16_t* argp[]);
     bool reinitialize(const char* argp[]);
-    bool reinitializeU(const uint16_t* argp[]);
     bool launch();
     const char* get_version_string();
     int open(const char *prefix,const char *locator);
-    int openU(const uint16_t *locator);
     int open_auto(mmbd_read_file_proc_t read_file_proc);
     int close();
     void terminate();
@@ -106,20 +104,18 @@
     void UpdateCurrentBar(unsigned int Value) override;
     void UpdateTotalBar(unsigned int Value) override;
     void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names) override;
-    void UpdateCurrentInfo(unsigned int Index,const utf16_t* Value) override;
+    void UpdateCurrentInfo(unsigned int Index,const utf8_t* Value) override;
     void EnterJobMode(unsigned int Flags) override;
     void LeaveJobMode() override;
     void ExitApp() override;
-    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) override;
-    int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text,uint64_t ExtraData) override;
-    int  ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer) override;
-private:
-    typedef bool (CMMBDConn::*argp_proc_t)(const uint16_t* argp[]);
+    void UpdateDrive(unsigned int Index,const utf8_t *DriveName,AP_DriveState DriveState,const utf8_t *DiskName,const utf8_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize) override;
+    int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf8_t* Text,uint64_t ExtraData) override;
+    int  ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const unsigned int* Codes,const utf8_t* Text[],utf8_t* Buffer) override;
 private:
+    int  DarwinOpenDirectoryPanel(utf8_t* Data,const utf8_t* Title,const utf8_t* Message,const utf8_t* Path);
     void WaitJob();
     uint32_t* GetClipInfo(uint32_t Name);
     void message_worker(uint32_t error_code,const char* message);
-    bool convertArg(const char* argp[],CMMBDConn::argp_proc_t Proc);
     inline void error_message(uint32_t error_code,const char* message) override
     {
         message_worker(error_code|MMBD_MESSAGE_FLAG_MMBD_ERROR,message);

makemkv-oss-1.15.4.tar.gz/makefile.common -> makemkv-oss-1.16.0.tar.gz/makefile.common Changed

@@ -46,7 +46,8 @@
 
 MAKEMKVGUI_INC=makemkvgui/inc
 
-MAKEMKVGUI_SRC=makemkvgui/src/aboutbox.cpp makemkvgui/src/client.cpp makemkvgui/src/dirselectbox.cpp \
+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/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 \
@@ -65,8 +66,9 @@
 
 LIBMMBD_INC=libmmbd/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=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_LINUX=makemkvgui/src/api_posix.cpp makemkvgui/src/api_linux.cpp makemkvgui/src/sem_posix.cpp \

makemkv-oss-1.15.4.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/inc/lgpl/apdefs.h Changed

@@ -52,6 +52,8 @@
 static const unsigned int AP_vastr_DefaultSelectionString=20;
 static const unsigned int AP_vastr_DefaultOutputFileName=21;
 static const unsigned int AP_vastr_ExternalAppItem=22;
+static const unsigned int AP_vastr_InterfaceLanguage=23;
+static const unsigned int AP_vastr_ProfileString=24;
 //
 typedef enum _AP_ItemAttributeId
 {
@@ -126,6 +128,10 @@
 
 static const unsigned int AP_Notify_UpdateLayoutFlag_NoTime=1;
 static const unsigned int AP_ProgressCurrentIndex_SourceName=65280;
+static const unsigned int AP_BackupFlagDecryptVideo=1;
+static const unsigned int AP_OpenFlagManualMode=1;
+static const unsigned int AP_UpdateDrivesFlagNoScan=1;
+static const unsigned int AP_UpdateDrivesFlagNoSingleDrive=2;
 
 
 static const unsigned int AP_AVStreamFlag_DirectorsComments=1;
@@ -140,8 +146,7 @@
 static const unsigned int AP_AVStreamFlag_OffsetSequenceIdPresent=32768;
 
 
-static const unsigned int AP_APP_LOC_POGZ=1;
-static const unsigned int AP_APP_LOC_MAX=100;
+static const unsigned int AP_APP_LOC_MAX=7000;
 
 
 static const unsigned long APP_DUMP_DONE_PARTIAL=5004;

makemkv-oss-1.15.4.tar.gz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

@@ -13,12 +13,14 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <lgpl/stl.h>
+#include <lgpl/utf8.h>
 
 #ifndef APROXY_STD
 #define APROXY_STD std
 #endif
 
-typedef uint16_t utf16_t;
+typedef uint16_t    utf16_t;
+typedef char        utf8_t;
 
 static inline size_t utf16len(const utf16_t *SrcString)
 {
@@ -30,65 +32,22 @@
     return (p-SrcString);
 }
 
-static inline const utf16_t* utf16chr(const utf16_t *SrcString,utf16_t c)
-{
-    const uint16_t *p=SrcString;
-    while(*p!=0)
-    {
-        if (*p==c) return p;
-        p++;
-    }
-    return NULL;
-}
-
-static inline bool utf16compare(const utf16_t *String1,const utf16_t *String2)
-{
-    size_t len = utf16len(String1);
-    if (utf16len(String2)!=len) return false;
-    return (memcmp(String1,String2,len*sizeof(utf16_t))==0);
-}
-
-static inline uint64_t utf16tol(const utf16_t *SrcString)
-{
-    uint64_t value = 0;
-    const uint16_t *p=SrcString;
-    while(*p!=0)
-    {
-        value *= 10;
-        value += (*p-'0');
-        p++;
-    }
-    return value;
-}
-
 //
 // sh mem
 //
-#ifdef _MSC_VER
-#define ALIGN_PACKED
-#pragma pack(1)
-#endif
-
-#ifdef __GNUC__
-#define ALIGN_PACKED __attribute((packed))
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
-#endif
-
 typedef struct _AP_SHMEM
 {
     uint32_t    cmd;
-    uint8_t     start;
-    uint8_t     abort_nomem;
-    uint8_t     exit;
-    uint8_t     pad0[1];
-    uint32_t    pad1[4];
-    uint64_t    args[32];
-    utf16_t     strbuf[32768];
-} ALIGN_PACKED AP_SHMEM;
-
-#ifdef _MSC_VER
-#pragma pack()
-#endif
+    uint32_t    flags;
+    uint32_t    pad1;
+    uint32_t    pad2;
+    uint32_t    args[32];
+    uint8_t     strbuf[65008];
+} AP_SHMEM;
+
+static const uint32_t AP_SHMEM_FLAG_START   = 0x01000000;
+static const uint32_t AP_SHMEM_FLAG_EXIT    = 0x02000000;
+static const uint32_t AP_SHMEM_FLAG_NOMEM   = 0x04000000;
 
 //
 // sem
@@ -110,7 +69,8 @@
     apCallSignalExit,
     apCallOnIdle,
     apCallCancelAllJobs,
-    apCallSetOutputFolder,
+
+    apCallSetOutputFolder=16,
     apCallUpdateAvailableDrives,
     apCallOpenFile,
     apCallOpenCdDisk,
@@ -127,11 +87,8 @@
     apCallSetSettingString,
     apCallSaveSettings,
     apCallAppGetString,
-    apdeprecated_CallStartStreaming,
     apCallBackupDisc,
-    apCallGetInterfaceLanguage,
     apCallGetInterfaceLanguageData,
-    apCallGetProfileString,
     apCallSetUiItemInfo,
     apCallSetProfile,
     apCallInitMMBD,
@@ -139,6 +96,7 @@
     apCallDiscInfoMMBD,
     apCallDecryptUnitMMBD,
     apCallSetExternAppFlags,
+    apCallManageState,
 
     apBackEnterJobMode=192,
     apBackLeaveJobMode,
@@ -148,7 +106,7 @@
     apBackUpdateLayout,
     apBackSetTotalName,
     apBackUpdateCurrentInfo,
-    apBackReportUiMesaage,
+    apBackReportUiMessage,
     apBackExit,
     apBackSetTitleCollInfo,
     apBackSetTitleInfo,
@@ -156,14 +114,12 @@
     apBackSetChapterInfo,
     apBackReportUiDialog,
 
-    apBackFatalCommError=250,
+    apBackFatalCommError=224,
     apBackOutOfMem,
-
-    apUnknown
+    apUnknown=239
 } AP_CMD;
 
-#define AP_CRE_VER "C0012"
-#define AP_GUI_VER "G0012"
+#define AP_ABI_VER "A0001"
 
 typedef uint32_t AP_DiskFsFlags;
 typedef uint32_t AP_DriveState;
@@ -281,6 +237,22 @@
 class CApClient
 {
 public:
+    static uint32_t inline CmdPack(AP_CMD Cmd, unsigned int ArgCount, size_t DataSize)
+    {
+        return (((uint32_t)Cmd) << 24) | (ArgCount << 16) | (DataSize & 0xffff);
+    }
+public:
+    class ITransport
+    {
+    protected:
+        CApClient* m_client;
+    public:
+        virtual bool Init1(char* Name) = 0;
+        virtual bool Init2(CApClient* client, const char* response, const uint64_t* stdh) = 0;
+        virtual bool Transact() = 0;
+    protected:
+        void DebugFailRoutine(uintptr_t arg0, const char* arg1, int line);
+    };
     class INotifier
     {
     public:
@@ -288,43 +260,53 @@
         virtual void UpdateCurrentBar(unsigned int Value)=0;
         virtual void UpdateTotalBar(unsigned int Value)=0;
         virtual void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names)=0;
-        virtual void UpdateCurrentInfo(unsigned int Index,const utf16_t* Value)=0;
+        virtual void UpdateCurrentInfo(unsigned int Index,const utf8_t* Value)=0;
         virtual void EnterJobMode(unsigned int Flags)=0;
         virtual void LeaveJobMode()=0;
         virtual void ExitApp()=0;
-        virtual 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)=0;
-        virtual int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text,uint64_t ExtraData)=0;
-        virtual int  ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer)=0;
+        virtual void UpdateDrive(unsigned int Index,const utf8_t *DriveName,AP_DriveState DriveState,const utf8_t *DiskName,const utf8_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize)=0;
+        virtual int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf8_t* Text,uint64_t ExtraData)=0;
+        virtual int  ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const unsigned int* Codes,const utf8_t* Text[], utf8_t* Buffer)=0;
     };
 private:
-    AP_SGRP     m_sem;
+    ITransport* m_Transport;
     INotifier*  m_Ui;
     bool        m_shutdown;
     uintptr_t   m_debug;
 public:
     volatile AP_SHMEM *m_mem;
-    void ExecCmd(AP_CMD cmd);
+public:
+    void ExecCmdPacked(uint32_t CmdHdr);
+    inline void ExecCmd(AP_CMD Cmd, unsigned int ArgCount, size_t DataSize)
+    {
+        ExecCmdPacked(CmdPack(Cmd, ArgCount, DataSize));
+    }
 private:
-    AP_CMD Transact(AP_CMD cmd);
-    AP_CMD FatalCommError();
+    AP_CMD Transact(uint32_t CmdHdr);
+    void ReportFatalError(uint32_t code);
 public:
     bool EnableDebug(const char* LogName);
-    bool Init(char Type,const char* AppName,unsigned int* Code);
+    bool Init(ITransport* Transport, const char* AppName,unsigned int* Code);
     void SetUiNotifier(CApClient::INotifier* Notifier);
     CApClient();
     void AppExiting();
+    size_t SetUtf8(const char* Str);
+    size_t SetUtf16(const utf16_t* Str);
 public:
     void SignalExit();
     void CancelAllJobs();
     void OnIdle();
-    bool UpdateAvailableDrives();
+    bool UpdateAvailableDrives(uint32_t Flags);
     bool CloseDisk(unsigned int EjectEd);
     int GetSettingInt(ApSettingId id);
-    const utf16_t* GetSettingString(ApSettingId id);
+    const utf8_t* GetSettingString(ApSettingId id);
     void SetSettingInt(ApSettingId id,int Value);
-    void SetSettingString(ApSettingId id,const utf16_t* Value);
+    void SetSettingString(ApSettingId id, const utf8_t* Value);
+    void SetSettingString(ApSettingId id, const utf16_t* Value);
     bool SaveSettings();
-    const utf16_t* GetAppString(unsigned int Id,unsigned int Index1=0,unsigned int Index2=0);
+    const utf8_t* GetAppString(unsigned int Id,unsigned int Index1=0,unsigned int Index2=0);
+private:
+    void SetSettingString(ApSettingId id, size_t ValueSize);
 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;
@@ -333,6 +315,11 @@
 private:
     void DebugFailRoutine(uintptr_t arg0,const char* arg1,int line);
     void DebugOut(const char* string);
+private:
+    inline uint64_t Get64(unsigned int index)
+    {
+        return m_mem->args[index] | (((uint64_t)(m_mem->args[index + 1])) << 32);
+    }
 };
 #define DebugFail(arg0,arg1) DebugFailRoutine(arg0,arg1,__LINE__)
 
@@ -346,18 +333,25 @@
     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 utf8_t *Name);
     void SetOutputFolder(const utf16_t *Name);
+    bool OpenFile(const utf8_t* FileName,uint32_t Flags);
     bool OpenFile(const utf16_t* FileName,uint32_t Flags);
     bool OpenCdDisk(unsigned int Id,uint32_t Flags);
+    bool OpenTitleCollection(const utf8_t* Source,uint32_t Flags);
     bool OpenTitleCollection(const utf16_t* Source,uint32_t Flags);
     bool EjectDisk(unsigned int Id);
     bool SaveAllSelectedTitlesToMkv();
+    bool BackupDisc(unsigned int Id,const utf8_t* Folder,uint32_t Flags);
     bool BackupDisc(unsigned int Id,const utf16_t* Folder,uint32_t Flags);
-    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);
-    int SetExternAppFlags(const uint64_t* Flags);
+    int SetExternAppFlags(const uint32_t* Flags,unsigned int Count);
+private:
+    void SetOutputFolder(size_t NameSize);
+    bool OpenFile(size_t FileNameSize, uint32_t Flags);
+    bool OpenTitleCollection(size_t SourceSize, uint32_t Flags);
+    bool BackupDisc(unsigned int Id, size_t FolderSize, uint32_t Flags);
 };
 
 class CMMBDApClient : public CApClient
@@ -371,28 +365,101 @@
     void SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle);
 public:
     CMMBDApClient() { m_TitleCount=0; }
-    bool InitMMBD(const uint16_t* argp[]);
-    bool OpenMMBD(const utf16_t* Source);
+    bool InitMMBD(const char* argp[]);
+    bool OpenMMBD(const char* Prefix,const char* Locator);
     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);
 };
 
+class CShMemTransport : public CApClient::ITransport
+{
+private:
+    AP_SGRP     m_sem;
+public:
+    bool Init1(char* Name) override;
+    bool Init2(CApClient* client, const char* response, const uint64_t* stdh) override;
+    bool Transact() override;
+};
 
 #ifndef AP_SEM_TIMEOUT
 #define AP_SEM_TIMEOUT 29
 #endif
 
+class CPipeTransport
+{
+protected:
+    virtual bool SendData(const void* Buffer, unsigned int Size) = 0;
+    virtual bool RecvData(void* Buffer, unsigned int Size, unsigned int *p_Received) = 0;
+protected:
+    bool SendCmd(AP_SHMEM* p_mem);
+    bool RecvCmd(AP_SHMEM* p_mem);
+};
+
+class CStdPipeTransport : public CApClient::ITransport , private CPipeTransport
+{
+private:
+    uint64_t    m_hrd;
+    uint64_t    m_hwr;
+public:
+    bool Init1(char* Name) override;
+    bool Init2(CApClient* client, const char* response, const uint64_t* stdh) override;
+private:
+    bool Transact() override;
+    bool SendData(const void* Buffer, unsigned int Size) override;
+    bool RecvData(void* Buffer, unsigned int Size, unsigned int *p_Received) override;
+public:
+    CStdPipeTransport() : m_hrd(0), m_hwr(0) {}
+};
+
+#if 0
+class CNetPipeTransport : public CPipeTransport
+{
+private:
+    SOCKET      m_srd;
+    SOCKET      m_swr;
+    uint32_t    m_proto;
+    union _addr
+    {
+        struct sockaddr     s;
+        struct sockaddr_in  s4;
+        struct sockaddr_in6 s6;
+    } m_addr;
+private:
+    bool SendData(const void* Buffer, unsigned int Size) override;
+    bool RecvData(void* Buffer, unsigned int Size, unsigned int *p_Received) override;
+protected:
+    CNetPipeTransport() : m_srd(0), m_swr(0), m_proto(0) {}
+    bool ParseAddress(const char* AddrString);
+public:
+    bool InitClient(const char* AddrString);
+};
+
+class CNetTransport : public CApClient::ITransport, private CNetPipeTransport
+{
+public:
+    bool Init1(char* Name) override;
+    bool Init2(CApClient* client, const char* response, const uint64_t* stdh) override;
+private:
+    bool Transact() override;
+};
+#endif
+
+
 //
 // API
 //
-int  ApSpawnApp(const char* verstr,const char* AppName,char* response,size_t responselength);
+int  ApSpawnApp(char* verstr, const char* AppName, uint64_t* stdh);
 void*   ApOpenShmem(const char *name);
 bool ApOpenSgrp(AP_SGRP *sgrp,const uint64_t *data);
 bool ApSemInc(AP_SGRP *sgrp,uintptr_t sid);
 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);
+void ApDebugDump(const char* name, const void* buffer, unsigned int size);
+int ApClosePipe(uint64_t handle);
+int ApReadPipe(uint64_t handle,void* buffer,unsigned int size,unsigned int timeout);
+int ApWritePipe(uint64_t handle,const void* buffer,unsigned int size);
+
 
 //
 // UI

makemkv-oss-1.16.0.tar.gz/makemkvgui/inc/lgpl/utf8.h Added

makemkv-oss-1.15.4.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.16.0.tar.gz/makemkvgui/src/ConvertUTF.c Changed

makemkv-oss-1.16.0.tar.gz/makemkvgui/src/ConvertUTF.h Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/api_posix.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/api_posix.cpp Changed

@@ -28,6 +28,7 @@
 #include <lgpl/sysabi.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <poll.h>
 
 const char* const* ApGetAppLocations();
 
@@ -39,18 +40,21 @@
     return buf.st_mode;
 }
 
-int ApSpawnApp(const char* verstr,const char* AppName,char* response,size_t responselength)
+int ApSpawnApp(char* verstr, const char* AppName, uint64_t* stdh)
 {
-    int     pipe_fd[2],err;
+    int     pipe_fd_stdout[2],pipe_fd_stdin[2],err;
     char    app_path[1024+32];
     char*   argv[4];
     char    str_guiserver[sizeof("guiserver")+2];
-    char    str_apver[8];
 
-    if (pipe(pipe_fd))
+    if (pipe(pipe_fd_stdout))
     {
         return errno|0x80000000;
     }
+    if (pipe(pipe_fd_stdin))
+    {
+        return errno|0x81000000;
+    }
 
     if (AppName[0]==':')
     {
@@ -107,40 +111,26 @@
     }
 
     strcpy(str_guiserver,"guiserver");
-    strcpy(str_apver,verstr);
 
     argv[0]=app_path;
     argv[1]=str_guiserver;
-    argv[2]=str_apver;
+    argv[2]=verstr;
     argv[3]=NULL;
 
-    err = SYS_posix_launch(argv,0,pipe_fd[1],0,SYS_posix_envp());
+    err = SYS_posix_launch(argv,pipe_fd_stdin[0],pipe_fd_stdout[1],0,SYS_posix_envp());
 
-    close(pipe_fd[1]);
+    close(pipe_fd_stdout[1]);
+    close(pipe_fd_stdin[0]);
 
     if (err)
     {
         return err;
     }
 
-    for (unsigned int i=0;i<(responselength-1);i++)
-    {
-        if (1!=read(pipe_fd[0],response+i,1))
-        {
-            return errno|0x80000000;
-        }
-
-        if (response[i]=='$')
-        {
-            response[i]=0;
-
-            // break pipe
-            close(pipe_fd[0]);
-            return 0;
-        }
-    }
+    stdh[0] = pipe_fd_stdout[0];
+    stdh[1] = pipe_fd_stdin[1];
 
-    return -3;
+    return 0;
 }
 
 int ApSpawnNewInstance()
@@ -215,18 +205,39 @@
     }
 }
 
-int ApCreatePipe(uint64_t* data)
+int ApClosePipe(uint64_t handle)
+{
+    return close((int)handle);
+}
+
+int ApReadPipe(uint64_t handle, void* buffer, unsigned int size,unsigned int timeout)
 {
-    int fd[2];
+    struct pollfd pf;
+    int err;
 
-    if (pipe(fd)!=0)
-    {
-        return errno | 0x80000000;
-    }
+    bzero(&pf,sizeof(pf));
+    pf.fd = (int)handle;
+    pf.events = POLLIN;
 
-    data[0]=fd[0];
-    data[1]=fd[1];
+    err = poll(&pf,1,timeout << 10);
+    if (err<=0) return -1;
 
-    return 0;
+    err = read((int)handle,buffer,size);
+    if (err<=0) return -1;
+
+#ifdef DBG_DUMP_PIPE
+    ApDebugDump("crp", buffer, err);
+#endif
+
+    return err;
+}
+
+int ApWritePipe(uint64_t handle, const void* buffer, unsigned int size)
+{
+#ifdef DBG_DUMP_PIPE
+    ApDebugDump("cwp", buffer, size);
+#endif
+
+    return write((int)handle,buffer,size);
 }

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/backupdlg.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/backupdlg.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/client.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/client.cpp Changed

@@ -15,6 +15,8 @@
 #include <lgpl/aproxy.h>
 #include <lgpl/sstring.h>
 
+static const char* AbiTag = "Apr0><y-ABI-versi0n-" AP_ABI_VER "#tAg\n";
+
 void CApClient::SetUiNotifier(CApClient::INotifier* Notifier)
 {
     m_Ui = Notifier;
@@ -22,6 +24,7 @@
 
 CApClient::CApClient()
 {
+    m_Transport = NULL;
     m_Ui = NULL;
     m_debug = 0;
     m_mem = NULL;
@@ -31,162 +34,138 @@
 {
     if (NULL!=m_mem)
     {
-        m_mem->exit = 2;
-    }
-}
-
-static bool CheckVersionString(const char* Version,const char* AvailableVersions)
-{
-    const char *p,*pe;
-    size_t vl = strlen(Version);
-
-    p=AvailableVersions;
-    while(*p!=0)
-    {
-        if (*p=='/') p++;
-        pe = strchr(p,'/');
-        if (pe==NULL)
-        {
-            pe=p+strlen(p);
-        }
-
-        if (vl==(pe-p))
-        {
-            if (0==memcmp(p,Version,vl))
-            {
-                return true;
-            }
-        }
-        p=pe;
+        m_mem->flags |= (AP_SHMEM_FLAG_EXIT | 2);
     }
-    return false;
 }
 
-bool CApClient::Init(char Type,const char* AppName,unsigned int* Code)
+bool CApClient::Init(CApClient::ITransport* Transport, 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];
+    uint64_t stdh[2];
 
     *Code = 0;
 
-    switch(Type)
-    {
-    case 'C': verstr=AP_CRE_VER; break;
-    case 'G': verstr=AP_GUI_VER; break;
-    default:  verstr=NULL; break;
-    }
-    if (NULL==verstr)
-    {
-        DebugFail(Type,NULL);
-        return false;
-    }
+    strcpy(response, AP_ABI_VER);
+    p = response + strlen(response);
+    *(p++) = '+';
+    *p = 0;
 
-    if (0!=(error=ApCreatePipe(pipeh)))
+    if (false == Transport->Init1(p))
     {
-        DebugFail(error,NULL);
+        DebugFail(0, NULL);
         return false;
     }
 
-    error = ApSpawnApp(verstr,AppName,response,512);
-    if (error!=0)
+    error = ApSpawnApp(response, AppName, stdh);
+    if (error != 0)
     {
-        DebugFail(error,NULL);
+        DebugFail(error, NULL);
         *Code = 1;
         return false;
     }
 
-    p=response;
-    args[0]=p; p=strchr(p,':'); *p=0; p++;
-    args[1]=p;
-
-    if (false==CheckVersionString(verstr,args[0]))
+    // read answer
+    for (unsigned int i=0;i<(sizeof(response)-1);i++)
     {
-        DebugFail(0,verstr);
-        DebugFail(0,args[0]);
-        *Code = 2;
-        return false;
+        if (1!=ApReadPipe(stdh[0],response+i,1,AP_SEM_TIMEOUT))
+        {
+            *Code = 4;
+            return false;
+        }
+
+        if (response[i]=='$')
+        {
+            response[i]=0;
+            break;
+        }
     }
 
-    m_mem = (AP_SHMEM*) ApOpenShmem(args[1]);
-    if (NULL==m_mem)
+    p = response;
+    args[0] = p; p = strchr(p, ':'); *p = 0; p++;
+    args[1] = p;
+
+    if (0!=strcmp(AP_ABI_VER, args[0]))
     {
-        DebugFail(0,NULL);
+        DebugFail(0, AP_ABI_VER);
+        DebugFail(0, args[0]);
+        *Code = 2;
         return false;
     }
 
-    if (false==ApOpenSgrp(&m_sem,(uint64_t*)m_mem->args))
+    if (false == Transport->Init2(this, args[1], stdh))
     {
-        DebugFail(0,NULL);
+        DebugFail(0, args[1]);
+        *Code = 3;
         return false;
     }
 
-    m_mem->args[24]=pipeh[0];
-    m_mem->args[25]=pipeh[1];
-    m_mem->start=1;
     m_shutdown = false;
+    m_Transport = Transport;
 
-    DebugFail(0,"ok");
     return true;
 }
 
-AP_CMD CApClient::FatalCommError()
-{
-    DebugFail(m_mem->abort_nomem,NULL);
-    m_shutdown = true;
-    if (m_mem->abort_nomem) return apBackOutOfMem;
-    return apBackFatalCommError;
-}
-
-AP_CMD CApClient::Transact(AP_CMD cmd)
+AP_CMD CApClient::Transact(uint32_t cmd)
 {
     if (m_shutdown)
     {
-        DebugFail(cmd,NULL);
+        DebugFail(cmd, NULL);
         return apReturn;
     }
 
-    DebugFail(cmd,"in");
+    DebugFail(cmd, "in");
 
     m_mem->cmd = cmd;
-
-    if (m_mem->abort_nomem) return FatalCommError();
-
-    if (false==ApSemInc(&m_sem,m_sem.a_id))
+    if (false == m_Transport->Transact())
     {
-        DebugFail(cmd,NULL);
-        return FatalCommError();
+        DebugFail(m_mem->cmd, NULL);
+        DebugFail(m_mem->flags, NULL);
+        m_shutdown = true;
+        if (0 != (m_mem->flags&AP_SHMEM_FLAG_NOMEM))
+        {
+            return apBackOutOfMem;
+        }
+        return apBackFatalCommError;
     }
 
-    if (m_mem->abort_nomem) return FatalCommError();
+    DebugFail(m_mem->cmd, "out");
+
+    return (AP_CMD)(m_mem->cmd>>24);
+}
+
+void CApClient::ReportFatalError(uint32_t code)
+{
+    char str[512];
 
-    if (false==ApSemDec(&m_sem,m_sem.b_id))
+    const utf16_t* str16 = AP_UI_STRING(code);
+    if (NULL == str16)
     {
-        DebugFail(cmd,NULL);
-        return FatalCommError();
+        str[0] = 0;
+    } else {
+        utf16toutf8(str, sizeof(str) - 2, str16, utf16len(str16) + 1);
+        str[sizeof(str) - 1] = 0;
     }
 
-    if (m_mem->abort_nomem)
+    m_shutdown = true;
+    if (NULL!=m_Ui)
     {
-        DebugFail(cmd,NULL);
-        return FatalCommError();
+        m_Ui->ReportUiMessage(APP_IFACE_FATAL_COMM, AP_UIMSG_BOXERROR, str, 0);
+        m_Ui->ExitApp();
     }
-
-    DebugFail((uint32_t)m_mem->cmd,"out");
-
-    return (AP_CMD)(uint32_t)m_mem->cmd;
 }
 
-void CApClient::ExecCmd(AP_CMD cmd)
+void CApClient::ExecCmdPacked(uint32_t cmd)
 {
     AP_CMD r;
+    unsigned int args, size;
 
     while(apReturn!=(r=Transact(cmd)))
     {
         // process command
+        args = size = 0;
         switch(r)
         {
         case apNop:
@@ -203,39 +182,37 @@
             return;
             break;
         case apBackFatalCommError:
-            m_Ui->ReportUiMessage(APP_IFACE_FATAL_COMM,AP_UIMSG_BOXERROR,AP_UI_STRING(APP_IFACE_FATAL_COMM),0);
-            m_Ui->ExitApp();
+            ReportFatalError(APP_IFACE_FATAL_COMM);
             return;
             break;
         case apBackOutOfMem:
-            m_Ui->ReportUiMessage(APP_IFACE_FATAL_MEM,AP_UIMSG_BOXERROR,AP_UI_STRING(APP_IFACE_FATAL_MEM),0);
-            m_Ui->ExitApp();
+            ReportFatalError(APP_IFACE_FATAL_MEM);
             return;
             break;
         case apBackUpdateDrive:
-            const utf16_t* p_str,*drv_name,*dsk_name,*dev_name;
+            const utf8_t* p_str,*drv_name,*dsk_name,*dev_name;
 
-            p_str = (const utf16_t*) m_mem->strbuf;
-            if (m_mem->args[1]==0)
+            p_str = (const utf8_t*) m_mem->strbuf;
+            if ((m_mem->args[1]&1)==0)
             {
                 drv_name = NULL;
             } else {
                 drv_name = p_str;
-                p_str += (utf16len(p_str)+1);
+                p_str += (strlen(p_str)+1);
             }
-            if ((m_mem->args[4]&1)==0)
+            if ((m_mem->args[1]&2)==0)
             {
                 dsk_name = NULL;
             } else {
                 dsk_name = p_str;
-                p_str += (utf16len(p_str)+1);
+                p_str += (strlen(p_str)+1);
             }
-            if ((m_mem->args[4]&2)==0)
+            if ((m_mem->args[1]&4)==0)
             {
                 dev_name = NULL;
             } else {
                 dev_name = p_str;
-                p_str += (utf16len(p_str)+1);
+                p_str += (strlen(p_str)+1);
             }
             m_Ui->UpdateDrive(
                 (unsigned int) m_mem->args[0],
@@ -243,9 +220,9 @@
                 (AP_DriveState)(m_mem->args[2]),
                 dsk_name,
                 dev_name,
-                (AP_DiskFsFlags)(m_mem->args[5]),
-                ((char*)m_mem)+m_mem->args[7],
-                (unsigned int) m_mem->args[6]
+                (AP_DiskFsFlags)(m_mem->args[3]),
+                ((uint8_t*)p_str),
+                (unsigned int) m_mem->args[4]
                 );
             break;
         case apBackSetTotalName:
@@ -268,44 +245,53 @@
             m_Ui->UpdateLayout(c_name,name_index,flags,n_size,names);
             break;
         case apBackUpdateCurrentInfo:
-            m_Ui->UpdateCurrentInfo( (unsigned int) m_mem->args[0] , (utf16_t*)m_mem->strbuf );
+            m_Ui->UpdateCurrentInfo( (unsigned int) m_mem->args[0] , (utf8_t*)m_mem->strbuf );
             break;
-        case apBackReportUiMesaage:
+        case apBackReportUiMessage:
             int rr;
             if (m_Ui)
             {
-                rr = m_Ui->ReportUiMessage( (unsigned long) m_mem->args[0] , (unsigned long) m_mem->args[2] , (utf16_t*)m_mem->strbuf , m_mem->args[3]);
+                rr = m_Ui->ReportUiMessage((unsigned long)m_mem->args[0], (unsigned long)m_mem->args[1], (utf8_t*)m_mem->strbuf, Get64(2));
             } else {
                 rr = 0;
             }
             m_mem->args[0] = rr;
+            args = 1;
             break;
         case apBackReportUiDialog:
             if (m_Ui)
             {
-                const utf16_t* text[32];
+                const utf8_t* text[32];
+                unsigned int codes[32];
                 unsigned int len,count = (unsigned int) m_mem->args[2];
                 if (count>32) count=32;
-                const utf16_t* p = (utf16_t*)m_mem->strbuf;
+                const uint8_t* p = (uint8_t*)m_mem->strbuf;
 
                 for (unsigned int i=0;i<count;i++)
                 {
-                    len = *p++;
+                    len = *p++; len <<= 8; len |= *p++;
                     if ((len&0x8000)==0)
                     {
-                        text[i] = p;
+                        codes[i] = 0;
+                        text[i] = (char*)p;
                         p += len;
                     } else {
                         len &= 0x7fff;
-                        len <<= 16;
+                        len <<= 8;
+                        len |= *p++;
+                        len <<= 8;
                         len |= *p++;
-                        text[i] = AppGetString(len);
+                        codes[i] = len;
+                        text[i] = NULL;
                     }
                 }
-                m_mem->args[0] = m_Ui->ReportUiDialog((unsigned long) m_mem->args[0] , (unsigned long) m_mem->args[1] , count, text , (utf16_t*)m_mem->strbuf );
+                m_mem->strbuf[0] = 0;
+                m_mem->args[0] = m_Ui->ReportUiDialog((unsigned long) m_mem->args[0] , (unsigned long) m_mem->args[1] , count, codes, text , (utf8_t*)m_mem->strbuf );
+                size = strlen((utf8_t*)m_mem->strbuf) + 1;
             } else {
                 m_mem->args[0] = -1;
             }
+            args = 1;
             break;
         case apBackUpdateCurrentBar:
             m_Ui->UpdateCurrentBar( (unsigned int) m_mem->args[0] );
@@ -314,24 +300,26 @@
             m_Ui->UpdateTotalBar( (unsigned int) m_mem->args[0] );
             break;
         case apBackSetTitleCollInfo:
-            SetTitleCollInfo(m_mem->args[0],(unsigned int) m_mem->args[1]);
+            SetTitleCollInfo(Get64(0),(unsigned int) m_mem->args[2]);
             break;
         case apBackSetTitleInfo:
-            SetTitleInfo((unsigned int) m_mem->args[0],m_mem->args[1],(unsigned int) m_mem->args[2],(unsigned int) m_mem->args[3],m_mem->args[4]);
+            SetTitleInfo((unsigned int) m_mem->args[0],Get64(1),(unsigned int) m_mem->args[3],(unsigned int) m_mem->args[4],Get64(5));
             break;
         case apBackSetTrackInfo:
-            SetTrackInfo((unsigned int) m_mem->args[0],(unsigned int) m_mem->args[1],m_mem->args[2]);
+            SetTrackInfo((unsigned int) m_mem->args[0],(unsigned int) m_mem->args[1],Get64(2));
             break;
         case apBackSetChapterInfo:
-            SetChapterInfo((unsigned int) m_mem->args[0],(unsigned int) m_mem->args[1],m_mem->args[2]);
+            SetChapterInfo((unsigned int) m_mem->args[0],(unsigned int) m_mem->args[1],Get64(2));
             break;
         default:
             DebugFail(r,NULL);
             m_mem->args[0] = 0;
+            *(volatile uintptr_t*)(m_mem->args + 30) = (uintptr_t)(void*)AbiTag;
+            args = 1;
             break;
         }
 
-        cmd = apClientDone;
+        cmd = CmdPack(apClientDone,args,size);
     }
 }
 
@@ -351,3 +339,35 @@
     ApDebugOut(m_debug,buffer);
 }
 
+void CApClient::ITransport::DebugFailRoutine(uintptr_t arg0, const char* arg1, int line)
+{
+    m_client->DebugFailRoutine(arg0, arg1, line);
+}
+
+size_t CApClient::SetUtf8(const char* Str)
+{
+    size_t size;
+
+    if (NULL == Str)
+    {
+        size = 0;
+    } else {
+        size = strlen(Str) + 1;
+        memcpy((uint8_t*)m_mem->strbuf, Str, size);
+    }
+    return size;
+}
+
+size_t CApClient::SetUtf16(const utf16_t* Str)
+{
+    size_t size;
+
+    if (NULL == Str)
+    {
+        size = 0;
+    } else {
+        size = utf16toutf8((char*)m_mem->strbuf, 65000, Str, utf16len(Str) + 1);
+    }
+    return size;
+}
+

makemkv-oss-1.16.0.tar.gz/makemkvgui/src/clt_pipe.cpp Added

@@ -0,0 +1,147 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2020 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 <lgpl/byteorder.h>
+
+bool CPipeTransport::SendCmd(AP_SHMEM* p_mem)
+{
+    uint32_t cmd = p_mem->cmd;
+    unsigned int arg_count = (cmd >> 16) & 0xff;
+    unsigned int data_size = cmd & 0xffff;
+    unsigned int all_size = (1 + arg_count) * sizeof(uint32_t) + data_size;
+    uint32_t* data;
+
+    if (0 == data_size)
+    {
+        data = (p_mem->args - 1);
+
+        if ((0 == arg_count) && (cmd < 0x10000000))
+        {
+            cmd |= ((cmd >> 24) | 0xf00000f0);
+            all_size = 1;
+        } else {
+#if (_BYTE_ORDER != _LITTLE_ENDIAN)
+            for (unsigned int i = 0; i < arg_count; i++)
+            {
+                p_mem->args[i] = bswap_cpu_to_le32(p_mem->args[i]);
+            }
+#endif
+        }
+    } else {
+        data = ((uint32_t*)p_mem->strbuf) - (1 + arg_count);
+
+        for (unsigned int i = 0; i < arg_count; i++)
+        {
+            data[arg_count-i] = bswap_cpu_to_le32(p_mem->args[(arg_count-1)-i]);
+        }
+    }
+    data[0] = bswap_cpu_to_le32(cmd);
+
+    bool r;
+
+#ifdef DBG_GUARD_PIPE
+    if (false == this->SendData("gR", 2)) return false;
+#endif
+
+    r = this->SendData(data, all_size);
+
+#ifdef DBG_GUARD_PIPE
+    if (false == this->SendData("a\n", 2)) return false;
+#endif
+
+    return r;
+}
+
+bool CPipeTransport::RecvCmd(AP_SHMEM* p_mem)
+{
+    unsigned int rd;
+
+    uint32_t* data = (p_mem->args - 1);
+
+    static const unsigned int data_buffer_size = (sizeof(AP_SHMEM) - offsetof(AP_SHMEM, args)) + 1*sizeof(uint32_t);
+
+#ifdef DBG_GUARD_PIPE
+    uint8_t gbuf[2];
+    if (false == RecvData(gbuf, 2, &rd)) {
+        return false;
+    }
+    if (0 != memcmp(gbuf, "gR", 2)) {
+        return false;
+    }
+#endif
+
+    unsigned int have = 0;
+
+    while (have < 4)
+    {
+        if (false == RecvData(data+have, data_buffer_size-have, &rd))
+        {
+            return false;
+        }
+        have += rd;
+
+        if (have == 1)
+        {
+            uint8_t v = *((uint8_t*)data);
+            if (v >= 0xf0)
+            {
+                data[0] = bswap_cpu_to_le32( ((uint32_t)(v - 0xf0)) << 24);
+                have = 4;
+            }
+        }
+    }
+
+    uint32_t cmd = bswap_le32_to_cpu(data[0]);
+    unsigned int arg_count = (cmd >> 16) & 0xff;
+    unsigned int data_size = cmd & 0xffff;
+    unsigned int hdr_size = (1 + arg_count) * sizeof(uint32_t);
+    unsigned int all_size = hdr_size + data_size;
+
+    while (have < all_size)
+    {
+        if (false == RecvData( ((uint8_t*)data) + have, all_size - have, &rd))
+        {
+            return false;
+        }
+        have += rd;
+    }
+
+    if (have != all_size)
+    {
+        return false;
+    }
+
+#ifdef DBG_GUARD_PIPE
+    if (false == RecvData(gbuf, 2, &rd)) return false;
+    if (0 != memcmp(gbuf, "a\n",2)) return false;
+#endif
+
+    p_mem->cmd = cmd;
+
+#if (_BYTE_ORDER != _LITTLE_ENDIAN)
+    for (unsigned int i = 0; i < arg_count; i++)
+    {
+        p_mem->args[i] = bswap_le32_to_cpu(p_mem->args[i]);
+    }
+#endif
+
+    if (0 != data_size)
+    {
+        memmove(p_mem->strbuf, data + 1 + arg_count, data_size);
+    }
+
+    return true;
+}
+

makemkv-oss-1.16.0.tar.gz/makemkvgui/src/clt_shm.cpp Added

@@ -0,0 +1,69 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2020 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>
+
+bool CShMemTransport::Init1(char* name)
+{
+    strcpy(name, "shm");
+
+    return true;
+}
+
+bool CShMemTransport::Init2(CApClient* client, const char* response,const uint64_t* stdh)
+{
+    ApClosePipe(stdh[0]);
+
+    client->m_mem = (AP_SHMEM*) ApOpenShmem(response);
+    if (NULL== client->m_mem)
+    {
+        DebugFail(0,NULL);
+        return false;
+    }
+
+    if (false==ApOpenSgrp(&m_sem,(uint64_t*)client->m_mem->args))
+    {
+        DebugFail(0,NULL);
+        return false;
+    }
+
+    client->m_mem->flags |= AP_SHMEM_FLAG_START;
+
+    m_client = client;
+
+    DebugFail(0,"ok");
+    return true;
+}
+
+bool CShMemTransport::Transact()
+{
+    if (0 != (m_client->m_mem->flags&AP_SHMEM_FLAG_NOMEM)) return false;
+
+    if (false==ApSemInc(&m_sem,m_sem.a_id))
+    {
+        return false;
+    }
+
+    if (0 != (m_client->m_mem->flags&AP_SHMEM_FLAG_NOMEM)) return false;
+
+    if (false==ApSemDec(&m_sem,m_sem.b_id))
+    {
+        return false;
+    }
+
+    if (0 != (m_client->m_mem->flags&AP_SHMEM_FLAG_NOMEM)) return false;
+
+    return true;
+}
+

makemkv-oss-1.16.0.tar.gz/makemkvgui/src/clt_std.cpp Added

@@ -0,0 +1,89 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2020 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 <lgpl/sstring.h>
+
+
+bool CStdPipeTransport::Init1(char* name)
+{
+    strcpy(name, "std");
+    return true;
+}
+
+bool CStdPipeTransport::Init2(CApClient* client, const char* response,const uint64_t* stdh)
+{
+    uint8_t c;
+
+    m_hrd = stdh[0];
+    m_hwr = stdh[1];
+
+    client->m_mem = (AP_SHMEM*)malloc(sizeof(AP_SHMEM));
+    if (NULL == client->m_mem)
+    {
+        DebugFail(0, "ma");
+        return false;
+    }
+    memset((void*)client->m_mem, 0, sizeof(AP_SHMEM));
+
+    do
+    {
+        if (1 != ApReadPipe(m_hrd, &c, 1, AP_SEM_TIMEOUT))
+        {
+            DebugFail(0, "rdm");
+            return false;
+        }
+    } while (c != 0xaa);
+
+    c = 0xbb;
+    if (1 != ApWritePipe(m_hwr, &c, 1))
+    {
+        DebugFail(0, "wrm");
+        return false;
+    }
+
+    m_client = client;
+
+    DebugFail(0,"ok");
+    return true;
+}
+
+bool CStdPipeTransport::Transact()
+{
+    if (false == SendCmd((AP_SHMEM*)m_client->m_mem))
+    {
+        return false;
+    }
+
+    if (false == RecvCmd((AP_SHMEM*)m_client->m_mem))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool CStdPipeTransport::SendData(const void* Buffer, unsigned int Size)
+{
+    return (Size == ApWritePipe(m_hwr, Buffer, Size));
+}
+
+bool CStdPipeTransport::RecvData(void* Buffer, unsigned int Size, unsigned int *p_Received)
+{
+    int r = ApReadPipe(m_hrd, Buffer, Size, AP_SEM_TIMEOUT);
+    if (r <= 0) return false;
+    *p_Received = r;
+    return true;
+}
+

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/dirselectbox.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/dirselectbox.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/dirselectbox.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/dirselectbox.h Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/drivebox.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/drivebox.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/drivebox.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/drivebox.h Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/dvdbox.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/dvdbox.cpp Changed

@@ -16,24 +16,24 @@
 #include "qtgui.h"
 #include "qtapp.h"
 
-CDVDBox::CDVDBox(MainWnd *mainWnd,QIcon* icon,unsigned long Code,const utf16_t* Text[]) : QDialog(mainWnd)
+CDVDBox::CDVDBox(MainWnd *mainWnd,QIcon* icon,unsigned int Code, const unsigned int Codes[], const utf8_t* Text[]) : QDialog(mainWnd)
 {
     setWindowIcon(*icon);
     setWindowTitle(UI_QSTRING(Code));
     m_MainWnd = mainWnd;
 
-    QGroupBox* box1 = new QGroupBox(QStringFromUtf16(Text[0]));
+    QGroupBox* box1 = new QGroupBox(QStringFromCodeUtf8(Codes[0],Text[0]));
     QBoxLayout *lay1 = new QVBoxLayout();
     QGrayTextViewer* tview = new QGrayTextViewer();
-    tview->setHtmlBody(QStringFromConstUtf16(Text[2]));
+    tview->setHtmlBody(QStringFromCodeUtf8(Codes[2],Text[2]));
     lay1->addWidget(tview);
     box1->setLayout(lay1);
 
-    QGroupBox* box2 = new QGroupBox(QStringFromUtf16(Text[1]));
+    QGroupBox* box2 = new QGroupBox(QStringFromCodeUtf8(Codes[1],Text[1]));
     QBoxLayout *lay2 = new QVBoxLayout();
     QLabel *text = new QLabel();
     text->setTextFormat(Qt::RichText);
-    text->setText(QStringFromUtf16(Text[3]));
+    text->setText(QStringFromCodeUtf8(Codes[3],Text[3]));
     check(connect(text, &QLabel::linkActivated, mainWnd, &MainWnd::SlotLaunchUrl));
     m_Line = new QLineEdit();
     lay2->addWidget(text);

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/dvdbox.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/dvdbox.h Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/logic.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/logic.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/logic_posix.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/logic_posix.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/lstring.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/lstring.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/main.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/main.cpp Changed

@@ -42,16 +42,22 @@
     static CGUIApClient apc;
     QApplication app(argc, argv);
 
-    if (argc>=3)
+    char* appname = argv[0];
+
+    argv++; argc--;
+
+    if (argc>=2)
     {
-        if (strcmp(argv[1],"debug")==0)
+        if (strcmp(argv[0],"debug")==0)
         {
-            apc.EnableDebug(argv[2]);
+            apc.EnableDebug(argv[1]);
+            argv += 2; argc -= 2;
         }
 #ifdef Q_OS_WIN
-        if (strcmp(argv[1], "break")==0)
+        if (strcmp(argv[0], "break")==0)
         {
             __debugbreak();
+            argv += 2; argc -= 2;
         }
 #endif
     }
@@ -60,17 +66,58 @@
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 
+    CApClient::ITransport*  p_trans = NULL;
+
+    CShMemTransport     shmt;
+    CStdPipeTransport   stdt;
+    if ( (argc >= 1) && (strcmp(argv[0], "-std") == 0) )
+    {
+        p_trans = &stdt;
+        argv++; argc--;
+    }
+#if 0
+    if ((argc >= 2) && (strcmp(argv[0], "-net") == 0))
+    {
+        if (!nett.Init(argv[1]))
+        {
+            fprintf(stderr, "Network failed\n");
+            return 1;
+        }
+        p_trans = &nett;
+        argv+=2; argc-=2;
+    }
+#endif
+    if (NULL == p_trans)
+    {
+        p_trans = &shmt;
+    }
+
     unsigned int errcode;
-    if (false==apc.Init('G',"makemkvcon",&errcode))
+    if (false==apc.Init(p_trans,"makemkvcon",&errcode))
     {
-        QMessageBox::critical(NULL,UI_QSTRING(APP_CAPTION_MSG),UI_QSTRING(APP_INIT_FAILED));
+        QString msg = UI_QSTRING(APP_INIT_FAILED);
+
+        const char* err;
+        switch (errcode)
+        {
+        case 1:  err = "CANT_LOCATE_MAKEMKVCON"; break;
+        case 2:  err = "VERSION_MISMATCH"; break;
+        case 3:  err = "COMMUNICATION_FAILURE"; break;
+        case 4:  err = "NO_ANSWER_FROM_MAKEMKVCON"; break;
+        default: err = NULL; break;
+        }
+        if (err)
+        {
+            msg.append(QLatin1String("\n"));
+            msg.append(QLatin1String(err));
+        }
+        QMessageBox::critical(NULL,UI_QSTRING(APP_CAPTION_MSG),msg);
         return 1;
     }
 
     AppGetInterfaceLanguageData(&apc);
 
     const char* appdir;
-    char* appname = argv[0];
     char *aend = strrchr(appname,'/');
     if (!aend)
     {

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/mainwnd.cpp Changed

@@ -108,19 +108,19 @@
     RestoreGeometry();
 
     // rescan drives
-    App->UpdateAvailableDrives();
+    App->UpdateAvailableDrives(0);
     m_started=true;
 }
 
 void MainWnd::ReadStrings()
 {
-    app_name = QStringFromUtf16(m_app->GetAppString(AP_vastr_Name));
-    app_ver = QStringFromUtf16(m_app->GetAppString(AP_vastr_Version));
-    app_arch = QStringFromUtf16(m_app->GetAppString(AP_vastr_Platform));
-    app_keytype = QStringFromUtf16(m_app->GetAppString(AP_vastr_KeyType));
-    app_evalstate = QStringFromUtf16(m_app->GetAppString(AP_vastr_EvalState));
-    app_keytime = QStringFromUtf16(m_app->GetAppString(AP_vastr_KeyExpiration));
-    app_prgtime = QStringFromUtf16(m_app->GetAppString(AP_vastr_ProgExpiration));
+    app_name = QStringFromUtf8(m_app->GetAppString(AP_vastr_Name));
+    app_ver = QStringFromUtf8(m_app->GetAppString(AP_vastr_Version));
+    app_arch = QStringFromUtf8(m_app->GetAppString(AP_vastr_Platform));
+    app_keytype = QStringFromUtf8(m_app->GetAppString(AP_vastr_KeyType));
+    app_evalstate = QStringFromUtf8(m_app->GetAppString(AP_vastr_EvalState));
+    app_keytime = QStringFromUtf8(m_app->GetAppString(AP_vastr_KeyExpiration));
+    app_prgtime = QStringFromUtf8(m_app->GetAppString(AP_vastr_ProgExpiration));
     aboutAct->setEnabled(true);
 
     app_expired = (*m_app->GetAppString(AP_vastr_ProgExpired) == 'y');
@@ -129,9 +129,9 @@
 void MainWnd::ReReadSettings()
 {
     setting_DestinationType = m_app->GetSettingInt(apset_app_DestinationType);
-    setting_DestinationDir = QStringFromUtf16(m_app->GetSettingString(apset_app_DestinationDir));
+    setting_DestinationDir = QStringFromUtf8(m_app->GetSettingString(apset_app_DestinationDir));
     setting_ShowDebug = ( m_app->GetSettingInt(apset_app_ShowDebug) != 0 );
-    const utf16_t* dk = m_app->GetSettingString(apset_app_DebugKey);
+    const utf8_t* dk = m_app->GetSettingString(apset_app_DebugKey);
     setting_Debug = ((dk!=NULL)&&(dk[0]!=0));
 
     iface_ExpertMode = (*m_app->GetAppString(AP_vastr_ExpertMode) == 'y');
@@ -150,7 +150,7 @@
 void MainWnd::SlotAbout()
 {
     bool registered = false;
-    QString key_string = QStringFromUtf16(m_app->GetSettingString(apset_app_Key));
+    QString key_string = QStringFromUtf8(m_app->GetSettingString(apset_app_Key));
     if (key_string.length()==AP_KEY_STRING_LEN)
     {
         registered = true;
@@ -246,9 +246,9 @@
     m_last_version_count++;
     if ( ((m_last_version_count%3)==0) && (m_have_last_version==false) )
     {
-        app_lastver = QStringFromUtf16(m_app->GetAppString(AP_vastr_LatestVersion));
+        app_lastver = QStringFromUtf8(m_app->GetAppString(AP_vastr_LatestVersion));
         if (!app_lastver.isEmpty()) {
-            app_website = QStringFromUtf16(m_app->GetAppString(AP_vastr_WebSiteURL));
+            app_website = QStringFromUtf8(m_app->GetAppString(AP_vastr_WebSiteURL));
             m_have_last_version = true;
             if (m_about_dialog) m_about_dialog->OnIdle();
         }
@@ -265,7 +265,7 @@
 void MainWnd::AppExpired()
 {
     QPushButton *registerButton;
-    QString url = QStringFromUtf16(m_app->GetAppString(AP_vastr_WebSiteURL));
+    QString url = QStringFromUtf8(m_app->GetAppString(AP_vastr_WebSiteURL));
     QMessageBox msgBox(QMessageBox::Warning,UI_QSTRING(APP_CAPTION_MSG),UI_QSTRING(PROT_DEMO_KEY_EXPIRED).arg(url),QMessageBox::Ok,this);
     msgBox.setEscapeButton(QMessageBox::Ok);
     registerButton = msgBox.addButton(UI_QSTRING(APP_IFACE_ACT_REGISTER_NAME), QMessageBox::ActionRole);
@@ -284,8 +284,8 @@
 {
     unsigned int id = qobject_cast<QAction *>(sender())->data().toUInt();
 
-    QString filter = QStringFromUtf16(m_app->GetAppString((id==0)?AP_vastr_OpenFileFilter:AP_vastr_OpenDVDFileFilter));
-    QString dir = QStringFromUtf16(m_app->GetSettingString(apset_path_OpenFile));
+    QString filter = QStringFromUtf8(m_app->GetAppString((id==0)?AP_vastr_OpenFileFilter:AP_vastr_OpenDVDFileFilter));
+    QString dir = QStringFromUtf8(m_app->GetSettingString(apset_path_OpenFile));
 
     QString fileName = QFileDialog::getOpenFileName(this,
         UI_QSTRING(APP_IFACE_OPENFILE_TITLE),
@@ -392,7 +392,7 @@
     QString name = DriveInfo[ndx].strLabel;
 
     dlg.backupDir->setAppendName(&name);
-    dlg.backupDir->setText(QStringFromUtf16(m_app->GetAppString(AP_vastr_OutputBaseName)) + QLatin1String("/backup/") + name,true);
+    dlg.backupDir->setText(QStringFromUtf8(m_app->GetAppString(AP_vastr_OutputBaseName)) + QLatin1String("/backup/") + name,true);
     dlg.backupDir->setMRU(m_app->GetSettingString(apset_path_BackupDirMRU),&name);
 
     if (dlg.exec()==QDialog::Accepted)
@@ -407,7 +407,7 @@
 {
     m_FileInfo.setFile(saveFolderBox->text());
 
-    QString defPath = QStringFromUtf16(m_app->GetAppString(AP_vastr_OutputFolderName));
+    QString defPath = QStringFromUtf8(m_app->GetAppString(AP_vastr_OutputFolderName));
     bool custPath = (defPath != saveFolderBox->text());
 
     SlotInfoCboxIndexChanged();
@@ -948,7 +948,7 @@
 }
 
 
-void MainWnd::UpdateDrive(unsigned int Index,const utf16_t *DriveName,AP_DriveState DriveState,const utf16_t *DiskName,const utf16_t *DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize)
+void MainWnd::UpdateDrive(unsigned int Index,const utf8_t *DriveName,AP_DriveState DriveState,const utf8_t *DiskName,const utf8_t *DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize)
 {
     if (DriveState==AP_DriveStateNoDrive)
     {
@@ -961,7 +961,7 @@
 
     OpenDriveAction[Index]->setVisible(true);
     OpenDriveAction[Index]->setEnabled(false);
-    OpenDriveAction[Index]->setText(QStringFromUtf16(DriveName));
+    OpenDriveAction[Index]->setText(QStringFromUtf8(DriveName));
     UpdateDrivesCount();
 
     if (DriveState!=AP_DriveStateInserted)
@@ -973,9 +973,9 @@
         }
     }
 
-    QString disktext = QStringFromUtf16(DriveName);
+    QString disktext = QStringFromUtf8(DriveName);
     disktext += QLatin1String(" : ");
-    disktext += QStringFromUtf16(DiskName);
+    disktext += QStringFromUtf8(DiskName);
     OpenDriveAction[Index]->setText(disktext);
 
     DriveInfo[Index].Update(DriveState,DriveName,DiskName,DeviceName,FsFlags,DiskData,DiskDataSize);
@@ -1055,7 +1055,7 @@
 int MainWnd::ReportUiMessage(
     unsigned long Code,
     unsigned long Flags,
-    const utf16_t* Text,
+    const utf8_t* Text,
     uint64_t ExtraData
     )
 {
@@ -1084,7 +1084,7 @@
             icon = QMessageBox::Warning;
         }
 
-        QMessageBox msgBox(icon,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf16(Text),QMessageBox::Ok,this);
+        QMessageBox msgBox(icon,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf8(Text),QMessageBox::Ok,this);
         msgBox.setEscapeButton(QMessageBox::Ok);
 
         m_disable_onidle++;
@@ -1097,7 +1097,7 @@
     if ( (Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO )
     {
         m_disable_onidle++;
-        int v=QMessageBox::question(this,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf16(Text),QMessageBox::Yes|QMessageBox::No);
+        int v=QMessageBox::question(this,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf8(Text),QMessageBox::Yes|QMessageBox::No);
         m_disable_onidle--;
         switch(v)
         {
@@ -1109,7 +1109,7 @@
     if ( (Flags&AP_UIMSG_BOX_MASK) == AP_UIMSG_BOXYESNO_ERR )
     {
         m_disable_onidle++;
-        int v=QMessageBox::critical(this,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf16(Text),QMessageBox::Yes|QMessageBox::No);
+        int v=QMessageBox::critical(this,UI_QSTRING(APP_CAPTION_MSG),QStringFromUtf8(Text),QMessageBox::Yes|QMessageBox::No);
         m_disable_onidle--;
         switch(v)
         {
@@ -1130,10 +1130,10 @@
 
     if (0!=(Flags&AP_UIMSG_EVENT))
     {
-        notifyEvent(this,Code,QStringFromUtf16(Text),m_notify_name);
+        notifyEvent(this,Code,QStringFromUtf8(Text),m_notify_name);
     }
 
-    DoProcessLogMessage(QStringFromUtf16(Text),Flags,ExtraData);
+    DoProcessLogMessage(QStringFromUtf8(Text),Flags,ExtraData);
     return 0;
 }
 
@@ -1185,12 +1185,12 @@
 
 void MainWnd::SlotHelppage()
 {
-    SlotLaunchUrl(QStringFromUtf16(m_app->GetAppString(AP_vastr_WebSiteURL))+QLatin1String("onlinehelp/"));
+    SlotLaunchUrl(QStringFromUtf8(m_app->GetAppString(AP_vastr_WebSiteURL))+QLatin1String("onlinehelp/"));
 }
 
 void MainWnd::SlotPurchase()
 {
-    SlotLaunchUrl(QStringFromUtf16(m_app->GetAppString(AP_vastr_WebSiteURL))+QLatin1String("buy/"));
+    SlotLaunchUrl(QStringFromUtf8(m_app->GetAppString(AP_vastr_WebSiteURL))+QLatin1String("buy/"));
 }
 
 
@@ -1258,7 +1258,7 @@
 void MainWnd::SlotRegister()
 {
     bool ok = false;
-    QString key_string = QStringFromUtf16(m_app->GetSettingString(apset_app_Key));
+    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;
@@ -1307,12 +1307,12 @@
 void MainWnd::RestoreGeometry()
 {
     QByteArray byteData,byteBase;
-    const utf16_t* strValue;
+    const utf8_t* strValue;
 
     strValue = m_app->GetSettingString(apset_screen_state);
     if (strValue)
     {
-        byteBase = QStringFromUtf16(strValue).toLatin1();
+        byteBase = QByteArray(strValue);
         byteData = QByteArray::fromBase64(byteBase);
         restoreState(byteData);
     }
@@ -1320,7 +1320,7 @@
     strValue = m_app->GetSettingString(apset_screen_geometry);
     if (strValue)
     {
-        byteBase = QStringFromUtf16(strValue).toLatin1();
+        byteBase = QByteArray(strValue);
         byteData = QByteArray::fromBase64(byteBase);
         restoreGeometry(byteData);
     }
@@ -1335,13 +1335,13 @@
 #endif
 }
 
-int MainWnd::ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer)
+int MainWnd::ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const unsigned int Codes[], const utf8_t* Text[],utf8_t* Buffer)
 {
     *Buffer=0;
 
     if (Code==APP_DVD_MANUAL_TITLE)
     {
-        CDVDBox dbox(this,mainIcon,Code,Text);
+        CDVDBox dbox(this,mainIcon,Code,Codes,Text);
 
         m_disable_onidle++;
         int r = dbox.exec();
@@ -1358,7 +1358,7 @@
 
     if (Code==APP_SINGLE_DRIVE_TITLE)
     {
-        CDriveBox dbox(this,mainIcon,Count,Text);
+        CDriveBox dbox(this,mainIcon,Count,Codes,Text);
 
         m_disable_onidle++;
         int r = dbox.exec();

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/mainwnd.h Changed

@@ -72,8 +72,8 @@
     bool            load;
 public:
     CDriveInfo();
-    void Update(AP_DriveState DriveState,const utf16_t* DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize);
-    bool FormatDriveDiskInfo(const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize);
+    void Update(AP_DriveState DriveState,const utf8_t* DriveName,const utf8_t* DiskName,const utf8_t* DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize);
+    bool FormatDriveDiskInfo(const utf8_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize);
     bool showOpen();
 };
 
@@ -134,16 +134,16 @@
 private: // app actions
     void EnterJobMode(unsigned int Flags);
     void LeaveJobMode();
-    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);
+    void UpdateDrive(unsigned int Index,const utf8_t *DriveName,AP_DriveState DriveState,const utf8_t *DiskName,const utf8_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize);
     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 UpdateCurrentInfo(unsigned int Index,const utf8_t* Value);
     void SetTotalName(unsigned long Name);
 private:
     void DoProcessLogMessage(QString Message,unsigned int Flags,uint64_t ExtraData);
-    int ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text,uint64_t ExtraData);
-    int ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer);
+    int ReportUiMessage(unsigned long Code,unsigned long Flags,const utf8_t* Text,uint64_t ExtraData);
+    int ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const unsigned int Codes[],const utf8_t* Text[],utf8_t* Buffer);
     void Update_TitleTree_from_app(bool setFolder);
     void Refresh_TitleTree();
     void Update_TitleInfo_from_app();

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/margui.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/margui.cpp Changed

@@ -15,25 +15,52 @@
 #include <lgpl/aproxy.h>
 #include <strings.h>
 
+void CGUIApClient::SetOutputFolder(const utf8_t *Name)
+{
+    SetOutputFolder(SetUtf8(Name));
+}
+
 void CGUIApClient::SetOutputFolder(const utf16_t *Name)
 {
-    memcpy((void*)m_mem->strbuf,Name,(utf16len(Name)+1)*sizeof(utf16_t));
-    ExecCmd(apCallSetOutputFolder);
+    SetOutputFolder(SetUtf16(Name));
+}
+
+void CGUIApClient::SetOutputFolder(size_t NameSize)
+{
+    ExecCmd(apCallSetOutputFolder,0, NameSize);
+}
+
+bool CGUIApClient::OpenFile(const utf8_t* FileName, uint32_t Flags)
+{
+    return OpenFile(SetUtf8(FileName), Flags);
+}
+
+bool CGUIApClient::OpenFile(const utf16_t* FileName, uint32_t Flags)
+{
+    return OpenFile(SetUtf16(FileName), Flags);
 }
 
-bool CGUIApClient::OpenFile(const utf16_t* FileName,uint32_t Flags)
+bool CGUIApClient::OpenFile(size_t FileNameSize, uint32_t Flags)
 {
-    memcpy((void*)m_mem->strbuf,FileName,(utf16len(FileName)+1)*sizeof(utf16_t));
     m_mem->args[0]=Flags;
-    ExecCmd(apCallOpenFile);
+    ExecCmd(apCallOpenFile,1, FileNameSize);
     return (m_mem->args[0]!=0);
 }
 
-bool CGUIApClient::OpenTitleCollection(const utf16_t* Source,uint32_t Flags)
+bool CGUIApClient::OpenTitleCollection(const utf8_t* Source, uint32_t Flags)
+{
+    return OpenTitleCollection(SetUtf8(Source), Flags);
+}
+
+bool CGUIApClient::OpenTitleCollection(const utf16_t* Source, uint32_t Flags)
+{
+    return OpenTitleCollection(SetUtf16(Source), Flags);
+}
+
+bool CGUIApClient::OpenTitleCollection(size_t SourceSize, uint32_t Flags)
 {
-    memcpy((void*)m_mem->strbuf,Source,(utf16len(Source)+1)*sizeof(utf16_t));
     m_mem->args[0]=Flags;
-    ExecCmd(apCallOpenTitleCollection);
+    ExecCmd(apCallOpenTitleCollection,1, SourceSize);
     return (m_mem->args[0]!=0);
 }
 
@@ -41,29 +68,38 @@
 {
     m_mem->args[0]=Id;
     m_mem->args[1]=Flags;
-    ExecCmd(apCallOpenCdDisk);
+    ExecCmd(apCallOpenCdDisk,2,0);
     return (m_mem->args[0]!=0);
 }
 
 bool CGUIApClient::EjectDisk(unsigned int Id)
 {
     m_mem->args[0]=Id;
-    ExecCmd(apCallEjectDisk);
+    ExecCmd(apCallEjectDisk,1,0);
     return (m_mem->args[0]!=0);
 }
 
 bool CGUIApClient::SaveAllSelectedTitlesToMkv()
 {
-    ExecCmd(apCallSaveAllSelectedTitlesToMkv);
+    ExecCmd(apCallSaveAllSelectedTitlesToMkv,0,0);
     return (m_mem->args[0]!=0);
 }
 
-bool CGUIApClient::BackupDisc(unsigned int Id,const utf16_t* Folder,uint32_t Flags)
+bool CGUIApClient::BackupDisc(unsigned int Id, const utf8_t* Folder, uint32_t Flags)
+{
+    return BackupDisc(Id, SetUtf8(Folder), Flags);
+}
+
+bool CGUIApClient::BackupDisc(unsigned int Id, const utf16_t* Folder, uint32_t Flags)
+{
+    return BackupDisc(Id, SetUtf16(Folder), Flags);
+}
+
+bool CGUIApClient::BackupDisc(unsigned int Id, size_t FolderSize, 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);
+    ExecCmd(apCallBackupDisc,2, FolderSize);
     return (m_mem->args[0]!=0);
 }
 
@@ -71,8 +107,9 @@
 {
     if (!isset(&m_flags,7))
     {
-        m_client->m_mem->args[0] = m_handle;
-        m_client->ExecCmd(apCallGetUiItemState);
+        m_client->m_mem->args[0] = (uint32_t)m_handle;
+        m_client->m_mem->args[1] = (uint32_t)(m_handle>>32);
+        m_client->ExecCmd(apCallGetUiItemState,2,0);
         m_flags = (bmp_type_t)(m_client->m_mem->args[0]) | 0x80;
     }
 }
@@ -93,9 +130,10 @@
     }
     if (oldFlags != m_flags)
     {
-        m_client->m_mem->args[0] = m_handle;
-        m_client->m_mem->args[1] = m_flags;
-        m_client->ExecCmd(apCallSetUiItemState);
+        m_client->m_mem->args[0] = (uint32_t)(m_handle);
+        m_client->m_mem->args[1] = (uint32_t)(m_handle>>32);
+        m_client->m_mem->args[2] = m_flags;
+        m_client->ExecCmd(apCallSetUiItemState,3,0);
     }
 }
 
@@ -174,13 +212,14 @@
 {
     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);
+    m_client->m_mem->args[0]=(uint32_t)m_handle;
+    m_client->m_mem->args[1]=(uint32_t)(m_handle>>32);
+    m_client->m_mem->args[2]=Id;
+    m_client->ExecCmd(apCallGetUiItemInfo,3,0);
     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]);
+        m_infos[Id]=(utf16_t*)AppGetString((unsigned int)m_client->m_mem->args[0]);
         setzero(m_infos_alloc,Id);
     } else {
         if (0==m_client->m_mem->args[1])
@@ -188,9 +227,11 @@
             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));
+            const utf8_t* src = (utf8_t*)m_client->m_mem->strbuf;
+            size_t len8  = strlen(src);
+            size_t len16 = utf8toutf16len(src);
+            utf16_t* dst = m_infos[Id] = new utf16_t[len16+1];
+            utf8toutf16(dst, len16, src, len8); dst[len16] = 0;
             setone(m_infos_alloc,Id);
         }
     }
@@ -229,23 +270,24 @@
 
 int AP_UiItem::SetInfo(AP_ItemAttributeId Id,const utf16_t* Value)
 {
-    m_client->m_mem->args[0]=m_handle;
-    m_client->m_mem->args[1]=Id;
+    m_client->m_mem->args[0]=(uint32_t)m_handle;
+    m_client->m_mem->args[1]=(uint32_t)(m_handle>>32);
+    m_client->m_mem->args[2]=Id;
 
+    size_t size = 0;
     if (Value==NULL)
     {
-        m_client->m_mem->args[2]=0;
+        m_client->m_mem->args[3]=0;
     } else {
         if (Value[0]==0)
         {
-            m_client->m_mem->args[2]=0;
+            m_client->m_mem->args[3]=0;
         } else {
-            size_t len = utf16len(Value);
-            memcpy((void*)m_client->m_mem->strbuf,Value,(len+1)*sizeof(utf16_t));
-            m_client->m_mem->args[2]=1;
+            size = m_client->SetUtf16(Value);
+            m_client->m_mem->args[3]=1;
         }
     }
-    m_client->ExecCmd(apCallSetUiItemInfo);
+    m_client->ExecCmd(apCallSetUiItemInfo,4,size);
 
     Forget(Id);
     setone(m_infos_change,Id);
@@ -254,10 +296,11 @@
 
 int AP_UiItem::RevertInfo(AP_ItemAttributeId Id)
 {
-    m_client->m_mem->args[0]=m_handle;
-    m_client->m_mem->args[1]=Id;
-    m_client->m_mem->args[2]=2;
-    m_client->ExecCmd(apCallSetUiItemInfo);
+    m_client->m_mem->args[0]=(uint32_t)m_handle;
+    m_client->m_mem->args[1]=(uint32_t)(m_handle>>32);
+    m_client->m_mem->args[2]=Id;
+    m_client->m_mem->args[3]=2;
+    m_client->ExecCmd(apCallSetUiItemInfo,4,0);
 
     Forget(Id);
     setzero(m_infos_change,Id);
@@ -319,24 +362,10 @@
     m_TitleCollection.m_Updated=true;
 }
 
-bool CGUIApClient::GetInterfaceLanguage(unsigned int Id,utf16_t** Name,uint64_t** Param)
-{
-    m_mem->args[0]=Id;
-    ExecCmd(apCallGetInterfaceLanguage);
-    if (m_mem->args[0]==0)
-    {
-        return false;
-    }
-    *Name = (utf16_t*)m_mem->strbuf;
-    *Param = ((uint64_t*)&(m_mem->args[1]));
-
-    return true;
-}
-
 const void* CGUIApClient::GetInterfaceLanguageData(unsigned int Id,unsigned int* Size1,unsigned int* Size2)
 {
     m_mem->args[0]=Id;
-    ExecCmd(apCallGetInterfaceLanguageData);
+    ExecCmd(apCallGetInterfaceLanguageData,1,0);
     if (m_mem->args[0]==0)
     {
         return NULL;
@@ -346,32 +375,21 @@
     return (void*)m_mem->strbuf;
 }
 
-const utf16_t* CGUIApClient::GetProfileString(unsigned int Index,unsigned int Id)
-{
-    m_mem->args[0] = Index;
-    m_mem->args[1] = Id;
-    ExecCmd(apCallGetProfileString);
-    if (m_mem->args[0]==0)
-    {
-        return NULL;
-    } else {
-        return (utf16_t*)m_mem->strbuf;
-    }
-}
-
 int CGUIApClient::SetProfile(unsigned int Index)
 {
     m_mem->args[0] = Index;
-    ExecCmd(apCallSetProfile);
+    ExecCmd(apCallSetProfile,1,0);
     return (int)(m_mem->args[0]);
 }
 
-int CGUIApClient::SetExternAppFlags(const uint64_t* Flags)
+int CGUIApClient::SetExternAppFlags(const uint32_t* Flags,unsigned int Count)
 {
-    m_mem->args[0] = 2;
-    m_mem->args[1] = Flags[0];
-    m_mem->args[2] = Flags[1];
-    ExecCmd(apCallSetExternAppFlags);
+    m_mem->args[0] = Count;
+    for (unsigned int i = 0; i < Count; i++)
+    {
+        m_mem->args[i + 1] = Flags[i];
+    }
+    ExecCmd(apCallSetExternAppFlags,1+Count, 0);
     return (int)(m_mem->args[0]);
 }

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/marshall.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/marshall.cpp Changed

@@ -17,87 +17,96 @@
 
 void CApClient::SignalExit()
 {
-    ExecCmd(apCallSignalExit);
-    m_mem->exit = 1;
+    ExecCmd(apCallSignalExit,0,0);
+    m_mem->flags |= (AP_SHMEM_FLAG_EXIT | 1);
 }
 
 void CApClient::CancelAllJobs()
 {
-    ExecCmd(apCallCancelAllJobs);
+    ExecCmd(apCallCancelAllJobs,0,0);
 }
 
 void CApClient::OnIdle()
 {
-    ExecCmd(apCallOnIdle);
+    ExecCmd(apCallOnIdle,0,0);
 }
 
-bool CApClient::UpdateAvailableDrives()
+bool CApClient::UpdateAvailableDrives(uint32_t Flags)
 {
-    ExecCmd(apCallUpdateAvailableDrives);
+    m_mem->args[0]=Flags;
+    ExecCmd(apCallUpdateAvailableDrives,1,0);
     return (m_mem->args[0]!=0);
 }
 
 bool CApClient::CloseDisk(unsigned int EjectId)
 {
     m_mem->args[0]=EjectId;
-    ExecCmd(apCallCloseDisk);
+    ExecCmd(apCallCloseDisk,1,0);
     return (m_mem->args[0]!=0);
 }
 
 int CApClient::GetSettingInt(ApSettingId Id)
 {
     m_mem->args[0]=Id;
-    ExecCmd(apCallGetSettingInt);
+    ExecCmd(apCallGetSettingInt,1,0);
     return (int)(m_mem->args[0]);
 }
 
-const utf16_t* CApClient::GetSettingString(ApSettingId Id)
+const char* CApClient::GetSettingString(ApSettingId Id)
 {
     m_mem->args[0]=Id;
-    ExecCmd(apCallGetSettingString);
+    ExecCmd(apCallGetSettingString,1,0);
     if (0==m_mem->args[0]) return NULL;
-    return (utf16_t*)(m_mem->strbuf);
+    return (char*)(m_mem->strbuf);
 }
 
 void CApClient::SetSettingInt(ApSettingId Id,int Value)
 {
     m_mem->args[0]=Id;
     m_mem->args[1]=Value;
-    ExecCmd(apCallSetSettingInt);
+    ExecCmd(apCallSetSettingInt,2,0);
 }
 
-void CApClient::SetSettingString(ApSettingId Id,const utf16_t* Value)
+void CApClient::SetSettingString(ApSettingId Id, const utf8_t* Value)
+{
+    SetSettingString(Id, SetUtf8(Value));
+}
+
+void CApClient::SetSettingString(ApSettingId Id, const utf16_t* Value)
+{
+    SetSettingString(Id, SetUtf16(Value));
+}
+
+void CApClient::SetSettingString(ApSettingId Id, size_t ValueSize)
 {
     m_mem->args[0]=Id;
-    if (NULL==Value)
+    if (0 == ValueSize)
     {
         m_mem->args[1]=0;
     } else {
         m_mem->args[1]=1;
-        memcpy((void*)m_mem->strbuf,Value,(utf16len(Value)+1)*sizeof(utf16_t));
     }
-    ExecCmd(apCallSetSettingString);
+    ExecCmd(apCallSetSettingString,2,ValueSize);
 }
 
 bool CApClient::SaveSettings()
 {
-    ExecCmd(apCallSaveSettings);
+    ExecCmd(apCallSaveSettings,0,0);
     return (m_mem->args[0]!=0);
 }
 
-const utf16_t* CApClient::GetAppString(unsigned int Id,unsigned int Index1,unsigned int Index2)
+const char* CApClient::GetAppString(unsigned int Id,unsigned int Index1,unsigned int Index2)
 {
-    static const utf16_t zero = 0;
-    if (m_shutdown) return &zero;
+    if (m_shutdown) return "";
     m_mem->args[0] = Id;
     m_mem->args[1] = Index1;
     m_mem->args[2] = Index2;
-    ExecCmd(apCallAppGetString);
+    ExecCmd(apCallAppGetString,3,0);
     if (m_mem->args[0]==0)
     {
         return NULL;
     } else {
-        return (utf16_t*)m_mem->strbuf;
+        return (char*)m_mem->strbuf;
     }
 }

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/progress.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/progress.cpp Changed

@@ -114,6 +114,17 @@
     totalProgress.Update(Value,this);
 }
 
+static const utf16_t* utf16chr(const utf16_t *SrcString, utf16_t c)
+{
+    const uint16_t *p = SrcString;
+    while (*p != 0)
+    {
+        if (*p == c) return p;
+        p++;
+    }
+    return NULL;
+}
+
 void MainWnd::UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names)
 {
     bool log_at_end = logtext_progress->IsAtBottom();
@@ -170,13 +181,13 @@
     }
 }
 
-void MainWnd::UpdateCurrentInfo(unsigned int Index,const utf16_t* Value)
+void MainWnd::UpdateCurrentInfo(unsigned int Index,const utf8_t* Value)
 {
     QString str;
 
     if (Index>=AP_ProgressCurrentIndex_SourceName)
     {
-        m_notify_name = QStringFromUtf16(Value);
+        m_notify_name = QStringFromUtf8(Value);
         return;
     }
 
@@ -186,7 +197,7 @@
         str = FormatDiskFreeSpace(Value);
         break;
     default:
-        str = QStringFromUtf16(Value);
+        str = QStringFromUtf8(Value);
         break;
     }
     infoValues[Index]->setText(str);

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/qtapp.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/qtapp.h Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/qtstr.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/qtstr.h Changed

@@ -18,28 +18,25 @@
 QT_C_ASSERT(sizeof(ushort)==sizeof(utf16_t));
 QT_C_ASSERT(sizeof(ushort)==sizeof(QChar));
 
-static inline const utf16_t* Utf16FromQString(const QString &str)
+static inline QString QStringFromUtf8(const utf8_t *str)
 {
-    return (const utf16_t*)str.utf16();
+    return (NULL != str) ? QString::fromUtf8(str) : QString();
 }
 
-static inline QString QStringFromUtf16(const utf16_t *str)
+static inline QString QStringFromUtf8(const utf8_t *str, size_t count)
 {
-    QString t;
-    if (NULL!=str)
-    {
-        t.setUtf16((const ushort*)str,utf16len(str));
-    }
-    return t;
+    return QString::fromUtf8(str, count);
 }
 
-static inline QString QStringFromUtf16(const utf16_t *str,size_t count)
+static inline const utf16_t* Utf16FromQString(const QString &str)
 {
-    QString t;
-    t.setUtf16((const ushort*)str,count);
-    return t;
+    return (const utf16_t*)str.utf16();
 }
 
+static inline QString QStringFromUtf16(const utf16_t *str)
+{
+    return (NULL != str) ? QString::fromUtf16(str) : QString();
+}
 
 static inline utf16_t* QStringAccessBufferRW(QString &str)
 {
@@ -92,6 +89,23 @@
     Qstr.append(QStringFromConstUtf16(Str,Size));
 }
 
+static inline QString QStringFromCodeUtf8(unsigned int Code,const utf8_t *Str)
+{
+    if (0 != Code)
+    {
+        return UI_QSTRING(Code);
+    }  else {
+        return QStringFromUtf8(Str);
+    }
+}
 
-#endif // APP_QTSTR_H
+static inline QStringList splitSkipEmptyParts(const QString &str, char sep, Qt::CaseSensitivity cs = Qt::CaseSensitive)
+{
+#if (QT_VERSION >= 0x050f00)
+    return str.split(QLatin1Char(sep), Qt::SkipEmptyParts, cs);
+#else
+    return str.split(QLatin1Char(sep), QString::SkipEmptyParts, cs);
+#endif
+}
 
+#endif // APP_QTSTR_H

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/scsiinfo.cpp Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/settingdlg.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/settingdlg.cpp Changed

@@ -96,11 +96,9 @@
 
 void CSettingDialog::ReadSettings(bool first)
 {
-    static const utf16_t zero[1]={0};
-
     // general
-    const utf16_t *datapath = client->GetSettingString(apset_app_DataDir);
-    generalTab->dataDir->setText(QStringFromUtf16(datapath));
+    const utf8_t *datapath = client->GetSettingString(apset_app_DataDir);
+    generalTab->dataDir->setText(QStringFromUtf8(datapath));
 
     int show_debug = client->GetSettingInt(apset_app_ShowDebug);
     generalTab->check_DebugLog->setCheckState( (show_debug==0) ? Qt::Unchecked : Qt::Checked );
@@ -114,8 +112,8 @@
     int show_av = client->GetSettingInt(apset_app_ShowAVSyncMessages);
     generalTab->check_ShowAV->setCheckState( (show_av==0) ? Qt::Unchecked : Qt::Checked );
 
-    const utf16_t *app_proxy = client->GetSettingString(apset_app_Proxy);
-    generalTab->lineEditProxy->setText(QStringFromUtf16(app_proxy));
+    const utf8_t *app_proxy = client->GetSettingString(apset_app_Proxy);
+    generalTab->lineEditProxy->setText(QStringFromUtf8(app_proxy));
 
     // language
     languageTab->setValue(languageTab->comboBoxInterfaceLanguage,client->GetSettingString(apset_app_InterfaceLanguage));
@@ -145,9 +143,9 @@
     ioTab->checkSingleDrive->setCheckState( (single_drive==0) ? Qt::Unchecked : Qt::Checked );
 
     // dvd
-    const utf16_t *dest_path = client->GetSettingString(apset_app_DestinationDir);
-    if (NULL==dest_path) dest_path=zero;
-    dvdTab->destinationDir->setText(QStringFromUtf16(dest_path),true);
+    const utf8_t *dest_path = client->GetSettingString(apset_app_DestinationDir);
+    if (NULL==dest_path) dest_path="";
+    dvdTab->destinationDir->setText(QStringFromUtf8(dest_path),true);
     dvdTab->destinationDir->setMRU(client->GetSettingString(apset_path_DestDirMRU));
 
     int dest_type = client->GetSettingInt(apset_app_DestinationType);
@@ -159,7 +157,7 @@
     // prot
     int SpRemoveMethod = client->GetSettingInt(apset_dvd_SPRemoveMethod);
     protTab->comboBoxSpRemoveMethod->setCurrentIndex(SpRemoveMethod);
-    protTab->javaDir->setText(QStringFromUtf16( client->GetSettingString(apset_app_Java)));
+    protTab->javaDir->setText(QStringFromUtf8( client->GetSettingString(apset_app_Java)));
 
     int dump_always = client->GetSettingInt(apset_bdplus_DumpAlways);
     protTab->check_DumpAlways->setCheckState( (dump_always==0) ? Qt::Unchecked : Qt::Checked );
@@ -167,13 +165,13 @@
     decryptTab->LoadSettings(client);
 
     // advanced
-    const utf16_t *defaultProfile = client->GetSettingString(apset_app_DefaultProfileName);
-    if (NULL==defaultProfile) defaultProfile=zero;
+    const utf8_t *defaultProfile = client->GetSettingString(apset_app_DefaultProfileName);
+    if (NULL==defaultProfile) defaultProfile="";
     int profileIndex = 0;
     for (int index=1;index<advancedTab->comboProfile->count();++index)
     {
         if (defaultProfile[0]==0) break;
-        if (advancedTab->comboProfile->itemText(index) == QStringFromUtf16(defaultProfile))
+        if (advancedTab->comboProfile->itemText(index) == QStringFromUtf8(defaultProfile))
         {
             profileIndex = index;
             break;
@@ -181,23 +179,23 @@
     }
     advancedTab->comboProfile->setCurrentIndex(profileIndex);
 
-    const utf16_t *defaultSelection = client->GetSettingString(apset_app_DefaultSelectionString);
-    if (NULL==defaultSelection) defaultSelection=zero;
+    const utf8_t *defaultSelection = client->GetSettingString(apset_app_DefaultSelectionString);
+    if (NULL==defaultSelection) defaultSelection="";
     if (defaultSelection[0]==0)
     {
         defaultSelection = client->GetAppString(AP_vastr_DefaultSelectionString);
     }
-    advancedTab->lineEditSelection->setText(QStringFromUtf16(defaultSelection));
+    advancedTab->lineEditSelection->setText(QStringFromUtf8(defaultSelection));
 
-    const utf16_t *defaultOutputFileName = client->GetSettingString(apset_app_DefaultOutputFileName);
-    if (NULL==defaultOutputFileName) defaultOutputFileName=zero;
+    const utf8_t *defaultOutputFileName = client->GetSettingString(apset_app_DefaultOutputFileName);
+    if (NULL==defaultOutputFileName) defaultOutputFileName="";
     if (defaultOutputFileName[0]==0)
     {
         defaultOutputFileName = client->GetAppString(AP_vastr_DefaultOutputFileName);
     }
-    advancedTab->lineEditOutputFileName->setText(QStringFromUtf16(defaultOutputFileName));
+    advancedTab->lineEditOutputFileName->setText(QStringFromUtf8(defaultOutputFileName));
 
-    advancedTab->ccextractorDir->setText(QStringFromUtf16(client->GetSettingString(apset_app_ccextractor)));
+    advancedTab->ccextractorDir->setText(QStringFromUtf8(client->GetSettingString(apset_app_ccextractor)));
 
     toggleAdvanced(expert_mode!=0);
 
@@ -254,17 +252,17 @@
     {
         client->SetSettingString(apset_app_DefaultProfileName,Utf16FromQString(advancedTab->comboProfile->currentText()));
     } else {
-        client->SetSettingString(apset_app_DefaultProfileName,NULL);
+        client->SetSettingString(apset_app_DefaultProfileName,(const utf16_t*)NULL);
     }
-    if (advancedTab->lineEditSelection->text() == QStringFromUtf16(client->GetAppString(AP_vastr_DefaultSelectionString)))
+    if (advancedTab->lineEditSelection->text() == QStringFromUtf8(client->GetAppString(AP_vastr_DefaultSelectionString)))
     {
-        client->SetSettingString(apset_app_DefaultSelectionString,NULL);
+        client->SetSettingString(apset_app_DefaultSelectionString, (const utf16_t*)NULL);
     } else {
         client->SetSettingString(apset_app_DefaultSelectionString,Utf16FromQString(advancedTab->lineEditSelection->text()));
     }
-    if (advancedTab->lineEditOutputFileName->text() == QStringFromUtf16(client->GetAppString(AP_vastr_DefaultOutputFileName)))
+    if (advancedTab->lineEditOutputFileName->text() == QStringFromUtf8(client->GetAppString(AP_vastr_DefaultOutputFileName)))
     {
-        client->SetSettingString(apset_app_DefaultOutputFileName,NULL);
+        client->SetSettingString(apset_app_DefaultOutputFileName, (const utf16_t*)NULL);
     } else {
         client->SetSettingString(apset_app_DefaultOutputFileName,Utf16FromQString(advancedTab->lineEditOutputFileName->text()));
     }
@@ -489,17 +487,17 @@
 
     for (unsigned int i=0;i<AP_APP_LOC_MAX;i++)
     {
-        uint16_t* name;
-        uint64_t* param;
+        const utf8_t* name;
         QString qstrName;
 
-        if (!ap_client->GetInterfaceLanguage(i,&name,&param)) break;
+        name = ap_client->GetAppString(AP_vastr_InterfaceLanguage, i, 0);
+        if (NULL == name) break;
 
         qstrName.clear();
-        qstrName.reserve(10+utf16len(name));
-        qstrName.append(QStringFromUtf16(name).mid(0,3));
+        qstrName.reserve(10+strlen(name));
+        qstrName.append(QStringFromUtf8(name,3));
         qstrName.append(QString::fromLatin1(" : "));
-        qstrName.append(QStringFromUtf16(name).mid(4));
+        qstrName.append(QStringFromUtf8(name+4));
 
         comboBoxInterfaceLanguage->addItem(qstrName);
     }
@@ -541,7 +539,7 @@
     this->setLayout(lay);
 }
 
-void CLanguageTab::setValue(QComboBox*  comboBox,const utf16_t *value)
+void CLanguageTab::setValue(QComboBox*  comboBox,const utf8_t *value)
 {
     comboBox->setCurrentIndex(0);
     if (!value)
@@ -553,7 +551,7 @@
         return;
     }
 
-    QString valueStr = QStringFromUtf16(value);
+    QString valueStr = QStringFromUtf8(value);
 
     for (int i=1;i<comboBox->count();i++)
     {
@@ -602,10 +600,10 @@
     comboProfile->addItem(QString(UI_QSTRING(PROFILE_NAME_DEFAULT)));
     comboProfile->setEditable(false);
 
-    unsigned int profile_count = (unsigned int)utf16tol(ap_client->GetAppString(AP_vastr_ProfileCount));
+    unsigned int profile_count = (unsigned int)strtoul(ap_client->GetAppString(AP_vastr_ProfileCount),0,10);
     for (unsigned int i=1;i<profile_count;i++)
     {
-        comboProfile->addItem(QStringFromUtf16(ap_client->GetProfileString(i,0)));
+        comboProfile->addItem(QStringFromUtf8(ap_client->GetAppString(AP_vastr_ProfileString,i,0)));
     }
 
     lineEditSelection = new QLineEdit();
@@ -674,7 +672,7 @@
     for (unsigned int i=0; i<128; i++)
     {
         QTreeWidgetItem* item;
-        const utf16_t *itemStr;
+        const utf8_t *itemStr;
         unsigned int itemStatus;
 
         itemStr = client->GetAppString(AP_vastr_ExternalAppItem, i, 0);
@@ -689,10 +687,10 @@
         item->setCheckState(0, (((itemStatus&2)!=0)?Qt::Checked:Qt::Unchecked));
 
         itemStr = client->GetAppString(AP_vastr_ExternalAppItem, i, 1);
-        item->setText(0, QStringFromUtf16(itemStr));
+        item->setText(0, QStringFromUtf8(itemStr));
 
         itemStr = client->GetAppString(AP_vastr_ExternalAppItem, i, 2);
-        item->setText(1, QStringFromUtf16(itemStr));
+        item->setText(1, QStringFromUtf8(itemStr));
 
         viewItems->addTopLevelItem(item);
     }
@@ -704,17 +702,17 @@
 {
     unsigned int count = viewItems->topLevelItemCount();
     if (0==count) return true;
-    if (count>128) count=128;
+    if (count>256) count=256;
 
-    uint64_t bits[2]={0, 0};
+    uint32_t bits[8]={0};
 
     for (unsigned int i=0; i<count; i++)
     {
         if (Qt::Checked==viewItems->topLevelItem(i)->checkState(0))
         {
-            bits[i>>6] |= (((uint64_t)1) << (i&63));
+            bits[i>>5] |= (((uint32_t)1) << (i&31));
         }
     }
-    return (0==client->SetExternAppFlags(bits));
+    return (0==client->SetExternAppFlags(bits,8));
 }

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/settingdlg.h -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/settingdlg.h Changed

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/spawn_posix.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/spawn_posix.cpp Changed

@@ -24,6 +24,27 @@
 #include <stdio.h>
 #include <spawn.h>
 #include <lgpl/sysabi.h>
+#include <dlfcn.h>
+
+#ifdef _darwin_
+static const cpu_type_t     cpu_TYPE_ARM64  = (CPU_TYPE_ARM | CPU_ARCH_ABI64);
+static const cpu_subtype_t  cpu_SUBTYPE_ANY = ((cpu_subtype_t) -1);
+static const cpu_type_t     cpu_types[2]    = { cpu_TYPE_ARM64,  CPU_TYPE_ANY };
+static const cpu_subtype_t  cpu_subtypes[2] = { cpu_SUBTYPE_ANY, cpu_SUBTYPE_ANY };
+
+typedef int (*posix_spawnattr_setarchpref_np_t)(posix_spawnattr_t *, size_t, const cpu_type_t *, const cpu_subtype_t *, size_t *);
+
+static void darwin_spawnattr_set_best_arch(posix_spawnattr_t * attr)
+{
+    size_t count = 0;
+
+    posix_spawnattr_setarchpref_np_t setarchpref_np = (posix_spawnattr_setarchpref_np_t) dlsym(RTLD_DEFAULT,"posix_spawnattr_setarchpref_np");
+    if (setarchpref_np)
+    {
+        (*setarchpref_np)(attr,2,cpu_types,cpu_subtypes,&count);
+    }
+}
+#endif
 
 int SYS_posix_launch(char** argv,int fdstdin,int fdstdout,int fdstderr,char ** envp)
 {
@@ -49,6 +70,10 @@
     {
         return -1;
     }
+#ifdef _darwin_
+    darwin_spawnattr_set_best_arch(&spawn_attr);
+#endif
+
     if (posix_spawn_file_actions_init(&spawn_actions))
     {
         return -1;

makemkv-oss-1.15.4.tar.gz/makemkvgui/src/uisync.cpp -> makemkv-oss-1.16.0.tar.gz/makemkvgui/src/uisync.cpp Changed

@@ -833,7 +833,7 @@
         {
             saveFolderBox->clear();
             saveFolderBox->setMRU(m_app->GetSettingString(apset_path_DestDirMRU));
-            saveFolderBox->setText(QStringFromUtf16(m_app->GetAppString(AP_vastr_OutputFolderName)));
+            saveFolderBox->setText(QStringFromUtf8(m_app->GetAppString(AP_vastr_OutputFolderName)));
         }
 
     } else {
@@ -844,14 +844,14 @@
     // profile
     m_uisync_disabled++;
     profileCbox->clear();
-    unsigned int profile_count = (unsigned int)utf16tol(m_app->GetAppString(AP_vastr_ProfileCount));
+    unsigned int profile_count = (unsigned int)strtoul(m_app->GetAppString(AP_vastr_ProfileCount),NULL,10);
     if (profile_count>0)
     {
         for (unsigned int i=0;i<profile_count;i++)
         {
-            profileCbox->addItem(QStringFromUtf16(m_app->GetProfileString(i,0)));
+            profileCbox->addItem(QStringFromUtf8(m_app->GetAppString(AP_vastr_ProfileString,i,0)));
         }
-        profileCbox->setCurrentIndex((unsigned int)utf16tol(m_app->GetAppString(AP_vastr_CurrentProfile)));
+        profileCbox->setCurrentIndex((unsigned int)strtoul(m_app->GetAppString(AP_vastr_CurrentProfile),NULL,10));
         profileCbox->setEnabled(true);
     } else {
         profileCbox->setEnabled(false);
@@ -913,13 +913,13 @@
     return (diskType!=dtUnknown);
 }
 
-void CDriveInfo::Update(AP_DriveState DriveState,const utf16_t* DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize)
+void CDriveInfo::Update(AP_DriveState DriveState,const utf8_t* DriveName,const utf8_t* DiskName,const utf8_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize)
 {
     AP_DriveState   prevState = driveState;
 
     driveState = DriveState;
-    driveName = QStringFromUtf16(DriveName);
-    strLabel = QStringFromUtf16(DiskName);
+    driveName = QStringFromUtf8(DriveName);
+    strLabel = QStringFromUtf8(DiskName);
 
     diskFsFlags = FsFlags;
     load = false;

makemkv-oss-1.16.0.tar.gz/makemkvgui/src/utf8.cpp Added

@@ -0,0 +1,100 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2020 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 <stdint.h>
+#include <lgpl/aproxy.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);
+}
+
+size_t 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);
+
+    size_t len;
+    if (r!=conversionOK)
+    {
+        *dst_string = 0;
+        len = 0;
+    } else {
+        len = (d_start - (UTF8*)dst_string);
+    }
+    return len;
+}
+
+size_t utf8toutf16(uint16_t *dst_string,size_t dst_len,const char *src_string,size_t src_len)
+{
+    if (!dst_len) return 0;
+
+    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);
+
+    size_t len;
+    if (r!=conversionOK)
+    {
+        *dst_string = 0;
+        len = 0;
+    } else {
+        len = (d_start - (UTF16*)dst_string);
+    }
+    return len;
+}
+
+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) );
+}
+

Overview

Request 5338 (accepted)

Request History