1 files changed, 20 insertions, 20 deletions

diff --git a/CPP/Windows/Synchronization.h b/CPP/Windows/Synchronization.h
index c16f7b4d..e9668de8 100755
--- a/CPP/Windows/Synchronization.h
+++ b/CPP/Windows/Synchronization.h
@@ -26,9 +26,9 @@ public:
   operator HANDLE() { return _object.handle; }
   CBaseEvent() { Event_Construct(&_object); }
   ~CBaseEvent() { Close(); }
-  HRes Close() { return Event_Close(&_object); }
+  WRes Close() { return Event_Close(&_object); }
   #ifdef _WIN32
-  HRes Create(bool manualReset, bool initiallyOwn, LPCTSTR name = NULL,
+  WRes Create(bool manualReset, bool initiallyOwn, LPCTSTR name = NULL,
       LPSECURITY_ATTRIBUTES securityAttributes = NULL)
   {
     _object.handle = ::CreateEvent(securityAttributes, BoolToBOOL(manualReset),
@@ -37,7 +37,7 @@ public:
       return 0;
     return ::GetLastError();
   }
-  HRes Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)
+  WRes Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)
   {
     _object.handle = ::OpenEvent(desiredAccess, BoolToBOOL(inheritHandle), name);
     if (_object.handle != 0)
@@ -46,27 +46,27 @@ public:
   }
   #endif
 
-  HRes Set() { return Event_Set(&_object); }
+  WRes Set() { return Event_Set(&_object); }
   // bool Pulse() { return BOOLToBool(::PulseEvent(_handle)); }
-  HRes Reset() { return Event_Reset(&_object); }
-  HRes Lock() { return Event_Wait(&_object); }
+  WRes Reset() { return Event_Reset(&_object); }
+  WRes Lock() { return Event_Wait(&_object); }
 };
 
 class CManualResetEvent: public CBaseEvent
 {
 public:
-  HRes Create(bool initiallyOwn = false)
+  WRes Create(bool initiallyOwn = false)
   {
     return ManualResetEvent_Create(&_object, initiallyOwn ? 1: 0);
   }
-  HRes CreateIfNotCreated()
+  WRes CreateIfNotCreated()
   {
     if (IsCreated())
       return 0;
     return ManualResetEvent_CreateNotSignaled(&_object);
   }
   #ifdef _WIN32
-  HRes CreateWithName(bool initiallyOwn, LPCTSTR name)
+  WRes CreateWithName(bool initiallyOwn, LPCTSTR name)
   {
     return CBaseEvent::Create(true, initiallyOwn, name);
   }
@@ -76,11 +76,11 @@ public:
 class CAutoResetEvent: public CBaseEvent
 {
 public:
-  HRes Create()
+  WRes Create()
   {
     return AutoResetEvent_CreateNotSignaled(&_object);
   }
-  HRes CreateIfNotCreated()
+  WRes CreateIfNotCreated()
   {
     if (IsCreated())
       return 0;
@@ -92,13 +92,13 @@ public:
 class CObject: public CHandle
 {
 public:
-  HRes Lock(DWORD timeoutInterval = INFINITE)
+  WRes Lock(DWORD timeoutInterval = INFINITE)
     { return (::WaitForSingleObject(_handle, timeoutInterval) == WAIT_OBJECT_0 ? 0 : ::GetLastError()); }
 };
 class CMutex: public CObject
 {
 public:
-  HRes Create(bool initiallyOwn, LPCTSTR name = NULL,
+  WRes Create(bool initiallyOwn, LPCTSTR name = NULL,
       LPSECURITY_ATTRIBUTES securityAttributes = NULL)
   {
     _handle = ::CreateMutex(securityAttributes, BoolToBOOL(initiallyOwn), name);
@@ -106,14 +106,14 @@ public:
       return 0;
     return ::GetLastError();
   }
-  HRes Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)
+  WRes Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)
   {
     _handle = ::OpenMutex(desiredAccess, BoolToBOOL(inheritHandle), name);
     if (_handle != 0)
       return 0;
     return ::GetLastError();
   }
-  HRes Release() 
+  WRes Release() 
   { 
     return ::ReleaseMutex(_handle) ? 0 : ::GetLastError();
   }
@@ -133,15 +133,15 @@ class CSemaphore
 public:
   CSemaphore() { Semaphore_Construct(&_object); }
   ~CSemaphore() { Close(); }
-  HRes Close() {  return Semaphore_Close(&_object); }
+  WRes Close() {  return Semaphore_Close(&_object); }
   operator HANDLE() { return _object.handle; }
-  HRes Create(UInt32 initiallyCount, UInt32 maxCount)
+  WRes Create(UInt32 initiallyCount, UInt32 maxCount)
   {
     return Semaphore_Create(&_object, initiallyCount, maxCount);
   }
-  HRes Release() { return Semaphore_Release1(&_object); }
-  HRes Release(UInt32 releaseCount) { return Semaphore_ReleaseN(&_object, releaseCount); }
-  HRes Lock() { return Semaphore_Wait(&_object); }
+  WRes Release() { return Semaphore_Release1(&_object); }
+  WRes Release(UInt32 releaseCount) { return Semaphore_ReleaseN(&_object, releaseCount); }
+  WRes Lock() { return Semaphore_Wait(&_object); }
 };
 
 class CCriticalSection