From cfd6150971c926ecdc63bc24ff393f0db16011ee Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Tue, 16 May 2023 11:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sane_user/HGSaneImpl.cpp   | 7 ++++---
 modules/twain_user/HGTwainImpl.cpp | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/sane_user/HGSaneImpl.cpp b/modules/sane_user/HGSaneImpl.cpp
index 0926a663..904cb267 100644
--- a/modules/sane_user/HGSaneImpl.cpp
+++ b/modules/sane_user/HGSaneImpl.cpp
@@ -652,10 +652,11 @@ HGResult HGSaneDeviceImpl::GetCustomInfo(HGSaneDeviceCustomInfo *info)
 
     GetValueInt32(0x8852, &info->vid);
     GetValueInt32(0x8853, &info->pid);
-    GetValueStr256(CAP_SERIALNUMBER, info->sn, 32);
+    GetValueStr256(0x8856, info->sn, 32);
     GetValueStr256(0x8855, info->type, 32);
-    GetValueStr256(0x8025, info->fwVer, 32);
-    GetValueStr256(0x8200, info->ip, 32);
+    GetValueStr256(0x8857, info->fwVer, 32);
+    GetValueStr256(0x8858, info->ip, 32);
+    GetValueStr256(0x8859, info->mac, 32);
     GetValueStr256(0x884A, info->driverVer, 32);
     GetValueStr256(0x884B, info->vendor, 32);
     GetValueStr256(0x884C, info->copyright, 32);
diff --git a/modules/twain_user/HGTwainImpl.cpp b/modules/twain_user/HGTwainImpl.cpp
index 03d5c2d4..e179280b 100644
--- a/modules/twain_user/HGTwainImpl.cpp
+++ b/modules/twain_user/HGTwainImpl.cpp
@@ -418,10 +418,11 @@ HGResult HGTwainDSImpl::GetDeviceCustomInfo(HGTwainDeviceCustomInfo *info)
 
     GetCapInt32(0x8852, &info->vid);
     GetCapInt32(0x8853, &info->pid);
-    GetCapStr255(CAP_SERIALNUMBER, info->sn, 32);
+    GetCapStr255(0x8856, info->sn, 32);
     GetCapStr255(0x8855, info->type, 32);
-    GetCapStr255(0x8025, info->fwVer, 32);
-    GetCapStr255(0x8200, info->ip, 32);
+    GetCapStr255(0x8857, info->fwVer, 32);
+    GetCapStr255(0x8858, info->ip, 32);
+    GetCapStr255(0x8859, info->mac, 32);
     GetCapStr255(0x884A, info->driverVer, 32);
     GetCapStr255(0x884B, info->vendor, 32);
     GetCapStr255(0x884C, info->copyright, 32);