From fdb1e753ce560ee6c72d88f1a17caf2e82a91be6 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 29 Jan 2024 17:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=EF=BC=8Ctwain--=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8D=8F=E8=AE=AE=E6=97=B6=E9=9C=80=E8=A6=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=8F=98=E9=87=8F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/twain_user/HGTwainImpl.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/twain_user/HGTwainImpl.cpp b/modules/twain_user/HGTwainImpl.cpp
index 5adb51b6..dd4ce46c 100644
--- a/modules/twain_user/HGTwainImpl.cpp
+++ b/modules/twain_user/HGTwainImpl.cpp
@@ -433,11 +433,19 @@ HGResult HGTwainDSImpl::GetDeviceName(HGChar* name, HGUInt maxLen)
     }
 
     HGCapValue value;
-    value.type = HGCAPVALUE_TYPE_STR255;
     HGResult ret = GetCapbility(0x8854, &value);
     if (HGBASE_ERR_OK == ret)
-        strcpy(name, value.valueStr255);
-
+    {
+        if (value.type == HGCAPVALUE_TYPE_STR32)
+            strcpy(name, value.valueStr32);
+        else if (value.type == HGCAPVALUE_TYPE_STR64)
+            strcpy(name, value.valueStr64);
+        else if (value.type == HGCAPVALUE_TYPE_STR128)
+            strcpy(name, value.valueStr128);
+        else if (value.type == HGCAPVALUE_TYPE_STR255)
+            strcpy(name, value.valueStr255);
+    }
+    
     return ret;
 }