From 1d21877cedc632dc2aabb165e5cc02ba91bdbd1d Mon Sep 17 00:00:00 2001 From: karikera Date: Fri, 29 Oct 2021 14:09:14 +0900 Subject: [PATCH] fix negative main if not found --- bdsx-core.sln | 2 +- bdsx/cachedpdb.cpp | 21 ++++++++++----------- bdsx/version.bat | 2 +- node-chakracore | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/bdsx-core.sln b/bdsx-core.sln index 3f58763..09f8cab 100644 --- a/bdsx-core.sln +++ b/bdsx-core.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30711.63 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "(Solution Items", "(Solution Items", "{6EAAC25C-870D-46AD-B6CD-FCC6AED10026}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "(Solution Items)", "(Solution Items)", "{6EAAC25C-870D-46AD-B6CD-FCC6AED10026}" ProjectSection(SolutionItems) = preProject packages\Microsoft.ChakraCore.vc140.1.11.24\build\native\Microsoft.ChakraCore.vc140.targets = packages\Microsoft.ChakraCore.vc140.1.11.24\build\native\Microsoft.ChakraCore.vc140.targets README.md = README.md diff --git a/bdsx/cachedpdb.cpp b/bdsx/cachedpdb.cpp index b0d6252..dacb8c8 100644 --- a/bdsx/cachedpdb.cpp +++ b/bdsx/cachedpdb.cpp @@ -294,7 +294,6 @@ int CachedPdb::getOptions() throws(JsException) } TText16 CachedPdb::undecorate(Text16 text, int flags) noexcept { - TText16 undecorated; undecorated << PdbReader::undecorate(text.data(), flags); return move(undecorated); @@ -368,12 +367,13 @@ autoptr CachedPdb::getProcAddress(pcstr16 predefined, pcstr name) noexcept TText line; line << txname; foundptr = m_pdb.getFunctionAddress(line.c_str()); - line << " = 0x" << hexf((byte*)foundptr - (byte*)m_pdb.base()); - cout << line << endl; - - targets.startWriting(); - *targets.fos << line << "\r\n"; - targets.fos->flush(); + if (foundptr != nullptr) { + line << " = 0x" << hexf((byte*)foundptr - (byte*)m_pdb.base()); + cout << line << endl; + targets.startWriting(); + *targets.fos << line << "\r\n"; + targets.fos->flush(); + } } catch (FunctionError& err) { @@ -740,9 +740,8 @@ void CachedPdb::getAllEx(JsValue cb) throws(kr::JsException) } local; local.now = timepoint::now(); local.cb = cb; - - m_pdb.getAllEx16([&local](Text16 name, SYMBOL_INFOW* info) { - + m_pdb.getAllEx([&local](Text name, SYMBOL_INFO* info) { + size_t size = name.size(); JsValue tuple = JsNewObject; tuple.set(s_field->typeIndex, (int)info->TypeIndex); tuple.set(s_field->index, (int)info->Index); @@ -760,7 +759,7 @@ void CachedPdb::getAllEx(JsValue cb) throws(kr::JsException) tuple.set(s_field->_register, (int)info->Register); tuple.set(s_field->scope, (int)info->Scope); tuple.set(s_field->tag, (int)info->Tag); - tuple.set(s_field->name, name); + tuple.set(s_field->name, TSZ16() << (NoneToUtf16)name); local.out.set(local.counter++, tuple); timepoint newnow = timepoint::now(); diff --git a/bdsx/version.bat b/bdsx/version.bat index 8bb4ca1..ffb8742 100644 --- a/bdsx/version.bat +++ b/bdsx/version.bat @@ -1,2 +1,2 @@ -set BDSX_CORE_VERSION=1.0.9.2 +set BDSX_CORE_VERSION=1.0.9.3 diff --git a/node-chakracore b/node-chakracore index 2ec680e..bac88fd 160000 --- a/node-chakracore +++ b/node-chakracore @@ -1 +1 @@ -Subproject commit 2ec680ed28c8f139dbc1080caf87fd1695c5ebb2 +Subproject commit bac88fd121a3fecea9199ed2d34f3049c989d4ae