4.654.65

4 files changed, 12 insertions, 10 deletions

diff --git a/CPP/Windows/Control/Trackbar.h b/CPP/Windows/Control/Trackbar.h
index bbd7009a..64120f98 100755
--- a/CPP/Windows/Control/Trackbar.h
+++ b/CPP/Windows/Control/Trackbar.h
@@ -20,7 +20,7 @@ public:
     { SendMessage(TBM_SETTICFREQ, freq); }
   
   int GetPos()
-    { return SendMessage(TBM_GETPOS); }
+    { return (int)SendMessage(TBM_GETPOS); }
 };
 
 }}
diff --git a/CPP/Windows/Security.cpp b/CPP/Windows/Security.cpp
index 24001c49..bb8c3a9a 100755
--- a/CPP/Windows/Security.cpp
+++ b/CPP/Windows/Security.cpp
@@ -1,12 +1,8 @@
-// Windows/Security.h
+// Windows/Security.cpp
 
 #include "StdAfx.h"
 
-#include "Windows/Security.h"
-#include "Windows/Defs.h"
-
-#include "Common/StringConvert.h"
-#include "Defs.h"
+#include "Security.h"
 
 namespace NWindows {
 namespace NSecurity {
@@ -105,6 +101,8 @@ static PSID GetSid(LPWSTR accountName)
   return NULL;
 }
 
+#define MY__SE_LOCK_MEMORY_NAME L"SeLockMemoryPrivilege"
+
 bool AddLockMemoryPrivilege()
 {
   CPolicy policy;
@@ -123,8 +121,9 @@ bool AddLockMemoryPrivilege()
       != 0)
     return false;
   LSA_UNICODE_STRING userRights;
-  UString s = GetUnicodeString(SE_LOCK_MEMORY_NAME);
-  SetLsaString((LPWSTR)(LPCWSTR)s, &userRights);
+  wchar_t s[128];
+  wcscpy(s, MY__SE_LOCK_MEMORY_NAME);
+  SetLsaString(s, &userRights);
   WCHAR userName[256 + 2];
   DWORD size = 256;
   if (!GetUserNameW(userName, &size))
diff --git a/CPP/Windows/Security.h b/CPP/Windows/Security.h
index 976f746b..90cf2caf 100755
--- a/CPP/Windows/Security.h
+++ b/CPP/Windows/Security.h
@@ -3,7 +3,7 @@
 #ifndef __WINDOWS_SECURITY_H
 #define __WINDOWS_SECURITY_H
 
-#include "Windows/Defs.h"
+#include "Defs.h"
 
 #include <NTSecAPI.h>
 
diff --git a/CPP/Windows/Thread.h b/CPP/Windows/Thread.h
index 9c427608..39104f4a 100755
--- a/CPP/Windows/Thread.h
+++ b/CPP/Windows/Thread.h
@@ -25,6 +25,9 @@ public:
   WRes Wait() { return Thread_Wait(&thread); }
   
   #ifdef _WIN32
+  operator HANDLE() { return thread.handle; }
+  void Attach(HANDLE handle) { thread.handle = handle; }
+  HANDLE Detach() { HANDLE h = thread.handle; thread.handle = NULL; return h; }
   DWORD Resume() { return ::ResumeThread(thread.handle); }
   DWORD Suspend() { return ::SuspendThread(thread.handle); }
   bool Terminate(DWORD exitCode) { return BOOLToBool(::TerminateThread(thread.handle, exitCode)); }