From fb9709b374887145bd4c6dcac3fb9fdacb8aaa84 Mon Sep 17 00:00:00 2001 From: micio Date: Sun, 23 Sep 2018 22:00:38 +0000 Subject: [PATCH] Bazaar/Protect: use explicit Upp namespace in macros git-svn-id: svn://ultimatepp.org/upp/trunk@12300 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/Protect/Protect.h | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/bazaar/Protect/Protect.h b/bazaar/Protect/Protect.h index 271e21a79..d68c630b7 100644 --- a/bazaar/Protect/Protect.h +++ b/bazaar/Protect/Protect.h @@ -80,43 +80,43 @@ int PROTECT_PatternSize(CodeSequence seq); #define PROTECT_START_FUNC(GetCypher) \ volatile static bool __decrypted = false; \ PROTECT_DECRYPT_CODE(__decrypted, GetCypher); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY1() + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY1() #define PROTECT_END_FUNC \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1() + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1() #define OBFUSCATE_START_FUNC \ Mutex __mutex; \ __mutex.Enter(); \ uint8_t *__hdr = NULL; \ PROTECT_DEOBFUSCATE(__hdr); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1() + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1() #define OBFUSCATE_END_FUNC \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY2(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY1(); \ - PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY2(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY1(); \ + Upp::PROTECT_DUMMY2(); \ PROTECT_OBFUSCATE(__hdr); \ __mutex.Leave()