Skip to content
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.

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

Patch 1 - Fixes casting errors in Visual Studio. #80

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions src/DlgModules.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,24 @@ void ModulesDlg::RefreshList( )

// Module platform
if (mod.second->type == blackbone::mt_mod32)
platfom = L"32 bit";
platfom = (wchar_t*)L"32 bit";
else if (mod.second->type == blackbone::mt_mod64)
platfom = L"64 bit";
platfom = (wchar_t*)L"64 bit";
else
platfom = L"Unknown";
platfom = (wchar_t*)L"Unknown";

// Mapping type
if (mod.second->manual == true)
detected = L"Manual map";
detected = (wchar_t*)L"Manual map";
else if (modsLdr.count( mod.first ))
detected = L"Normal";
detected = (wchar_t*)L"Normal";
else if (modsSec.count( mod.first ))
detected = L"Section only";
detected = (wchar_t*)L"Section only";
else if (mod.second->name.find( L"Unknown_0x" ) == 0)
detected = L"PE header";
detected = (wchar_t*)L"PE header";
else
detected = L"Unknown";
detected = (wchar_t*)L"Unknown";

_modList.AddItem( mod.second->name, static_cast<LPARAM>(mod.second->baseAddress), { address, platfom, detected } );
}
}
}
2 changes: 1 addition & 1 deletion src/DlgSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ DWORD DlgSettings::HandleDriver( uint32_t type )
Wow64DisableWow64FsRedirection( &oldVal );

// For some reason running BCDedit directly does not enable test signing from WOW64 process
if (CreateProcessW( bcdpath.c_str(), L"/C Bcdedit.exe -set TESTSIGNING ON", NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))
if (CreateProcessW( bcdpath.c_str(), (LPWSTR)L"/C Bcdedit.exe -set TESTSIGNING ON", NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))
{
Message::ShowWarning( _hwnd, L"You must reboot your computer for the changes to take effect" );

Expand Down
2 changes: 1 addition & 1 deletion src/ProfileMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ bool ProfileMgr::Load( const std::wstring& path /*= L""*/ )
if(xml.has( L"XenosConfig.imagePath" ))
{
auto nodes = xml.all_nodes_named( L"XenosConfig.imagePath" );
for (auto& node : nodes)
for (auto node : nodes)
_config.images.emplace_back( node.value() );
}

Expand Down
4 changes: 2 additions & 2 deletions src/Routines.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,9 @@ void MainDlg::AddToModuleList( std::shared_ptr<blackbone::pe::PEImage>& img )
if (img->mType() == blackbone::mt_mod32)
platfom = L"32 bit";
else if (img->mType() == blackbone::mt_mod64)
platfom = L"64 bit";
platfom = (wchar_t*)L"64 bit";
else
platfom = L"Unknown";
platfom = (wchar_t*)L"Unknown";

_images.emplace_back( img );
_modules.AddItem( blackbone::Utils::StripPath( img->path() ), 0, { platfom } );
Expand Down