From 2df53be4a5bd6fb1fc88ebc2041a8bef604dc5d4 Mon Sep 17 00:00:00 2001 From: Peace-Maker Date: Sat, 21 Apr 2018 13:41:50 +0200 Subject: [PATCH] Fix signed - unsigned comparison warning --- DynamicHooks/convention.h | 4 ++-- DynamicHooks/conventions/x86MsCdecl.cpp | 8 ++++---- DynamicHooks/conventions/x86MsCdecl.h | 4 ++-- DynamicHooks/conventions/x86MsStdcall.cpp | 8 ++++---- DynamicHooks/conventions/x86MsStdcall.h | 4 ++-- DynamicHooks/conventions/x86MsThiscall.cpp | 8 ++++---- DynamicHooks/conventions/x86MsThiscall.h | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/DynamicHooks/convention.h b/DynamicHooks/convention.h index 9d818e0..1db73c6 100644 --- a/DynamicHooks/convention.h +++ b/DynamicHooks/convention.h @@ -200,11 +200,11 @@ public: @param : A snapshot of all saved registers. */ - virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters) = 0; + virtual void* GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters) = 0; /* */ - virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr) = 0; + virtual void ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr) = 0; /* Returns a pointer to the return value. diff --git a/DynamicHooks/conventions/x86MsCdecl.cpp b/DynamicHooks/conventions/x86MsCdecl.cpp index 85ff3e4..38724dd 100644 --- a/DynamicHooks/conventions/x86MsCdecl.cpp +++ b/DynamicHooks/conventions/x86MsCdecl.cpp @@ -127,7 +127,7 @@ int x86MsCdecl::GetArgRegisterSize() return iArgRegisterSize; } -void* x86MsCdecl::GetArgumentPtr(int iIndex, CRegisters* pRegisters) +void* x86MsCdecl::GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters) { if (iIndex < 0 || iIndex >= m_vecArgTypes.length()) return NULL; @@ -142,8 +142,8 @@ void* x86MsCdecl::GetArgumentPtr(int iIndex, CRegisters* pRegisters) return pRegister->m_pAddress; } - int iOffset = 4; - for(int i=0; i < iIndex; i++) + size_t iOffset = 4; + for(unsigned int i=0; i < iIndex; i++) { if (m_vecArgTypes[i].custom_register == None) iOffset += m_vecArgTypes[i].size; @@ -152,7 +152,7 @@ void* x86MsCdecl::GetArgumentPtr(int iIndex, CRegisters* pRegisters) return (void *) (pRegisters->m_esp->GetValue() + iOffset); } -void x86MsCdecl::ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr) +void x86MsCdecl::ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr) { } diff --git a/DynamicHooks/conventions/x86MsCdecl.h b/DynamicHooks/conventions/x86MsCdecl.h index d07404a..d4fa497 100644 --- a/DynamicHooks/conventions/x86MsCdecl.h +++ b/DynamicHooks/conventions/x86MsCdecl.h @@ -72,8 +72,8 @@ public: virtual void** GetStackArgumentPtr(CRegisters* pRegisters); virtual int GetArgRegisterSize(); - virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters); - virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr); + virtual void* GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters); + virtual void ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr); virtual void* GetReturnPtr(CRegisters* pRegisters); virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr); diff --git a/DynamicHooks/conventions/x86MsStdcall.cpp b/DynamicHooks/conventions/x86MsStdcall.cpp index 827db59..795325a 100644 --- a/DynamicHooks/conventions/x86MsStdcall.cpp +++ b/DynamicHooks/conventions/x86MsStdcall.cpp @@ -135,7 +135,7 @@ int x86MsStdcall::GetArgRegisterSize() return iArgRegisterSize; } -void* x86MsStdcall::GetArgumentPtr(int iIndex, CRegisters* pRegisters) +void* x86MsStdcall::GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters) { if (iIndex < 0 || iIndex >= m_vecArgTypes.length()) return NULL; @@ -150,8 +150,8 @@ void* x86MsStdcall::GetArgumentPtr(int iIndex, CRegisters* pRegisters) return pRegister->m_pAddress; } - int iOffset = 4; - for (int i = 0; i < iIndex; i++) + size_t iOffset = 4; + for (unsigned int i = 0; i < iIndex; i++) { if (m_vecArgTypes[i].custom_register == None) iOffset += m_vecArgTypes[i].size; @@ -160,7 +160,7 @@ void* x86MsStdcall::GetArgumentPtr(int iIndex, CRegisters* pRegisters) return (void *)(pRegisters->m_esp->GetValue() + iOffset); } -void x86MsStdcall::ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr) +void x86MsStdcall::ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr) { } diff --git a/DynamicHooks/conventions/x86MsStdcall.h b/DynamicHooks/conventions/x86MsStdcall.h index ab21735..5fb7ff2 100644 --- a/DynamicHooks/conventions/x86MsStdcall.h +++ b/DynamicHooks/conventions/x86MsStdcall.h @@ -72,8 +72,8 @@ public: virtual void** GetStackArgumentPtr(CRegisters* pRegisters); virtual int GetArgRegisterSize(); - virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters); - virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr); + virtual void* GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters); + virtual void ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr); virtual void* GetReturnPtr(CRegisters* pRegisters); virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr); diff --git a/DynamicHooks/conventions/x86MsThiscall.cpp b/DynamicHooks/conventions/x86MsThiscall.cpp index 8bce46f..36389d0 100644 --- a/DynamicHooks/conventions/x86MsThiscall.cpp +++ b/DynamicHooks/conventions/x86MsThiscall.cpp @@ -143,7 +143,7 @@ int x86MsThiscall::GetArgRegisterSize() return iArgRegisterSize; } -void* x86MsThiscall::GetArgumentPtr(int iIndex, CRegisters* pRegisters) +void* x86MsThiscall::GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters) { if (iIndex == 0) { @@ -167,8 +167,8 @@ void* x86MsThiscall::GetArgumentPtr(int iIndex, CRegisters* pRegisters) return pRegister->m_pAddress; } - int iOffset = 4; - for(int i=0; i < iIndex; i++) + size_t iOffset = 4; + for(unsigned int i=0; i < iIndex; i++) { if (m_vecArgTypes[i].custom_register == None) iOffset += m_vecArgTypes[i].size; @@ -177,7 +177,7 @@ void* x86MsThiscall::GetArgumentPtr(int iIndex, CRegisters* pRegisters) return (void *) (pRegisters->m_esp->GetValue() + iOffset); } -void x86MsThiscall::ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr) +void x86MsThiscall::ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr) { } diff --git a/DynamicHooks/conventions/x86MsThiscall.h b/DynamicHooks/conventions/x86MsThiscall.h index 5ce2dea..9750ef7 100644 --- a/DynamicHooks/conventions/x86MsThiscall.h +++ b/DynamicHooks/conventions/x86MsThiscall.h @@ -73,8 +73,8 @@ public: virtual void** GetStackArgumentPtr(CRegisters* pRegisters); virtual int GetArgRegisterSize(); - virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters); - virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr); + virtual void* GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters); + virtual void ArgumentPtrChanged(unsigned int iIndex, CRegisters* pRegisters, void* pArgumentPtr); virtual void* GetReturnPtr(CRegisters* pRegisters); virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr);