From c30b4562149df55ff196e60204235be028fd5cd0 Mon Sep 17 00:00:00 2001
From: Piotr Majkrzak <piotr@majkrzak.dev>
Date: Thu, 23 Feb 2023 15:48:50 +0100
Subject: [PATCH 1/3] Add read/write GBK encoding methods

---
 lib/codeplug.cc | 21 +++++++++++++++++++++
 lib/codeplug.hh |  6 ++++++
 2 files changed, 27 insertions(+)

diff --git a/lib/codeplug.cc b/lib/codeplug.cc
index be94c0c1..1c568eb2 100644
--- a/lib/codeplug.cc
+++ b/lib/codeplug.cc
@@ -1,6 +1,7 @@
 #include "codeplug.hh"
 #include "config.hh"
 #include <QtEndian>
+#include <QTextCodec>
 #include "logger.hh"
 #include "roamingchannel.hh"
 
@@ -579,6 +580,26 @@ Codeplug::Element::writeUnicode(unsigned offset, const QString &txt, unsigned ma
   }
 }
 
+QString
+Codeplug::Element::readGBK(unsigned offset, unsigned maxlen, uint8_t eos) const {
+  QByteArray txt;
+  uint8_t *ptr = (uint8_t *)(_data+offset);
+  for (unsigned i=0; (i<maxlen)&&(ptr[i])&&(eos!=ptr[i]); i++) {
+    txt.append((ptr[i]));
+  }
+  return QTextCodec::codecForName("GBK")->toUnicode(txt);
+}
+void
+Codeplug::Element::writeGBK(unsigned offset, const QString &txt, unsigned maxlen, uint8_t eos) {
+  QByteArray enc = QTextCodec::codecForName("GBK")->fromUnicode(txt);
+  uint8_t *ptr = (uint8_t *)(_data+offset);
+  for (unsigned i=0; i<maxlen; i++) {
+    if (i < unsigned(enc.length()))
+      ptr[i] = enc.at(i);
+    else
+      ptr[i] = eos;
+  }
+}
 
 /* ********************************************************************************************* *
  * Implementation of CodePlug::Context
diff --git a/lib/codeplug.hh b/lib/codeplug.hh
index bb36d3d6..1bd83898 100644
--- a/lib/codeplug.hh
+++ b/lib/codeplug.hh
@@ -178,6 +178,12 @@ public:
      * The stored string gets padded with @c eos to @c maxlen. */
     void writeUnicode(unsigned offset, const QString &txt, unsigned maxlen, uint16_t eos=0x0000);
 
+    /** Reads up to @c maxlen GBK char bytes at the given byte-offset using @c eos as the string termination char. */
+    QString readGBK(unsigned offset, unsigned maxlen, uint8_t eos=0x0000) const;
+    /** Stores up to @c maxlen GBK char bytes at the given byte-offset using @c eos as the string termination char.
+     * The stored string gets padded with @c eos to @c maxlen. */
+    void writeGBK(unsigned offset, const QString &txt, unsigned maxlen, uint8_t eos=0x0000);
+
   protected:
     /** Holds the pointer to the element. */
     uint8_t *_data;

From b1426d4f46cd468bda6718508335af86d32810f2 Mon Sep 17 00:00:00 2001
From: Piotr Majkrzak <piotr@majkrzak.dev>
Date: Thu, 23 Feb 2023 16:22:59 +0100
Subject: [PATCH 2/3] Update the way GBK strings are counted

---
 lib/codeplug.cc | 6 +++---
 lib/codeplug.hh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/codeplug.cc b/lib/codeplug.cc
index 1c568eb2..52463bc7 100644
--- a/lib/codeplug.cc
+++ b/lib/codeplug.cc
@@ -584,16 +584,16 @@ QString
 Codeplug::Element::readGBK(unsigned offset, unsigned maxlen, uint8_t eos) const {
   QByteArray txt;
   uint8_t *ptr = (uint8_t *)(_data+offset);
-  for (unsigned i=0; (i<maxlen)&&(ptr[i])&&(eos!=ptr[i]); i++) {
+  for (unsigned i=0; (i<maxlen*2)&&(ptr[i])&&(eos!=ptr[i]); i++) {
     txt.append((ptr[i]));
   }
   return QTextCodec::codecForName("GBK")->toUnicode(txt);
 }
 void
 Codeplug::Element::writeGBK(unsigned offset, const QString &txt, unsigned maxlen, uint8_t eos) {
-  QByteArray enc = QTextCodec::codecForName("GBK")->fromUnicode(txt);
+  QByteArray enc = QTextCodec::codecForName("GBK")->fromUnicode(txt.left(maxlen));
   uint8_t *ptr = (uint8_t *)(_data+offset);
-  for (unsigned i=0; i<maxlen; i++) {
+  for (unsigned i=0; i<maxlen*2; i++) {
     if (i < unsigned(enc.length()))
       ptr[i] = enc.at(i);
     else
diff --git a/lib/codeplug.hh b/lib/codeplug.hh
index 1bd83898..1e85f39a 100644
--- a/lib/codeplug.hh
+++ b/lib/codeplug.hh
@@ -178,9 +178,9 @@ public:
      * The stored string gets padded with @c eos to @c maxlen. */
     void writeUnicode(unsigned offset, const QString &txt, unsigned maxlen, uint16_t eos=0x0000);
 
-    /** Reads up to @c maxlen GBK char bytes at the given byte-offset using @c eos as the string termination char. */
+    /** Reads up to @c maxlen GBK chars at the given byte-offset using @c eos as the string termination char. */
     QString readGBK(unsigned offset, unsigned maxlen, uint8_t eos=0x0000) const;
-    /** Stores up to @c maxlen GBK char bytes at the given byte-offset using @c eos as the string termination char.
+    /** Stores up to @c maxlen GBK chars at the given byte-offset using @c eos as the string termination char.
      * The stored string gets padded with @c eos to @c maxlen. */
     void writeGBK(unsigned offset, const QString &txt, unsigned maxlen, uint8_t eos=0x0000);
 

From 27ad021b1c66d84591ac77c6c364bc53948f7902 Mon Sep 17 00:00:00 2001
From: Piotr Majkrzak <piotr@majkrzak.dev>
Date: Thu, 23 Feb 2023 16:32:22 +0100
Subject: [PATCH 3/3] Encode/decode channel name using GBK

---
 lib/anytone_codeplug.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/anytone_codeplug.cc b/lib/anytone_codeplug.cc
index 46a8f164..64364b1f 100644
--- a/lib/anytone_codeplug.cc
+++ b/lib/anytone_codeplug.cc
@@ -565,11 +565,11 @@ AnytoneCodeplug::ChannelElement::clearEncryptionKeyIndex() {
 
 QString
 AnytoneCodeplug::ChannelElement::name() const {
-  return readASCII(0x0023, 16, 0x00);
+  return readGBK(0x0023, 16, 0x00);
 }
 void
 AnytoneCodeplug::ChannelElement::setName(const QString &name) {
-  writeASCII(0x0023, name, 16, 0x00);
+  writeGBK(0x0023, name, 16, 0x00);
 }