Skip to content

Fix compilation issues and avoid iostream to greatly improve performance in wine #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trcrsired wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix compilation issues and avoid iostream to greatly improve performance in wine #3

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
358375f
optimize performance
trcrsired Aug 25, 2024
b595fdd
use range for loop and target c++11
trcrsired Aug 25, 2024
455bdb0
avoid posix and c layer
trcrsired Aug 25, 2024
04ab60e
add Usage with path
trcrsired Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
optimize performance
  • Loading branch information
@trcrsired
trcrsired committed Aug 25, 2024
commit 358375f51d0c2db1522feb983697e985822c5695
45 changes: 23 additions & 22 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
#include <stdio.h>
#include <iostream>
#include <sstream>
#include <vector>
#include <map>
#include <memory>
#include <string>

#include <windows.h>
#include <Dbghelp.h>
#include <dbghelp.h>

typedef std::map<std::string, std::string> DepMapType;

//------------------------------------------------------------------------------

const DepMapType getDependencies(const HMODULE hMod)
inline const DepMapType getDependencies(const HMODULE hMod)
{
DepMapType depsMap;

Expand All @@ -24,15 +25,13 @@ const DepMapType getDependencies(const HMODULE hMod)
char* dllName = (char*) ((BYTE*)hMod + pImportDesc->Name);

std::string dllPath = "";
HMODULE hModDep = ::LoadLibraryEx(dllName, NULL, DONT_RESOLVE_DLL_REFERENCES);
if(hModDep != 0)
std::unique_ptr<typename std::remove_pointer<HMODULE>::type,decltype(FreeLibrary)*> hModDep(::LoadLibraryEx(dllName, NULL, DONT_RESOLVE_DLL_REFERENCES),FreeLibrary);
if(hModDep)
{
LPTSTR strDLLPath = new TCHAR[_MAX_PATH];
::GetModuleFileName(hModDep, strDLLPath, _MAX_PATH);
dllPath = std::string(strDLLPath);
delete strDLLPath;
std::unique_ptr<typename std::remove_pointer<LPTSTR>::type[]> strDLLPath(new TCHAR[_MAX_PATH]);
::GetModuleFileName(hModDep.get(), strDLLPath.get(), _MAX_PATH);
dllPath = std::string(strDLLPath.get());
}
FreeLibrary(hModDep);
depsMap[std::string(dllName)] = dllPath;

pImportDesc++;
Expand All @@ -43,35 +42,34 @@ const DepMapType getDependencies(const HMODULE hMod)

//------------------------------------------------------------------------------

int printDependencies(const std::string libPath)
inline int printDependencies(::std::ostream& os,char const* libPath)
{
HMODULE hMod = ::LoadLibraryEx(libPath.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
if(hMod == 0)
std::unique_ptr<typename std::remove_pointer<HMODULE>::type,decltype(FreeLibrary)*> hMod(::LoadLibraryEx(libPath, NULL, DONT_RESOLVE_DLL_REFERENCES),FreeLibrary);
if(!hMod)
{
// Retrieves the last error message.
DWORD lastError = GetLastError();
char buffer[1024];
FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, 0, lastError, 0, buffer, 1024, 0 );
std::cerr << "\t" << buffer << std::endl;
fprintf(stderr,"\t%s\n",buffer);
return -1;
}
const DepMapType& depMap = getDependencies(hMod);
FreeLibrary(hMod);
const DepMapType& depMap = getDependencies(hMod.get());
DepMapType::const_iterator iter;
for(iter = depMap.begin(); iter != depMap.end(); ++iter)
{
std::cout << "\t" << iter->first << " => " << iter->second << std::endl;
os << "\t" << iter->first << " => " << iter->second << '\n';
}

return 0;
}

//------------------------------------------------------------------------------

int printUsage()
inline int printUsage()
{
std::cout << "ldd for Windows, Version 1.0" << std::endl;
std::cout << "usage:\n ldd FILE..." << std::endl;
puts("ldd for Windows, Version 1.0\n"
"usage:\n ldd FILE...\n");
return -1;
}

Expand All @@ -84,11 +82,14 @@ int main(int argc, char* argv[])
return printUsage();
}
int res = 0;
::std::ostringstream oss;
for(int i = 1; i < argc; ++i)
{
std::cout << argv[i] << std::endl;
res = printDependencies(argv[i]);
oss<<argv[i]<<'\n';
res = printDependencies(oss, argv[i]);
}
::std::string ossstr = oss.str();
fwrite(ossstr.data(),1,ossstr.size(),stdout);
return res;
}

Expand Down