Skip to content

unify(common): Merge CriticalSection, ScopedMutex code from Generals #2194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xezon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

unify(common): Merge CriticalSection, ScopedMutex code from Generals #2194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ class ScopedCriticalSection
}
};

#include "mutex.h"

// These should be null on creation then non-null in WinMain or equivalent.
// This allows us to be silently non-threadsafe for WB and other single-threaded apps.
extern CriticalSection *TheAsciiStringCriticalSection;
Expand Down
5 changes: 1 addition & 4 deletions GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ class ScopedMutex
public:
ScopedMutex(HANDLE mutex) : m_mutex(mutex)
{
DWORD status = WaitForSingleObject(m_mutex, 500);
if (status != WAIT_OBJECT_0) {
DEBUG_LOG(("ScopedMutex WaitForSingleObject timed out - status %d", status));
}
WaitForSingleObject(m_mutex, INFINITE);
}

~ScopedMutex()
Expand Down