4 Commits

Author SHA1 Message Date
Arsenii es3n1n
2d34fcca9e Merge pull request #39 from es3n1n/bump-1-4-0 2025-07-13 04:22:13 +02:00
es3n1n
77fdc18545 chore: bump to 1.4.0 2025-07-13 04:20:55 +02:00
Arsenii es3n1n
50cceeab75 Merge pull request #38 from es3n1n/fix-callconv 2025-07-13 04:19:20 +02:00
es3n1n
5e4a32c819 fix(com): ensure com calling convention is __stdcall 2025-07-13 04:16:40 +02:00
3 changed files with 30 additions and 28 deletions

View File

@@ -9,6 +9,8 @@
#include <source_location> #include <source_location>
#include <stdexcept> #include <stdexcept>
#define COM_CALLCONV __stdcall
namespace com { namespace com {
inline HRESULT checked(HRESULT result, const std::source_location loc = std::source_location::current()) { inline HRESULT checked(HRESULT result, const std::source_location loc = std::source_location::current()) {
if (result == 0) { if (result == 0) {
@@ -94,11 +96,11 @@ namespace com {
static constexpr GUID kIID = IID; static constexpr GUID kIID = IID;
private: private:
virtual HRESULT QueryInterface() = 0; virtual HRESULT COM_CALLCONV QueryInterface() = 0;
virtual std::uint32_t AddRef() = 0; virtual std::uint32_t COM_CALLCONV AddRef() = 0;
public: public:
virtual std::uint32_t Release() = 0; virtual std::uint32_t COM_CALLCONV Release() = 0;
}; };
template <typename Ty> template <typename Ty>

View File

@@ -5,7 +5,7 @@
namespace strings { namespace strings {
constexpr std::string_view kProjectName = "defendnot"; constexpr std::string_view kProjectName = "defendnot";
constexpr std::string_view kRepoUrl = "https://github.com/es3n1n/defendnot"; constexpr std::string_view kRepoUrl = "https://github.com/es3n1n/defendnot";
constexpr std::string_view kVersion = "1.3.0"; constexpr std::string_view kVersion = "1.4.0";
constexpr std::string_view kDefaultAVName = "dnot.sh"; constexpr std::string_view kDefaultAVName = "dnot.sh";

View File

@@ -40,33 +40,33 @@ namespace defendnot {
class IWscAVStatus4 : public com::IBaseObject<detail::CLSID_WscIsv, detail::IID_IWscAVStatus4> { class IWscAVStatus4 : public com::IBaseObject<detail::CLSID_WscIsv, detail::IID_IWscAVStatus4> {
public: public:
virtual HRESULT Register(BSTR path_to_signed_product_exe, BSTR display_name, std::uint32_t, std::uint32_t) = 0; virtual HRESULT COM_CALLCONV Register(BSTR path_to_signed_product_exe, BSTR display_name, std::uint32_t, std::uint32_t) = 0;
virtual HRESULT Unregister() = 0; virtual HRESULT COM_CALLCONV Unregister() = 0;
virtual HRESULT UpdateStatus(WSCSecurityProductState state, BOOL unk) = 0; virtual HRESULT COM_CALLCONV UpdateStatus(WSCSecurityProductState state, BOOL unk) = 0;
virtual HRESULT InitiateOfflineCleaning(std::uint16_t*, std::uint16_t*) = 0; virtual HRESULT COM_CALLCONV InitiateOfflineCleaning(std::uint16_t*, std::uint16_t*) = 0;
virtual HRESULT NotifyUserForNearExpiration(std::uint32_t) = 0; virtual HRESULT COM_CALLCONV NotifyUserForNearExpiration(std::uint32_t) = 0;
virtual HRESULT MakeDefaultProductRequest() = 0; virtual HRESULT COM_CALLCONV MakeDefaultProductRequest() = 0;
virtual HRESULT IsDefaultProductEnforced(std::uint32_t* result) = 0; virtual HRESULT COM_CALLCONV IsDefaultProductEnforced(std::uint32_t* result) = 0;
virtual HRESULT UpdateScanSubstatus(WSCSecurityProductSubStatus status) = 0; virtual HRESULT COM_CALLCONV UpdateScanSubstatus(WSCSecurityProductSubStatus status) = 0;
virtual HRESULT UpdateSettingsSubstatus(WSCSecurityProductSubStatus status) = 0; virtual HRESULT COM_CALLCONV UpdateSettingsSubstatus(WSCSecurityProductSubStatus status) = 0;
virtual HRESULT UpdateProtectionUpdateSubstatus(WSCSecurityProductSubStatus status) = 0; virtual HRESULT COM_CALLCONV UpdateProtectionUpdateSubstatus(WSCSecurityProductSubStatus status) = 0;
virtual HRESULT RegisterAV(std::uint16_t*, std::uint16_t*, std::uint32_t, std::uint32_t) = 0; virtual HRESULT COM_CALLCONV RegisterAV(std::uint16_t*, std::uint16_t*, std::uint32_t, std::uint32_t) = 0;
virtual HRESULT UnregisterAV() = 0; virtual HRESULT COM_CALLCONV UnregisterAV() = 0;
virtual HRESULT UpdateStatusAV(WSCSecurityProductState state, BOOL unk) = 0; virtual HRESULT COM_CALLCONV UpdateStatusAV(WSCSecurityProductState state, BOOL unk) = 0;
virtual HRESULT InitiateOfflineCleaningAV(std::uint16_t*, std::uint16_t*) = 0; virtual HRESULT COM_CALLCONV InitiateOfflineCleaningAV(std::uint16_t*, std::uint16_t*) = 0;
virtual HRESULT NotifyUserForNearExpirationAV(std::uint32_t) = 0; virtual HRESULT COM_CALLCONV NotifyUserForNearExpirationAV(std::uint32_t) = 0;
virtual HRESULT RegisterFW(std::uint16_t*, std::uint16_t*, std::uint32_t, std::uint32_t) = 0; virtual HRESULT COM_CALLCONV RegisterFW(std::uint16_t*, std::uint16_t*, std::uint32_t, std::uint32_t) = 0;
virtual HRESULT UnregisterFW() = 0; virtual HRESULT COM_CALLCONV UnregisterFW() = 0;
virtual HRESULT UpdateStatusFW(WSCSecurityProductState state) = 0; virtual HRESULT COM_CALLCONV UpdateStatusFW(WSCSecurityProductState state) = 0;
virtual HRESULT RegisterAS(std::uint16_t*, std::uint16_t*, std::uint32_t, std::uint32_t) = 0; virtual HRESULT COM_CALLCONV RegisterAS(std::uint16_t*, std::uint16_t*, std::uint32_t, std::uint32_t) = 0;
virtual HRESULT UnregisterAS() = 0; virtual HRESULT COM_CALLCONV UnregisterAS() = 0;
virtual HRESULT UpdateStatusAS(WSCSecurityProductState state, BOOL unk) = 0; virtual HRESULT COM_CALLCONV UpdateStatusAS(WSCSecurityProductState state, BOOL unk) = 0;
}; };
class IWscASStatus : public com::IBaseObject<detail::CLSID_WscIsv, detail::IID_IWscASStatus> { class IWscASStatus : public com::IBaseObject<detail::CLSID_WscIsv, detail::IID_IWscASStatus> {
public: public:
virtual HRESULT Register(BSTR path_to_signed_product_exe, BSTR display_name, std::uint32_t, std::uint32_t) = 0; virtual HRESULT COM_CALLCONV Register(BSTR path_to_signed_product_exe, BSTR display_name, std::uint32_t, std::uint32_t) = 0;
virtual HRESULT Unregister() = 0; virtual HRESULT COM_CALLCONV Unregister() = 0;
virtual HRESULT UpdateStatus(WSCSecurityProductState state, BOOL unk) = 0; virtual HRESULT COM_CALLCONV UpdateStatus(WSCSecurityProductState state, BOOL unk) = 0;
}; };
} // namespace defendnot } // namespace defendnot