Merge pull request #323 from ttttupup/dev-3.9.5.81

Dev 3.9.5.81
This commit is contained in:
ttttupup 2023-11-14 20:50:21 +08:00 committed by GitHub
commit 8b6e2d7160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1165,8 +1165,9 @@ INT64 Manager::SendApplet(const std::wstring &recv_wxid,
common::VectorInner *list = (common::VectorInner *)temp; common::VectorInner *list = (common::VectorInner *)temp;
prototype::WeChatString *member = BuildWechatString(recv_wxid); prototype::WeChatString *member = BuildWechatString(recv_wxid);
#ifdef _DEBUG
list->head = reinterpret_cast<UINT64>(member); list->head = reinterpret_cast<UINT64>(member);
#endif
list->start = reinterpret_cast<UINT64>(member); list->start = reinterpret_cast<UINT64>(member);
list->finsh = reinterpret_cast<UINT64>(member) + 0x20; list->finsh = reinterpret_cast<UINT64>(member) + 0x20;
list->end = reinterpret_cast<UINT64>(member) + 0x20; list->end = reinterpret_cast<UINT64>(member) + 0x20;
@ -1245,8 +1246,8 @@ INT64 Manager::DoOCRTask(const std::wstring &img_path, std::string &result) {
reinterpret_cast<UINT64>(buff),reinterpret_cast<UINT64>(&unkonwn)); reinterpret_cast<UINT64>(buff),reinterpret_cast<UINT64>(&unkonwn));
INT64 number = *(INT64 *)(buff + 0x8); INT64 number = *(INT64 *)(buff + 0x8);
if (number > 0) { if (number > 0) {
INT64 header = list->start; INT64 header = *(INT64 *)(buff);
for (unsigned int i = 0; i < number - 1; i++) { for (unsigned int i = 0; i < number; i++) {
INT64 content = *(INT64 *)header; INT64 content = *(INT64 *)header;
result += Utils::ReadWstringThenConvert(content + 0x28); result += Utils::ReadWstringThenConvert(content + 0x28);
result += "\r\n"; result += "\r\n";