core-legacy/sourcehook/test/test1.cpp
changeset 695 a48df3027569
parent 659 b35a5fdbc654
     1.1 --- a/core-legacy/sourcehook/test/test1.cpp	Sat Dec 19 17:20:54 2009 -0800
     1.2 +++ b/core-legacy/sourcehook/test/test1.cpp	Sun Jan 10 02:46:18 2010 -0500
     1.3 @@ -426,9 +426,7 @@
     1.4  
     1.5  	// 1) SH_CALL it and call it normally
     1.6  
     1.7 -	return true;
     1.8  	SH_CALL(pTest, &Test::F1)();
     1.9 -	
    1.10  
    1.11  	pTest->F1();
    1.12  
    1.13 @@ -472,16 +470,23 @@
    1.14  	// 4) Test source-level compat with callclasses
    1.15  	SourceHook::CallClass<Test> *pCC = SH_GET_CALLCLASS(pTest);
    1.16  
    1.17 +	// bug 4210
    1.18 +	SH_CALL(pCC, &Test::F1)();
    1.19 +
    1.20 +	CHECK_STATES((&g_States,
    1.21 +		new State_F1_Called,
    1.22 +		NULL), "bug 4210");
    1.23 +
    1.24  	SH_CALL(pCC, &Test::F1)();
    1.25  	pTest->F1();
    1.26  
    1.27 -	SH_RELEASE_CALLCLASS(pCC);
    1.28 -
    1.29  	CHECK_STATES((&g_States,
    1.30  		new State_F1_Called,
    1.31  		new State_F1_PreHandler_Called(&f1_handlers),
    1.32  		NULL), "Part 4");
    1.33  
    1.34 +	SH_RELEASE_CALLCLASS(pCC);
    1.35 +
    1.36  	// 5) Check ignore / supercede
    1.37  	g_F1Pre_WhatToDo = MRES_SUPERCEDE;
    1.38  	SH_CALL(pTest, &Test::F1)();