Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-29 19:17:28 +01:00
Code Releases Wiki Activity

build: Updated libwolv

Browse Source
This commit is contained in:
WerWolv 2023-04-19 21:56:34 +02:00
parent 5fc8e710a5
commit 8245f3d4c9
9 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/external/libwolv vendored

@ -1 +1 @@
Subproject commit 76f8317e8e7c761879a34227bed22a4e647ea353
Subproject commit b81b211122d235f86c6b59bdb91436e8c9a603c1

2
lib/libimhex/CMakeLists.txt
View File

@ -69,4 +69,4 @@ elseif (APPLE)
endif ()
target_link_libraries(libimhex PRIVATE ${FMT_LIBRARIES})
target_link_libraries(libimhex PUBLIC dl imgui ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} libpl intervaltree ${MINIAUDIO_LIBRARIES} libwolv-utils libwolv-io libwolv-hash)
target_link_libraries(libimhex PUBLIC dl imgui ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} libpl intervaltree ${MINIAUDIO_LIBRARIES} libwolv-utils libwolv-io libwolv-hash libwolv-net)

5
lib/libimhex/include/hex.hpp
View File

@ -1,7 +1,4 @@
#pragma once
#include <hex/helpers/types.hpp>
#include <hex/helpers/intrinsics.hpp>
constexpr static const auto ImHexApiURL = "https://api.werwolv.net/imhex";
constexpr static const auto GitHubApiURL = "https://api.github.com/repos/WerWolv/ImHex";
#include <hex/helpers/intrinsics.hpp>

2
lib/libimhex/include/hex/api_urls.hpp Normal file
View File

@ -0,0 +1,2 @@
constexpr static const auto ImHexApiURL = "https://api.werwolv.net/imhex";
constexpr static const auto GitHubApiURL = "https://api.github.com/repos/WerWolv/ImHex";

1
main/source/init/tasks.cpp
View File

@ -3,6 +3,7 @@
#include <imgui.h>
#include <romfs/romfs.hpp>
#include <hex/api_urls.hpp>
#include <hex/api/content_registry.hpp>
#include <hex/api/project_file_manager.hpp>
#include <hex/api/theme_manager.hpp>

4
plugins/builtin/include/content/providers/gdb_provider.hpp
View File

@ -2,7 +2,7 @@
#include <hex/providers/provider.hpp>
#include <wolv/utils/socket.hpp>
#include <wolv/net/socket_client.hpp>
#include <array>
#include <mutex>
@ -53,7 +53,7 @@ namespace hex::plugin::builtin {
std::variant<std::string, i128> queryInformation(const std::string &category, const std::string &argument) override;
protected:
wolv::util::Socket m_socket;
wolv::net::SocketClient m_socket;
std::string m_ipAddress;
int m_port = 0;

11
plugins/builtin/source/content/providers/gdb_provider.cpp
View File

@ -56,15 +56,15 @@ namespace hex::plugin::builtin {
}
void sendAck(wolv::util::Socket &socket) {
void sendAck(wolv::net::SocketClient &socket) {
socket.writeString("+");
}
void continueExecution(wolv::util::Socket &socket) {
void continueExecution(wolv::net::SocketClient &socket) {
socket.writeString(createPacket("vCont;c"));
}
std::vector<u8> readMemory(wolv::util::Socket &socket, u64 address, size_t size) {
std::vector<u8> readMemory(wolv::net::SocketClient &socket, u64 address, size_t size) {
std::string packet = createPacket(hex::format("m{:X},{:X}", address, size));
socket.writeString(packet);
@ -88,7 +88,7 @@ namespace hex::plugin::builtin {
return data;
}
void writeMemory(wolv::util::Socket &socket, u64 address, const void *buffer, size_t size) {
void writeMemory(wolv::net::SocketClient &socket, u64 address, const void *buffer, size_t size) {
std::vector<u8> bytes(size);
std::memcpy(bytes.data(), buffer, size);
@ -101,7 +101,7 @@ namespace hex::plugin::builtin {
auto receivedPacket = socket.readString(6);
}
bool enableNoAckMode(wolv::util::Socket &socket) {
bool enableNoAckMode(wolv::net::SocketClient &socket) {
socket.writeString(createPacket("QStartNoAckMode"));
auto ack = socket.readString(1);
@ -245,6 +245,7 @@ namespace hex::plugin::builtin {
}
bool GDBProvider::open() {
this->m_socket = wolv::net::SocketClient(wolv::net::SocketClient::Type::TCP);
this->m_socket.connect(this->m_ipAddress, this->m_port);
if (!gdb::enableNoAckMode(this->m_socket)) {
this->m_socket.disconnect();

3
plugins/builtin/source/content/views/view_store.cpp
View File

@ -1,5 +1,6 @@
#include "content/views/view_store.hpp"
#include "hex/api/theme_manager.hpp"
#include <hex/api/theme_manager.hpp>
#include <hex/api_urls.hpp>
#include <hex/api/content_registry.hpp>

1
tests/helpers/source/net.cpp
View File

@ -1,5 +1,6 @@
#include <hex/test/tests.hpp>
#include <hex/api_urls.hpp>
#include <hex/helpers/http_requests.hpp>
#include <wolv/io/file.hpp>
#include <hex/helpers/fs.hpp>