1.1 --- a/sourcehook/test/main.cpp Thu Apr 28 17:24:39 2005 +0000
1.2 +++ b/sourcehook/test/main.cpp Fri Apr 29 20:29:46 2005 +0000
1.3 @@ -402,93 +402,93 @@
1.4 RETURN_META_VALUE(MRES_OVERRIDE, !META_RESULT_ORIG_RET(bool));
1.5 }
1.6
1.7 -// I haven't checked the second F16 function yet
1.8 -
1.9 int main(int argc, char *argv[])
1.10 {
1.11 // Get an instance and call the functions using the pointer
1.12 // (otherwise the compiler optimizes away the vtable lookup)
1.13 Test zLOL;
1.14 + Test zLOL2;
1.15 Test *zLOL_Ptr = &zLOL;
1.16 + Test *zLOL2_Ptr = &zLOL2;
1.17 g_SHPtr = &g_SHImpl;
1.18
1.19 //////////////////////////////////////////////////////////////////////////
1.20 - Test *cc = SH_GET_CALLCLASS(Test, zLOL_Ptr);
1.21 + SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(zLOL_Ptr);
1.22
1.23 printf("TEST1.1: Calling F299\n");
1.24 zLOL_Ptr->F299();
1.25 printf("TEST1.2: Calling F299 through cc\n");
1.26 - cc->F299();
1.27 + SH_CALL(cc, &Test::F299)();
1.28 printf("TEST1.3: Hooking it\n");
1.29 SH_ADD_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler, false);
1.30 + zLOL2_Ptr->F299();
1.31 printf("TEST1.4: Calling F299\n");
1.32 zLOL_Ptr->F299();
1.33 printf("TEST1.5: Calling F299 through cc\n");
1.34 - cc->F299();
1.35 + SH_CALL(cc, &Test::F299)();
1.36 printf("TEST1.6: Adding one more pre and one post hook\n");
1.37 SH_ADD_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler2, false);
1.38 SH_ADD_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_post_handler, true);
1.39 printf("TEST1.7: Calling F299\n");
1.40 zLOL_Ptr->F299();
1.41 printf("TEST1.8: Calling F299 through cc\n");
1.42 - cc->F299();
1.43 + SH_CALL(cc, &Test::F299)();
1.44 printf("TEST1.9: Removing pre hooks\n");
1.45 SH_REMOVE_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler, false);
1.46 SH_REMOVE_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_pre_handler2, false);
1.47 printf("TEST1.10: Calling F299\n");
1.48 zLOL_Ptr->F299();
1.49 printf("TEST1.11: Calling F299 through cc\n");
1.50 - cc->F299();
1.51 + SH_CALL(cc, &Test::F299)();
1.52 printf("TEST1.12: Removing post hook\n");
1.53 SH_REMOVE_HOOK_STATICFUNC(Test, F299, zLOL_Ptr, Test_F299_post_handler, true);
1.54 printf("TEST1.13: Calling F299\n");
1.55 zLOL_Ptr->F299();
1.56 printf("TEST1.14: Calling F299 through cc\n");
1.57 - cc->F299();
1.58 + SH_CALL(cc, &Test::F299)();
1.59
1.60 //////////////////////////////////////////////////////////////////////////
1.61 printf("\n\n*************************************************\n\n");
1.62 printf("TEST2.1: Calling F16(155)\n");
1.63 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.64 printf("TEST2.2: Calling F16(155) through CC\n");
1.65 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.66 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.67 printf("TEST2.3: Hooking it\n");
1.68 SH_ADD_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_pre_handler, false);
1.69 printf("TEST2.4: Calling F16(155)\n");
1.70 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.71 printf("TEST2.5: Calling F16(155) through CC\n");
1.72 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.73 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.74 printf("TEST2.6: Adding post hook\n");
1.75 SH_ADD_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_post_handler, true);
1.76 printf("TEST2.7: Calling F16(155)\n");
1.77 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.78 printf("TEST2.8: Calling F16(155) through CC\n");
1.79 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.80 - printf("TEST2.9: Removing pre hook\n");
1.81 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.82 printf("TEST2.XX.1: Pausing the plugin\n");
1.83 g_SHImpl.PausePlugin(g_PLID);
1.84 printf("TEST2.XX.2: Calling F16(155)\n");
1.85 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.86 printf("TEST2.XX.3: Calling F16(155) through CC\n");
1.87 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.88 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.89 printf("TEST2.XX.4: Unpausing the plugin\n");
1.90 g_SHImpl.UnpausePlugin(g_PLID);
1.91 printf("TEST2.XX.5: Calling F16(155)\n");
1.92 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.93 printf("TEST2.XX.6: Calling F16(155) through CC\n");
1.94 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.95 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.96 printf("TEST2.9: Removing pre hook\n");
1.97 SH_REMOVE_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_pre_handler, false);
1.98 printf("TEST2.10: Calling F16(155)\n");
1.99 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.100 printf("TEST2.11: Calling F16(155) through CC\n");
1.101 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.102 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.103 printf("TEST2.12: Removing post hook\n");
1.104 SH_REMOVE_HOOK_STATICFUNC(Test, F16, zLOL_Ptr, Test_F16_int_post_handler, true);
1.105 printf("TEST2.10: Calling F16(155)\n");
1.106 printf("Returned: %d\n", zLOL_Ptr->F16(155) ? 1 : 0);
1.107 printf("TEST2.11: Calling F16(155) through CC\n");
1.108 - printf("Returned: %d\n", cc->F16(155) ? 1 : 0);
1.109 + printf("Returned: %d\n", SH_CALL(cc, static_cast<bool(Test::*)(int)>(&Test::F16))(155) ? 1 : 0);
1.110
1.111 SH_RELEASE_CALLCLASS(cc);
1.112