Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Upgrade to latest WinStd library

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-01-18 14:47:47 +01:00
parent 4900202d7e
commit d98987ec5f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZRCola/zrcolaapp.h
View File

@ -90,7 +90,7 @@ public:
protected: protected:
#ifdef __WXMSW__ #ifdef __WXMSW__
winstd::win_handle m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running winstd::win_handle<NULL> m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running
#endif #endif
}; };

2
ZRColaCompile/dbsource.cpp
View File

@ -56,7 +56,7 @@ void ZRCola::DBSource::character_bank::build_related()
ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to) : ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to) :
win_handle((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)), win_handle<INVALID_HANDLE_VALUE>((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
m_heap(HeapCreate(0, 0, 0)), m_heap(HeapCreate(0, 0, 0)),
m_cb(cb), m_cb(cb),
m_from(from), m_from(from),

4
ZRColaCompile/dbsource.h
View File

@ -269,14 +269,14 @@ namespace ZRCola {
void build_related(); void build_related();
protected: protected:
class build_related_worker : public winstd::win_handle class build_related_worker : public winstd::win_handle<INVALID_HANDLE_VALUE>
{ {
public: public:
build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to); build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to);
inline void join() inline void join()
{ {
if (m_h) if (m_h != invalid)
WaitForSingleObject(m_h, INFINITE); WaitForSingleObject(m_h, INFINITE);
} }

2
lib/WinStd

@ -1 +1 @@
Subproject commit 51a82c242fe35b6cc1444cb6c61e8004704c13c8 Subproject commit f47faea71bd5f0dec9b549a6ebd6f5a711b805c8