thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2026-02-04 00:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(event): fix SEvtPushState incorrectly cloning the state

Browse source
This commit is contained in:
Adam Heinermann 2025-10-03 01:24:14 -07:00 • committed by fallenoak
parent 4fa6599807
commit 02287ba3b4
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
storm/Event.cpp
View file

@ -95,6 +95,7 @@ void CopyIdHashTable(_IDHASHTABLE *dest, _IDHASHTABLE *source) {
*ppDestData = pNewEntry; *ppDestData = pNewEntry;
*pNewEntry = *pSourceData; *pNewEntry = *pSourceData;
ppDestData = &(*ppDestData)->next;
} }
*ppDestData = nullptr; *ppDestData = nullptr;
} }

25
test/Event.cpp
View file

@ -312,6 +312,9 @@ TEST_CASE("SEvtPopState", "[event]") {
SEvtRegisterHandler(1337, 420, 69, 0, &TestEventHandler1); SEvtRegisterHandler(1337, 420, 69, 0, &TestEventHandler1);
CHECK(SEvtPushState(1337, 420) == 1); CHECK(SEvtPushState(1337, 420) == 1);
// State is duplicated, remove our duplicated handler
SEvtUnregisterHandler(1337, 420, 69, &TestEventHandler1);
CHECK(SEvtDispatch(1337, 420, 69, nullptr) == 0); CHECK(SEvtDispatch(1337, 420, 69, nullptr) == 0);
CHECK(test.NumCalls() == 0); CHECK(test.NumCalls() == 0);
@ -325,7 +328,9 @@ TEST_CASE("SEvtPopState", "[event]") {
SEvtRegisterHandler(1337, 420, 69, 0, &TestEventHandler1); SEvtRegisterHandler(1337, 420, 69, 0, &TestEventHandler1);
CHECK(SEvtPushState(1337, 420) == 1); CHECK(SEvtPushState(1337, 420) == 1);
CHECK(SEvtUnregisterHandler(1337, 420, 69, &TestEventHandler1) == 0); // Unregisters the duplicated instance
CHECK(SEvtUnregisterHandler(1337, 420, 69, &TestEventHandler1) == 1);
CHECK(SEvtPopState(1337, 420) == 0); CHECK(SEvtPopState(1337, 420) == 0);
CHECK(SEvtUnregisterHandler(1337, 420, 69, &TestEventHandler1) == 1); CHECK(SEvtUnregisterHandler(1337, 420, 69, &TestEventHandler1) == 1);
} }
@ -351,12 +356,12 @@ TEST_CASE("SEvtPushState", "[event]") {
CHECK(SEvtPushState(0, 0) == 1); CHECK(SEvtPushState(0, 0) == 1);
} }
SECTION("pushed state won't receive callbacks") { SECTION("pushed state duplicates its callbacks") {
SEvtRegisterHandler(1337, 420, 69, 0, &TestEventHandler1); SEvtRegisterHandler(1337, 420, 69, 0, &TestEventHandler1);
CHECK(SEvtPushState(1337, 420) == 1); CHECK(SEvtPushState(1337, 420) == 1);
CHECK(SEvtDispatch(1337, 420, 69, nullptr) == 0); CHECK(SEvtDispatch(1337, 420, 69, nullptr) == 1);
CHECK(test.NumCalls() == 0); CHECK(test.NumCalls() == 1);
} }
SECTION("pushed state applies to all ids") { SECTION("pushed state applies to all ids") {
@ -366,18 +371,18 @@ TEST_CASE("SEvtPushState", "[event]") {
CHECK(SEvtPushState(0, 0) == 1); CHECK(SEvtPushState(0, 0) == 1);
CHECK(SEvtDispatch(0, 0, 9, nullptr) == 0); CHECK(SEvtDispatch(0, 0, 9, nullptr) == 1);
CHECK(SEvtDispatch(0, 0, 8, nullptr) == 0); CHECK(SEvtDispatch(0, 0, 8, nullptr) == 1);
CHECK(SEvtDispatch(0, 0, 66, nullptr) == 0); CHECK(SEvtDispatch(0, 0, 66, nullptr) == 1);
CHECK(test.NumCalls() == 0); CHECK(test.NumCalls() == 3);
} }
SECTION("pushed state can't be unregistered") { SECTION("pushed state can be unregistered") {
SEvtRegisterHandler(0, 0, 0, 0, &TestEventHandler1); SEvtRegisterHandler(0, 0, 0, 0, &TestEventHandler1);
SEvtRegisterHandler(0, 0, 0, 0, &TestEventHandler2); SEvtRegisterHandler(0, 0, 0, 0, &TestEventHandler2);
CHECK(SEvtPushState(0, 0) == 1); CHECK(SEvtPushState(0, 0) == 1);
CHECK(SEvtUnregisterHandler(0, 0, 0, &TestEventHandler1) == 0); CHECK(SEvtUnregisterHandler(0, 0, 0, &TestEventHandler1) == 1);
} }
} }