Returns now GNUNET_SYSERR

[oweals/gnunet.git] / src / util / win.cc

diff --git a/src/util/win.cc b/src/util/win.cc
index df5f686b36a4f20a6857d712312faed59802f86c..b462033b921dec64a6b0ba087420bdf10b1c3fdd 100644 (file)
--- a/src/util/win.cc
+++ b/src/util/win.cc
@@ -42,21 +42,8 @@ using namespace std;
 \r
 extern "C" {\r
 \r
-typedef list<WSAOVERLAPPED *> TOLList;\r
-\r
-static HANDLE hOLLock;\r
-static TOLList lstOL;\r
-\r
 int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);\r
 \r
-void __attribute__ ((constructor)) gnunet_win_init() {\r
-  hOLLock = CreateMutex(NULL, FALSE, NULL);\r
-}\r
-\r
-void __attribute__ ((destructor)) gnunet_win_fini() {\r
-  CloseHandle(hOLLock);\r
-}\r
-\r
 /**\r
  * Enumerate all network adapters\r
  */\r
@@ -359,7 +346,7 @@ NTSTATUS _OpenPolicy(LPWSTR ServerName, DWORD DesiredAccess, PLSA_HANDLE PolicyH
  * @remarks Call GetLastError() to obtain extended error information.\r
  * @see http://support.microsoft.com/?scid=kb;en-us;132958\r
  */\r
-BOOL _GetAccountSid(LPTSTR SystemName, LPTSTR AccountName, PSID * Sid)\r
+BOOL _GetAccountSid(LPCTSTR SystemName, LPCTSTR AccountName, PSID * Sid)\r
 {\r
   LPTSTR ReferencedDomain = NULL;\r
   DWORD cbSid = 128;                                                   /* initial allocation attempt */\r
@@ -465,7 +452,7 @@ NTSTATUS _SetPrivilegeOnAccount(LSA_HANDLE PolicyHandle,/* open policy handle */
  * @param pszName the name of the account\r
  * @param pszDesc description of the account\r
  */\r
-int CreateServiceAccount(char *pszName, char *pszDesc)\r
+int CreateServiceAccount(const char *pszName, const char *pszDesc)\r
 {\r
   USER_INFO_1 ui;\r
   USER_INFO_1008 ui2;\r
@@ -499,14 +486,14 @@ int CreateServiceAccount(char *pszName, char *pszDesc)
                                                                                STATUS_SUCCESS)\r
        return 3;\r
 \r
-  _GetAccountSid(NULL, (LPTSTR) pszName, &pSID);\r
+  _GetAccountSid(NULL, (LPCTSTR) pszName, &pSID);\r
 \r
-  if (_SetPrivilegeOnAccount(hPolicy, pSID, L"SeServiceLogonRight", TRUE) != STATUS_SUCCESS)\r
+  if (_SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeServiceLogonRight", TRUE) != STATUS_SUCCESS)\r
        return 4;\r
 \r
-  _SetPrivilegeOnAccount(hPolicy, pSID, L"SeDenyInteractiveLogonRight", TRUE);\r
-  _SetPrivilegeOnAccount(hPolicy, pSID, L"SeDenyBatchLogonRight", TRUE);\r
-  _SetPrivilegeOnAccount(hPolicy, pSID, L"SeDenyNetworkLogonRight", TRUE);\r
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyInteractiveLogonRight", TRUE);\r
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyBatchLogonRight", TRUE);\r
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyNetworkLogonRight", TRUE);\r
 \r
   GNLsaClose(hPolicy);\r
 \r
@@ -814,7 +801,7 @@ char *winErrorStr(const char *prefix, int dwErr)
     NULL, (DWORD) dwErr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &err,\r
     0, NULL ))\r
   {\r
-    err = "";\r
+    err = (char *) LocalAlloc (LMEM_FIXED | LMEM_ZEROINIT, 1);\r
   }\r
 \r
   mem = strlen(err) + strlen(prefix) + 20;\r