minor fixes

vnr/texthook/CMakeLists.txt

@@ -18,6 +18,8 @@ set(vnrhost_src
   textthread.cc
 )
 
+include_directories(../)
+
 add_library(vnrhost SHARED ${vnrhost_src})
 
 set_target_properties(vnrhost PROPERTIES LINK_FLAGS /SUBSYSTEM:WINDOWS)

vnr/texthook/winmutex.h

@@ -8,26 +8,28 @@
 # pragma warning(disable:4800) // C4800: forcing value to bool
 #endif // _MSC_VER
 
-  class MutexLocker
+// Artikash 7/20/2018: these are similar to std::lock guard but use Winapi objects
-  {
-	  HANDLE m;
-  public:
-	  explicit MutexLocker(HANDLE mutex) : m(mutex)
-	  {
-		  WaitForSingleObject(m, 0);
-	  }
-	  ~MutexLocker() { if (m != INVALID_HANDLE_VALUE && m != nullptr) ReleaseMutex(m); }
-  };
 
-  class CriticalSectionLocker
+class MutexLocker
-  {
+{
-	  CRITICAL_SECTION cs;
+	HANDLE m;
-  public:
+public:
-	  explicit CriticalSectionLocker(CRITICAL_SECTION cs) : cs(cs)
+	explicit MutexLocker(HANDLE mutex) : m(mutex)
-	  {
+	{
-		  EnterCriticalSection(&cs);
+		WaitForSingleObject(m, 0);
-	  }
+	}
-	  ~CriticalSectionLocker() { LeaveCriticalSection(&cs); }
+	~MutexLocker() { if (m != INVALID_HANDLE_VALUE && m != nullptr) ReleaseMutex(m); }
-  };
+};
+
+class CriticalSectionLocker
+{
+	CRITICAL_SECTION cs;
+public:
+	explicit CriticalSectionLocker(CRITICAL_SECTION cs) : cs(cs)
+	{
+		EnterCriticalSection(&cs);
+	}
+	~CriticalSectionLocker() { LeaveCriticalSection(&cs); }
+};
 
 // EOF