(no commit message)

[oweals/gnunet.git] / src / include / winproc.h

diff --git a/src/include/winproc.h b/src/include/winproc.h
index c036ba965ed562c40e2c0044cc98291ed643742e..05c4ac1bf4a7ac774e268bf03f019440860eb707 100644 (file)
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -34,16 +34,17 @@
 #include <sys/timeb.h>
 #include <time.h>
 #include <dirent.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #include <windows.h>
-#include <winsock.h>
 #include <winerror.h>
 #include <iphlpapi.h>
 #include <shlobj.h>
 #include <objbase.h>
 #include <sys/param.h>          /* #define BYTE_ORDER */
-#include <Ntsecapi.h>
+#include <ntsecapi.h>
 #include <lm.h>
-#include <Aclapi.h>
+#include <aclapi.h>
 
 
 #ifdef __cplusplus
@@ -55,8 +56,7 @@ extern "C"
 #define MAX_NAME_LENGTH 25
 #endif
 
-  typedef DWORD WINAPI (*TNtQuerySystemInformation) (int, PVOID, ULONG,
-                                                     PULONG);
+  typedef DWORD WINAPI (*TNtQuerySystemInformation) (int, PVOID, ULONG, PULONG);
   typedef DWORD WINAPI (*TGetIfEntry) (PMIB_IFROW pIfRow);
   typedef DWORD WINAPI (*TGetIpAddrTable) (PMIB_IPADDRTABLE pIpAddrTable,
                                            PULONG pdwSize, BOOL bOrder);
@@ -103,19 +103,17 @@ extern "C"
                                              PDWORD pdwBestIfIndex);
   typedef DWORD WINAPI (*TGetAdaptersInfo) (PIP_ADAPTER_INFO pAdapterInfo,
                                             PULONG pOutBufLen);
-  typedef NET_API_STATUS WINAPI (*TNetUserAdd) (LPCWSTR, DWORD, PBYTE,
-                                                PDWORD);
+  typedef NET_API_STATUS WINAPI (*TNetUserAdd) (LPCWSTR, DWORD, PBYTE, PDWORD);
   typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername,
                                                     LPCWSTR username,
                                                     DWORD level, LPBYTE buf,
                                                     LPDWORD parm_err);
   typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING,
-                                            PLSA_OBJECT_ATTRIBUTES,
-                                            ACCESS_MASK, PLSA_HANDLE);
+                                            PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,
+                                            PLSA_HANDLE);
   typedef NTSTATUS NTAPI (*TLsaAddAccountRights) (LSA_HANDLE, PSID,
                                                   PLSA_UNICODE_STRING, ULONG);
-  typedef NTSTATUS NTAPI (*TLsaRemoveAccountRights) (LSA_HANDLE, PSID,
-                                                     BOOLEAN,
+  typedef NTSTATUS NTAPI (*TLsaRemoveAccountRights) (LSA_HANDLE, PSID, BOOLEAN,
                                                      PLSA_UNICODE_STRING,
                                                      ULONG);
   typedef NTSTATUS NTAPI (*TLsaClose) (LSA_HANDLE);
@@ -140,8 +138,7 @@ extern "C"
                                                      LPBOOL lpbDaclPresent,
                                                      PACL * pDacl,
                                                      LPBOOL lpbDaclDefaulted);
-  typedef BOOL WINAPI (*TGetAclInformation) (PACL pAcl,
-                                             LPVOID pAclInformation,
+  typedef BOOL WINAPI (*TGetAclInformation) (PACL pAcl, LPVOID pAclInformation,
                                              DWORD nAclInformationLength,
                                              ACL_INFORMATION_CLASS
                                              dwAclInformationClass);
@@ -198,14 +195,14 @@ extern "C"
 
   BOOL CreateShortcut (const char *pszSrc, const char *pszDest);
   BOOL DereferenceShortcut (char *pszShortcut);
-  long QueryRegistry (HKEY hMainKey, char *pszKey, char *pszSubKey,
+  long QueryRegistry (HKEY hMainKey, const char *pszKey, const char *pszSubKey,
                       char *pszBuffer, long *pdLength);
   int ListNICs (void (*callback) (void *, const char *, int), void *cls);
   BOOL AddPathAccessRights (char *lpszFileName, char *lpszAccountName,
                             DWORD dwAccessMask);
   char *winErrorStr (const char *prefix, int dwErr);
-
-  void GNInitWinEnv ();
+  void EnumNICs (PMIB_IFTABLE * pIfTable, PMIB_IPADDRTABLE * pAddrTable);
+  int GNInitWinEnv ();
   void GNShutdownWinEnv ();
 
 #ifdef __cplusplus