fix: correctly use SymSearch function

siemens · Apr 3, 2019 · 63ee854 · 63ee854
1 parent ae71a78
commit 63ee854
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ManagedResolver/src/ProtocolHandler.cpp b/ManagedResolver/src/ProtocolHandler.cpp
@@ -301,9 +301,12 @@ namespace msr {
         std::string strpath(symreq.path.data());
         std::wstring wstrpath(strpath.begin(), strpath.end());
 
-        logger->debug("search symobls matching {} at {}", symreq.match.data(), (void*)symreq.base);
+        logger->debug("search symbols matching {} at {} - full: {}",
+            symreq.match.data(),
+            (void*)symreq.base,
+            symreq.full ? "no" : "yes");
         if (symsearch(_phandle, symreq.base, 0, 0, symreq.match.data(), 0, SymbolMatchCallback,
-            (void*)&symbol_addrs, symreq.full ? SYMSEARCH_ALLITEMS : NULL))
+            (void*)&symbol_addrs, symreq.full ? SYMSEARCH_ALLITEMS : SYMSEARCH_GLOBALSONLY))
         {
             auto & symresp = _shmdriver->emplace<ipc::SymbolResponse>(ipc::SMDataID::SEARCHSYMS);
             symresp.size = std::min(symbol_addrs.size(), symresp.adresses.size());

diff --git a/drace-client/src/function-wrapper.cpp b/drace-client/src/function-wrapper.cpp
@@ -51,6 +51,8 @@ namespace drace {
         // set to true if at least one function is wrapped
         bool wrapped_some = false;
 		std::string modname(dr_module_preferred_name(mod));
+        // remove ".dll / .exe" part
+        modname.erase(modname.size() - 4);
 		for (const auto & name : syms) {
 			LOG_NOTICE(-1, "Search for %s", name.c_str());
 			if (method == Method::EXTERNAL_MPCR) {