Skip to content

Commit b89df32

Browse files
committed
Minor changes
1 parent cd34d38 commit b89df32

3 files changed

Lines changed: 16 additions & 21 deletions

File tree

Detours.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7051,7 +7051,7 @@ namespace Detours {
70517051

70527052
m_unRegionCapacity = ri.m_unSize;
70537053
m_pRegionAddress = pBaseAddress;
7054-
7054+
70557055
auto vecPages = __get_pages_info(pBaseAddress, ri.m_unSize);
70567056
for (auto& PageInfo : vecPages) {
70577057
m_Pages.emplace_back(PageInfo.m_pBaseAddress, false);

Detours.h

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,40 +48,35 @@
4848

4949
// MSVC - Sections
5050

51-
#define DECLARE_DATA_SECTION(NAME) __pragma(section(NAME, read))
52-
#define DECLARE_CODE_SECTION(NAME) __pragma(section(NAME, execute))
53-
51+
#define DECLARE_SECTION(NAME) __pragma(section(NAME, execute))
52+
5453
#define SECTION_READONLY "R"
5554
#define SECTION_READWRITE "RW"
5655
#define SECTION_EXECUTE_READ "ER"
5756
#define SECTION_EXECUTE_READWRITE "ERW"
5857
#define CHANGE_SECTION_ATTRIBUTES(NAME, ATTRIBUTES) LINKER_OPTION("/SECTION:" NAME "," ATTRIBUTES)
59-
60-
#define DEFINE_DATA_SECTION(NAME, ATTRIBUTES) \
61-
DECLARE_DATA_SECTION(NAME) \
62-
CHANGE_SECTION_ATTRIBUTES(NAME, ATTRIBUTES)
63-
64-
#define DEFINE_CODE_SECTION(NAME, ATTRIBUTES) \
65-
DECLARE_CODE_SECTION(NAME) \
58+
59+
#define DEFINE_SECTION(NAME, ATTRIBUTES) \
60+
DECLARE_SECTION(NAME) \
6661
CHANGE_SECTION_ATTRIBUTES(NAME, ATTRIBUTES)
67-
62+
6863
#define MERGE_SECTION(FROM, TO) LINKER_OPTION("/MERGE:" FROM "=" TO)
69-
64+
7065
#define DEFINE_DATA_IN_SECTION(NAME) __declspec(allocate(NAME))
7166
#define DEFINE_CODE_IN_SECTION(NAME) __declspec(code_seg(NAME))
72-
67+
7368
// MSVC - Optimization
74-
69+
7570
#define DISABLE_OPTIMIZATION(OPTION) \
7671
__pragma(optimize(OPTION, off))
77-
72+
7873
#define ENABLE_OPTIMIZATION(OPTION) \
7974
__pragma(optimize(OPTION, on))
80-
75+
8176
#define DISABLE_OPTIMIZATION_BEGIN(OPTION) \
8277
DISABLE_OPTIMIZATION(OPTION) \
8378
extern "C++"
84-
79+
8580
#define DISABLE_OPTIMIZATION_END(OPTION) \
8681
ENABLE_OPTIMIZATION(OPTION)
8782

main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ static inline const char* nameof() {
155155
return typeid(T).raw_name();
156156
}
157157

158-
DEFINE_DATA_SECTION(".cdata", SECTION_READWRITE)
159-
DEFINE_CODE_SECTION(".ctext", SECTION_EXECUTE_READ)
158+
DEFINE_SECTION(".cdata", SECTION_READWRITE)
159+
DEFINE_SECTION(".ctext", SECTION_EXECUTE_READ)
160160

161161
DEFINE_DATA_IN_SECTION(".cdata") __declspec(dllexport) BaseTestingRTTI* g_pBaseTestingRTTI = nullptr;
162162
DEFINE_DATA_IN_SECTION(".cdata") __declspec(dllexport) TestingRTTI* g_pTestingRTTI = nullptr;
@@ -2417,7 +2417,7 @@ TEST_SUITE("Detours::Hook") {
24172417
CHECK(reinterpret_cast<fnFoo>(pVTable[0])(g_pTestingRTTI, nullptr) == false);
24182418
CHECK(fooHook.UnHook() == true);
24192419
CHECK(fooHook.Release() == true);
2420-
2420+
24212421
CHECK(booHook.Set(pVTable, 1) == true);
24222422
CHECK(booHook.Hook(boo_Hook) == true);
24232423
CHECK(reinterpret_cast<fnBoo>(pVTable[1])(g_pTestingRTTI, nullptr) == true);

0 commit comments

Comments
 (0)