mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

winpr/synch/barrier: fix return value and test 

- According to the msdn docs DeleteSynchronizationBarrier always returns TRUE
- Added additional error checks to the barrier test
This commit is contained in:
Norbert Federa 2016-06-04 13:40:01 +02:00
parent 85f44262de
commit 2dba082587
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winpr/libwinpr/synch/barrier.c
View File

@ -228,8 +228,14 @@ BOOL WINAPI DeleteSynchronizationBarrier(LPSYNCHRONIZATION_BARRIER lpBarrier)
return pfnDeleteSynchronizationBarrier(lpBarrier); return pfnDeleteSynchronizationBarrier(lpBarrier);
#endif #endif
/**
* According to https://msdn.microsoft.com/en-us/library/windows/desktop/hh706887(v=vs.85).aspx
* Return value:
* The DeleteSynchronizationBarrier function always returns TRUE.
*/
if (!lpBarrier) if (!lpBarrier)
return FALSE; return TRUE;
while (lpBarrier->Reserved1 != lpBarrier->Reserved2) while (lpBarrier->Reserved1 != lpBarrier->Reserved2)
SwitchToThread(); SwitchToThread();

15
winpr/libwinpr/synch/test/TestSynchBarrier.c
View File

@ -95,7 +95,12 @@ BOOL TestSynchBarrierWithFlags(DWORD dwFlags)
if (i > 0) if (i > 0)
{ {
SetEvent(gStartEvent); if (!SetEvent(gStartEvent))
{
printf("%s: SetEvent(gStartEvent) failed with error = 0x%08x)\n",
__FUNCTION__, GetLastError());
InterlockedIncrement(&gErrorCount);
}
if (WAIT_OBJECT_0 != (dwStatus = WaitForMultipleObjects(i, threads, TRUE, INFINITE))) if (WAIT_OBJECT_0 != (dwStatus = WaitForMultipleObjects(i, threads, TRUE, INFINITE)))
{ {
@ -105,7 +110,13 @@ BOOL TestSynchBarrierWithFlags(DWORD dwFlags)
} }
} }
CloseHandle(gStartEvent); if (!CloseHandle(gStartEvent))
{
printf("%s: CloseHandle(gStartEvent) failed with error = 0x%08x)\n",
__FUNCTION__, GetLastError());
InterlockedIncrement(&gErrorCount);
}
DeleteSynchronizationBarrier(&gBarrier); DeleteSynchronizationBarrier(&gBarrier);
if (gTrueCount != EXPECTED_TRUE_COUNT) if (gTrueCount != EXPECTED_TRUE_COUNT)