clean up some stuff, remove wine wrapper for now

Author: Prevter

CMakeLists.txt

@@ -11,30 +11,16 @@ target_include_directories(${PROJECT_NAME} PUBLIC include)
 # Windows has some extra code
 if (WIN32)
   target_sources(${PROJECT_NAME} PRIVATE src/platform/windows.cpp)
-
-  if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
-    set(TARGET_MASM_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/platform/wine_masm.asm")
-    set(TARGET_OBJ_FILE "${CMAKE_CURRENT_BINARY_DIR}/wine_masm.obj")
-    add_custom_command(
-      OUTPUT "${TARGET_OBJ_FILE}"
-      COMMAND ml64 /c /Fo${TARGET_OBJ_FILE} "${TARGET_MASM_FILE}"
-      DEPENDS "${TARGET_MASM_FILE}"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-      COMMENT "Assembling ${TARGET_MASM_FILE}"
-      VERBATIM
-    )
-
-    add_custom_target(assemble_wine_masm ALL DEPENDS "${TARGET_OBJ_FILE}")
-    add_dependencies(${PROJECT_NAME} assemble_wine_masm)
-
-    target_link_libraries(${PROJECT_NAME} PRIVATE "${TARGET_OBJ_FILE}")
-  endif()
 endif()
 
-CPMAddPackage("gh:fmtlib/fmt#11.0.2")
-CPMAddPackage("gh:stephenberry/glaze@4.4.3")
+CPMAddPackage("gh:fmtlib/fmt#11.2.0")
+CPMAddPackage("gh:stephenberry/glaze@5.2.0")
 target_link_libraries(${PROJECT_NAME} PRIVATE fmt glaze::glaze)
 
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(DISCORD_RPC_BUILD_TESTS ON)
+endif()
+
 if (DISCORD_RPC_BUILD_TESTS)
   add_subdirectory(test)
 endif()

README.md

@@ -10,7 +10,7 @@ A simple Discord Rich Presence library for C++ made from scratch.
 - [x] Linux support
 - [x] MacOS support
 - [x] Windows support
-- [x] Out-of-the-box Wine support
+- [ ] ~~Out-of-the-box Wine support~~ (postponed until a better solution is found)
 - [ ] Events (join, spectate, etc.)
 - [ ] Auto register (for steam games)
 - [ ] Documentation
@@ -29,7 +29,7 @@ that uses a modern C++ style and has more features.
 - **Buttons**: Undocumented/unimplemented feature in discord, that allows you to add custom links to your presence.
 - **Project integration**: Say goodbye to copying library files or dealing with RapidJSON errors. This library can be easily integrated into your project without any hassle.
 - **Cross-platform**: This library is designed to work on all supported platforms, including Linux, macOS, and Windows.
-- **Wine support**: Library provides internal layer to support Wine, no extra configuration needed.
+- ~~**Wine support**: Library provides internal layer to support Wine, no extra configuration needed.~~
 
 ---
 

src/platform/windows.cpp

@@ -1,174 +1,7 @@
 #include "windows.hpp"
 #include <fmt/format.h>
 
-#ifndef DISCORD_DISABLE_WINE_LAYER
-#if defined(_M_IX86) || defined(_X86_) // x86
-#include "wine_x86.hpp"
-#elif defined(__GNUC__) || defined(__clang__) // x86_64 (GCC/Clang)
-#include "wine_gcc.hpp"
-#elif defined(_MSC_VER) // x86_64 (MSVC)
-extern "C" {
-int wine_close(uint32_t fd);
-int wine_open(const char* path, int flags, int mode);
-ssize_t wine_read(uint32_t fd, void* buffer, size_t count);
-ssize_t wine_write(uint32_t fd, const void* buf, size_t count);
-int wine_socket(int domain, int type, int protocol);
-int wine_connect(int sockfd, const struct sockaddr* addr, socklen_t addrlen);
-int wine_fcntl(int fd, int cmd, int arg);
-}
-#endif
-#endif
-
 namespace discord::platform {
-    #ifndef DISCORD_DISABLE_WINE_LAYER
-    HMODULE getNTDLL() noexcept {
-        static HMODULE ntdll = ::GetModuleHandleW(L"ntdll.dll");
-        return ntdll;
-    }
-
-    bool isWine() noexcept {
-        static auto isWine = []() {
-            auto ntdll = getNTDLL();
-            if (!ntdll) {
-                return false;
-            }
-
-            return ::GetProcAddress(ntdll, "wine_get_version") != nullptr;
-        }();
-        return isWine;
-    }
-
-    const char* getenv(const char* name) noexcept {
-        static char buffer[1024 * 1024]{};
-        static const char* end = nullptr;
-
-        if (!end) {
-            auto fd = wine_open("/proc/self/environ", 0, 0);
-            if (fd < 0) {
-                return nullptr;
-            }
-
-            auto n = wine_read(fd, buffer, sizeof(buffer));
-            if (n < 0) {
-                wine_close(fd);
-                return nullptr;
-            }
-
-            wine_close(fd);
-            end = buffer + n;
-        }
-
-        auto namelen = ::strlen(name);
-
-        for (const char* ptr = buffer; ptr < end;) {
-            if (!::strncmp(ptr, name, namelen) && ptr[namelen] == '=') {
-                return ptr + namelen + 1;
-            }
-
-            for (; *ptr && ptr < end; ++ptr);
-            ++ptr;
-        }
-
-        return nullptr;
-    }
-
-    const char* getTempPath() noexcept {
-        static const char* path = []() {
-            const char* tmp = getenv("XDG_RUNTIME_DIR");
-            tmp = tmp ? tmp : getenv("TMPDIR");
-            tmp = tmp ? tmp : getenv("TMP");
-            tmp = tmp ? tmp : getenv("TEMP");
-            return tmp ? tmp : "/tmp";
-        }();
-        return path;
-    }
-
-    wine::WineConnector& wine::WineConnector::get() noexcept {
-        static WineConnector instance;
-        return instance;
-    }
-
-    bool wine::WineConnector::open() noexcept {
-        if (isOpen() || m_socket != -1) {
-            return false;
-        }
-
-        m_socket = wine_socket(AF_UNIX, SOCK_STREAM, 0);
-        if (m_socket == -1) {
-            return false;
-        }
-
-        wine_fcntl(m_socket, F_SETFL, O_NONBLOCK);
-        for (int i = 0; i < 10; ++i) {
-            fmt::format_to(m_address.sun_path, "{}/discord-ipc-{}", getTempPath(), i);
-            if (wine_connect(m_socket, reinterpret_cast<sockaddr*>(&m_address), sizeof(m_address)) == 0) {
-                setOpen(true);
-                return true;
-            }
-        }
-
-        m_socket = -1;
-        return false;
-    }
-
-    bool wine::WineConnector::close() noexcept {
-        if (!isOpen() || m_socket == -1) {
-            return false;
-        }
-
-        wine_close(m_socket);
-        m_socket = -1;
-        setOpen(false);
-        return true;
-    }
-
-    bool wine::WineConnector::write(const void* data, size_t length) noexcept {
-        if (!isOpen() || m_socket == -1) {
-            return false;
-        }
-
-        auto written = wine_write(m_socket, data, length);
-        if (written < 0) {
-            this->close();
-            return false;
-        }
-
-        return static_cast<size_t>(written) == length;
-    }
-
-    bool wine::WineConnector::read(void* data, size_t length) noexcept {
-        if (!isOpen() || m_socket == -1) {
-            return false;
-        }
-
-        auto received = wine_read(m_socket, data, length);
-        if (received < 0) {
-            if (received == -EAGAIN || received == -EWOULDBLOCK) {
-                return false;
-            }
-
-            this->close();
-            return false;
-        }
-
-        if (received == 0) {
-            this->close();
-            return false;
-        }
-
-        return static_cast<size_t>(received) == length;
-    }
-
-    bool wine::WineConnector::isOpen() noexcept {
-        return PipeConnection::get().isOpen();
-    }
-
-    void wine::WineConnector::setOpen(bool open) noexcept {
-        PipeConnection::get().m_isOpen = open;
-    }
-
-    #endif
-
     size_t getProcessID() noexcept {
         return ::GetCurrentProcessId();
     }
@@ -183,12 +16,6 @@ namespace discord::platform {
             return false;
         }
 
-        #ifndef DISCORD_DISABLE_WINE_LAYER
-        if (isWine()) {
-            return wine::WineConnector::get().open();
-        }
-        #endif
-
         wchar_t pipeName[] = L"\\\\?\\pipe\\discord-ipc-0";
         constexpr size_t pipeDigit = sizeof(pipeName) / sizeof(wchar_t) - 2;
         while (true) {
@@ -216,12 +43,6 @@ namespace discord::platform {
     }
 
     bool PipeConnection::close() noexcept {
-        #ifndef DISCORD_DISABLE_WINE_LAYER
-        if (isWine()) {
-            return wine::WineConnector::get().close();
-        }
-        #endif
-
         if (m_pipe != INVALID_HANDLE_VALUE) {
             ::CloseHandle(m_pipe);
             m_pipe = INVALID_HANDLE_VALUE;
@@ -235,12 +56,6 @@ namespace discord::platform {
             return true;
         }
 
-        #ifndef DISCORD_DISABLE_WINE_LAYER
-        if (isWine()) {
-            return wine::WineConnector::get().write(data, length);
-        }
-        #endif
-
         if (m_pipe == INVALID_HANDLE_VALUE) {
             return false;
         }
@@ -262,12 +77,6 @@ namespace discord::platform {
             return false;
         }
 
-        #ifndef DISCORD_DISABLE_WINE_LAYER
-        if (isWine()) {
-            return wine::WineConnector::get().read(data, length);
-        }
-        #endif
-
         if (m_pipe == INVALID_HANDLE_VALUE) {
             return false;
         }

src/platform/windows.hpp

@@ -10,63 +10,11 @@
 #include <cstdint>
 #include <Windows.h>
 
-// only enable wine layer on x86 and x86_64
-#if !defined(_M_IX86) && !defined(_X86_) && !defined(_M_X64) && !defined(_AMD64_)
-#define DISCORD_DISABLE_WINE_LAYER 1
-#else
-
-struct sockaddr_un {
-    unsigned short sun_family;
-    char sun_path[108];
-};
-
-#define AF_UNIX     1
-#define SOCK_STREAM 1
-#define F_SETFL     4
-#define O_RDONLY    00000000
-#define O_WRONLY    00000001
-#define O_CREAT     00000100
-#define O_APPEND    00002000
-#define O_NONBLOCK  00004000
-#define BUFSIZE 2048
-
-using socklen_t = uint32_t;
-using ssize_t = intptr_t;
-
-#endif
-
 namespace discord::platform {
-    // wine compatibility layer
-    #ifndef DISCORD_DISABLE_WINE_LAYER
-    namespace wine {
-        class WineConnector {
-            WineConnector() noexcept {
-                m_address.sun_family = AF_UNIX;
-            }
-
-        public:
-            static WineConnector& get() noexcept;
-            bool open() noexcept;
-            bool close() noexcept;
-
-            bool write(const void* data, size_t length) noexcept;
-            bool read(void* data, size_t length) noexcept;
-
-            [[nodiscard]] static bool isOpen() noexcept;
-            static void setOpen(bool open) noexcept;
-
-        private:
-            sockaddr_un m_address{};
-            int m_socket = -1;
-        };
-    }
-    #endif
-
     size_t getProcessID() noexcept;
 
     class PipeConnection {
         PipeConnection() noexcept = default;
-        friend class wine::WineConnector;
 
     public:
         static PipeConnection& get() noexcept;