1 files changed, 85 insertions, 85 deletions
diff --git a/src/util/winproc.c b/src/util/winproc.c
index 2df638362..4fa3ab484 100644
--- a/src/util/winproc.c
+++ b/src/util/winproc.c
@@ -99,130 +99,130 @@ GNInitWinEnv ()
  /* Function to get CPU usage under Win NT */
  if (hNTDLL)
-    {
+  {
-      GNNtQuerySystemInformation = (TNtQuerySystemInformation)
+    GNNtQuerySystemInformation = (TNtQuerySystemInformation)
        GetProcAddress (hNTDLL, "NtQuerySystemInformation");
-    }
+  }
  else
-    {
+  {
-      GNNtQuerySystemInformation = NULL;
+    GNNtQuerySystemInformation = NULL;
-    }
+  }
  /* Functions to get information about a network adapter */
  hIphlpapi = LoadLibrary ("iphlpapi.dll");
  if (hIphlpapi)
-    {
+  {
-      GNGetIfEntry = (TGetIfEntry) GetProcAddress (hIphlpapi, "GetIfEntry");
+    GNGetIfEntry = (TGetIfEntry) GetProcAddress (hIphlpapi, "GetIfEntry");
-      GNGetIpAddrTable = (TGetIpAddrTable) GetProcAddress (hIphlpapi,
+    GNGetIpAddrTable = (TGetIpAddrTable) GetProcAddress (hIphlpapi,
-                                                           "GetIpAddrTable");
+                                                         "GetIpAddrTable");
-      GNGetIfTable = (TGetIfTable) GetProcAddress (hIphlpapi, "GetIfTable");
+    GNGetIfTable = (TGetIfTable) GetProcAddress (hIphlpapi, "GetIfTable");
-      GNGetBestInterface = (TGetBestInterface) GetProcAddress (hIphlpapi,
+    GNGetBestInterface = (TGetBestInterface) GetProcAddress (hIphlpapi,
-                                                               "GetBestInterface");
+                                                             "GetBestInterface");
-      GGetAdaptersInfo = (TGetAdaptersInfo) GetProcAddress (hIphlpapi,
+    GGetAdaptersInfo = (TGetAdaptersInfo) GetProcAddress (hIphlpapi,
-                                                            "GetAdaptersInfo");
+                                                          "GetAdaptersInfo");
-    }
+  }
  else
-    {
+  {
-      GNGetIfEntry = NULL;
+    GNGetIfEntry = NULL;
-      GNGetIpAddrTable = NULL;
+    GNGetIpAddrTable = NULL;
-      GNGetIfTable = NULL;
+    GNGetIfTable = NULL;
-      GNGetBestInterface = NULL;
+    GNGetBestInterface = NULL;
-      GGetAdaptersInfo = NULL;
+    GGetAdaptersInfo = NULL;
-    }
+  }
  /* Service & Account functions */
  hAdvapi = LoadLibrary ("advapi32.dll");
  if (hAdvapi)
-    {
+  {
-      GNOpenSCManager = (TOpenSCManager)
+    GNOpenSCManager = (TOpenSCManager)
        GetProcAddress (hAdvapi, "OpenSCManagerA");
-      GNCreateService = (TCreateService)
+    GNCreateService = (TCreateService)
        GetProcAddress (hAdvapi, "CreateServiceA");
-      GNCloseServiceHandle = (TCloseServiceHandle)
+    GNCloseServiceHandle = (TCloseServiceHandle)
        GetProcAddress (hAdvapi, "CloseServiceHandle");
-      GNDeleteService = (TDeleteService)
+    GNDeleteService = (TDeleteService)
        GetProcAddress (hAdvapi, "DeleteService");
-      GNRegisterServiceCtrlHandler = (TRegisterServiceCtrlHandler)
+    GNRegisterServiceCtrlHandler = (TRegisterServiceCtrlHandler)
        GetProcAddress (hAdvapi, "RegisterServiceCtrlHandlerA");
-      GNSetServiceStatus = (TSetServiceStatus)
+    GNSetServiceStatus = (TSetServiceStatus)
        GetProcAddress (hAdvapi, "SetServiceStatus");
-      GNStartServiceCtrlDispatcher = (TStartServiceCtrlDispatcher)
+    GNStartServiceCtrlDispatcher = (TStartServiceCtrlDispatcher)
        GetProcAddress (hAdvapi, "StartServiceCtrlDispatcherA");
-      GNControlService = (TControlService)
+    GNControlService = (TControlService)
        GetProcAddress (hAdvapi, "ControlService");
-      GNOpenService = (TOpenService) GetProcAddress (hAdvapi, "OpenServiceA");
+    GNOpenService = (TOpenService) GetProcAddress (hAdvapi, "OpenServiceA");
-      GNLsaOpenPolicy = (TLsaOpenPolicy)
+    GNLsaOpenPolicy = (TLsaOpenPolicy)
        GetProcAddress (hAdvapi, "LsaOpenPolicy");
-      GNLsaAddAccountRights = (TLsaAddAccountRights)
+    GNLsaAddAccountRights = (TLsaAddAccountRights)
        GetProcAddress (hAdvapi, "LsaAddAccountRights");
-      GNLsaRemoveAccountRights = (TLsaRemoveAccountRights)
+    GNLsaRemoveAccountRights = (TLsaRemoveAccountRights)
        GetProcAddress (hAdvapi, "LsaRemoveAccountRights");
-      GNLsaClose = (TLsaClose) GetProcAddress (hAdvapi, "LsaClose");
+    GNLsaClose = (TLsaClose) GetProcAddress (hAdvapi, "LsaClose");
-      GNLookupAccountName = (TLookupAccountName)
+    GNLookupAccountName = (TLookupAccountName)
        GetProcAddress (hAdvapi, "LookupAccountNameA");
-      GNGetFileSecurity = (TGetFileSecurity)
+    GNGetFileSecurity = (TGetFileSecurity)
        GetProcAddress (hAdvapi, "GetFileSecurityA");
-      GNInitializeSecurityDescriptor = (TInitializeSecurityDescriptor)
+    GNInitializeSecurityDescriptor = (TInitializeSecurityDescriptor)
        GetProcAddress (hAdvapi, "InitializeSecurityDescriptor");
-      GNGetSecurityDescriptorDacl = (TGetSecurityDescriptorDacl)
+    GNGetSecurityDescriptorDacl = (TGetSecurityDescriptorDacl)
        GetProcAddress (hAdvapi, "GetSecurityDescriptorDacl");
-      GNGetAclInformation = (TGetAclInformation)
+    GNGetAclInformation = (TGetAclInformation)
        GetProcAddress (hAdvapi, "GetAclInformation");
-      GNInitializeAcl = (TInitializeAcl)
+    GNInitializeAcl = (TInitializeAcl)
        GetProcAddress (hAdvapi, "InitializeAcl");
-      GNGetAce = (TGetAce) GetProcAddress (hAdvapi, "GetAce");
+    GNGetAce = (TGetAce) GetProcAddress (hAdvapi, "GetAce");
-      GNEqualSid = (TEqualSid) GetProcAddress (hAdvapi, "EqualSid");
+    GNEqualSid = (TEqualSid) GetProcAddress (hAdvapi, "EqualSid");
-      GNAddAce = (TAddAce) GetProcAddress (hAdvapi, "AddAce");
+    GNAddAce = (TAddAce) GetProcAddress (hAdvapi, "AddAce");
-      GNAddAccessAllowedAce = (TAddAccessAllowedAce)
+    GNAddAccessAllowedAce = (TAddAccessAllowedAce)
        GetProcAddress (hAdvapi, "AddAccessAllowedAce");
-      GNSetNamedSecurityInfo = (TSetNamedSecurityInfo)
+    GNSetNamedSecurityInfo = (TSetNamedSecurityInfo)
        GetProcAddress (hAdvapi, "SetNamedSecurityInfoA");
-    }
+  }
  else
-    {
+  {
-      GNOpenSCManager = NULL;
+    GNOpenSCManager = NULL;
-      GNCreateService = NULL;
+    GNCreateService = NULL;
-      GNCloseServiceHandle = NULL;
+    GNCloseServiceHandle = NULL;
-      GNDeleteService = NULL;
+    GNDeleteService = NULL;
-      GNRegisterServiceCtrlHandler = NULL;
+    GNRegisterServiceCtrlHandler = NULL;
-      GNSetServiceStatus = NULL;
+    GNSetServiceStatus = NULL;
-      GNStartServiceCtrlDispatcher = NULL;
+    GNStartServiceCtrlDispatcher = NULL;
-      GNControlService = NULL;
+    GNControlService = NULL;
-      GNOpenService = NULL;
+    GNOpenService = NULL;
-      GNLsaOpenPolicy = NULL;
+    GNLsaOpenPolicy = NULL;
-      GNLsaAddAccountRights = NULL;
+    GNLsaAddAccountRights = NULL;
-      GNLsaRemoveAccountRights = NULL;
+    GNLsaRemoveAccountRights = NULL;
-      GNLsaClose = NULL;
+    GNLsaClose = NULL;
-      GNLookupAccountName = NULL;
+    GNLookupAccountName = NULL;
-      GNGetFileSecurity = NULL;
+    GNGetFileSecurity = NULL;
-      GNInitializeSecurityDescriptor = NULL;
+    GNInitializeSecurityDescriptor = NULL;
-      GNGetSecurityDescriptorDacl = NULL;
+    GNGetSecurityDescriptorDacl = NULL;
-      GNGetAclInformation = NULL;
+    GNGetAclInformation = NULL;
-      GNInitializeAcl = NULL;
+    GNInitializeAcl = NULL;
-      GNGetAce = NULL;
+    GNGetAce = NULL;
-      GNEqualSid = NULL;
+    GNEqualSid = NULL;
-      GNAddAce = NULL;
+    GNAddAce = NULL;
-      GNAddAccessAllowedAce = NULL;
+    GNAddAccessAllowedAce = NULL;
-      GNSetNamedSecurityInfo = NULL;
+    GNSetNamedSecurityInfo = NULL;
-    }
+  }
  /* Account function */
  hNetapi = LoadLibrary ("netapi32.dll");
  if (hNetapi)
-    {
+  {
-      GNNetUserAdd = (TNetUserAdd) GetProcAddress (hNetapi, "NetUserAdd");
+    GNNetUserAdd = (TNetUserAdd) GetProcAddress (hNetapi, "NetUserAdd");
-      GNNetUserSetInfo = (TNetUserSetInfo)
+    GNNetUserSetInfo = (TNetUserSetInfo)
        GetProcAddress (hNetapi, "NetUserSetInfo");
-    }
+  }
  else
-    {
+  {
-      GNNetUserAdd = NULL;
+    GNNetUserAdd = NULL;
-      GNNetUserSetInfo = NULL;
+    GNNetUserSetInfo = NULL;
-    }
+  }
  return ret;
 }

diff --git a/src/util/winproc.c b/src/util/winproc.c index 2df638362..4fa3ab484 100644 --- a/src/util/winproc.c +++ b/src/util/winproc.c
@@ -99,130 +99,130 @@ GNInitWinEnv ()
99		99
100	/* Function to get CPU usage under Win NT */	100	/* Function to get CPU usage under Win NT */
101	if (hNTDLL)	101	if (hNTDLL)
102	{	102	{
103	GNNtQuerySystemInformation = (TNtQuerySystemInformation)	103	GNNtQuerySystemInformation = (TNtQuerySystemInformation)
104	GetProcAddress (hNTDLL, "NtQuerySystemInformation");	104	GetProcAddress (hNTDLL, "NtQuerySystemInformation");
105	}	105	}
106	else	106	else
107	{	107	{
108	GNNtQuerySystemInformation = NULL;	108	GNNtQuerySystemInformation = NULL;
109	}	109	}
110		110
111	/* Functions to get information about a network adapter */	111	/* Functions to get information about a network adapter */
112	hIphlpapi = LoadLibrary ("iphlpapi.dll");	112	hIphlpapi = LoadLibrary ("iphlpapi.dll");
113	if (hIphlpapi)	113	if (hIphlpapi)
114	{	114	{
115	GNGetIfEntry = (TGetIfEntry) GetProcAddress (hIphlpapi, "GetIfEntry");	115	GNGetIfEntry = (TGetIfEntry) GetProcAddress (hIphlpapi, "GetIfEntry");
116	GNGetIpAddrTable = (TGetIpAddrTable) GetProcAddress (hIphlpapi,	116	GNGetIpAddrTable = (TGetIpAddrTable) GetProcAddress (hIphlpapi,
117	"GetIpAddrTable");	117	"GetIpAddrTable");
118	GNGetIfTable = (TGetIfTable) GetProcAddress (hIphlpapi, "GetIfTable");	118	GNGetIfTable = (TGetIfTable) GetProcAddress (hIphlpapi, "GetIfTable");
119	GNGetBestInterface = (TGetBestInterface) GetProcAddress (hIphlpapi,	119	GNGetBestInterface = (TGetBestInterface) GetProcAddress (hIphlpapi,
120	"GetBestInterface");	120	"GetBestInterface");
121	GGetAdaptersInfo = (TGetAdaptersInfo) GetProcAddress (hIphlpapi,	121	GGetAdaptersInfo = (TGetAdaptersInfo) GetProcAddress (hIphlpapi,
122	"GetAdaptersInfo");	122	"GetAdaptersInfo");
123	}	123	}
124	else	124	else
125	{	125	{
126	GNGetIfEntry = NULL;	126	GNGetIfEntry = NULL;
127	GNGetIpAddrTable = NULL;	127	GNGetIpAddrTable = NULL;
128	GNGetIfTable = NULL;	128	GNGetIfTable = NULL;
129	GNGetBestInterface = NULL;	129	GNGetBestInterface = NULL;
130	GGetAdaptersInfo = NULL;	130	GGetAdaptersInfo = NULL;
131	}	131	}
132		132
133	/* Service & Account functions */	133	/* Service & Account functions */
134	hAdvapi = LoadLibrary ("advapi32.dll");	134	hAdvapi = LoadLibrary ("advapi32.dll");
135	if (hAdvapi)	135	if (hAdvapi)
136	{	136	{
137	GNOpenSCManager = (TOpenSCManager)	137	GNOpenSCManager = (TOpenSCManager)
138	GetProcAddress (hAdvapi, "OpenSCManagerA");	138	GetProcAddress (hAdvapi, "OpenSCManagerA");
139	GNCreateService = (TCreateService)	139	GNCreateService = (TCreateService)
140	GetProcAddress (hAdvapi, "CreateServiceA");	140	GetProcAddress (hAdvapi, "CreateServiceA");
141	GNCloseServiceHandle = (TCloseServiceHandle)	141	GNCloseServiceHandle = (TCloseServiceHandle)
142	GetProcAddress (hAdvapi, "CloseServiceHandle");	142	GetProcAddress (hAdvapi, "CloseServiceHandle");
143	GNDeleteService = (TDeleteService)	143	GNDeleteService = (TDeleteService)
144	GetProcAddress (hAdvapi, "DeleteService");	144	GetProcAddress (hAdvapi, "DeleteService");
145	GNRegisterServiceCtrlHandler = (TRegisterServiceCtrlHandler)	145	GNRegisterServiceCtrlHandler = (TRegisterServiceCtrlHandler)
146	GetProcAddress (hAdvapi, "RegisterServiceCtrlHandlerA");	146	GetProcAddress (hAdvapi, "RegisterServiceCtrlHandlerA");
147	GNSetServiceStatus = (TSetServiceStatus)	147	GNSetServiceStatus = (TSetServiceStatus)
148	GetProcAddress (hAdvapi, "SetServiceStatus");	148	GetProcAddress (hAdvapi, "SetServiceStatus");
149	GNStartServiceCtrlDispatcher = (TStartServiceCtrlDispatcher)	149	GNStartServiceCtrlDispatcher = (TStartServiceCtrlDispatcher)
150	GetProcAddress (hAdvapi, "StartServiceCtrlDispatcherA");	150	GetProcAddress (hAdvapi, "StartServiceCtrlDispatcherA");
151	GNControlService = (TControlService)	151	GNControlService = (TControlService)
152	GetProcAddress (hAdvapi, "ControlService");	152	GetProcAddress (hAdvapi, "ControlService");
153	GNOpenService = (TOpenService) GetProcAddress (hAdvapi, "OpenServiceA");	153	GNOpenService = (TOpenService) GetProcAddress (hAdvapi, "OpenServiceA");
154		154
155	GNLsaOpenPolicy = (TLsaOpenPolicy)	155	GNLsaOpenPolicy = (TLsaOpenPolicy)
156	GetProcAddress (hAdvapi, "LsaOpenPolicy");	156	GetProcAddress (hAdvapi, "LsaOpenPolicy");
157	GNLsaAddAccountRights = (TLsaAddAccountRights)	157	GNLsaAddAccountRights = (TLsaAddAccountRights)
158	GetProcAddress (hAdvapi, "LsaAddAccountRights");	158	GetProcAddress (hAdvapi, "LsaAddAccountRights");
159	GNLsaRemoveAccountRights = (TLsaRemoveAccountRights)	159	GNLsaRemoveAccountRights = (TLsaRemoveAccountRights)
160	GetProcAddress (hAdvapi, "LsaRemoveAccountRights");	160	GetProcAddress (hAdvapi, "LsaRemoveAccountRights");
161	GNLsaClose = (TLsaClose) GetProcAddress (hAdvapi, "LsaClose");	161	GNLsaClose = (TLsaClose) GetProcAddress (hAdvapi, "LsaClose");
162	GNLookupAccountName = (TLookupAccountName)	162	GNLookupAccountName = (TLookupAccountName)
163	GetProcAddress (hAdvapi, "LookupAccountNameA");	163	GetProcAddress (hAdvapi, "LookupAccountNameA");
164		164
165	GNGetFileSecurity = (TGetFileSecurity)	165	GNGetFileSecurity = (TGetFileSecurity)
166	GetProcAddress (hAdvapi, "GetFileSecurityA");	166	GetProcAddress (hAdvapi, "GetFileSecurityA");
167	GNInitializeSecurityDescriptor = (TInitializeSecurityDescriptor)	167	GNInitializeSecurityDescriptor = (TInitializeSecurityDescriptor)
168	GetProcAddress (hAdvapi, "InitializeSecurityDescriptor");	168	GetProcAddress (hAdvapi, "InitializeSecurityDescriptor");
169	GNGetSecurityDescriptorDacl = (TGetSecurityDescriptorDacl)	169	GNGetSecurityDescriptorDacl = (TGetSecurityDescriptorDacl)
170	GetProcAddress (hAdvapi, "GetSecurityDescriptorDacl");	170	GetProcAddress (hAdvapi, "GetSecurityDescriptorDacl");
171	GNGetAclInformation = (TGetAclInformation)	171	GNGetAclInformation = (TGetAclInformation)
172	GetProcAddress (hAdvapi, "GetAclInformation");	172	GetProcAddress (hAdvapi, "GetAclInformation");
173	GNInitializeAcl = (TInitializeAcl)	173	GNInitializeAcl = (TInitializeAcl)
174	GetProcAddress (hAdvapi, "InitializeAcl");	174	GetProcAddress (hAdvapi, "InitializeAcl");
175	GNGetAce = (TGetAce) GetProcAddress (hAdvapi, "GetAce");	175	GNGetAce = (TGetAce) GetProcAddress (hAdvapi, "GetAce");
176	GNEqualSid = (TEqualSid) GetProcAddress (hAdvapi, "EqualSid");	176	GNEqualSid = (TEqualSid) GetProcAddress (hAdvapi, "EqualSid");
177	GNAddAce = (TAddAce) GetProcAddress (hAdvapi, "AddAce");	177	GNAddAce = (TAddAce) GetProcAddress (hAdvapi, "AddAce");
178	GNAddAccessAllowedAce = (TAddAccessAllowedAce)	178	GNAddAccessAllowedAce = (TAddAccessAllowedAce)
179	GetProcAddress (hAdvapi, "AddAccessAllowedAce");	179	GetProcAddress (hAdvapi, "AddAccessAllowedAce");
180	GNSetNamedSecurityInfo = (TSetNamedSecurityInfo)	180	GNSetNamedSecurityInfo = (TSetNamedSecurityInfo)
181	GetProcAddress (hAdvapi, "SetNamedSecurityInfoA");	181	GetProcAddress (hAdvapi, "SetNamedSecurityInfoA");
182	}	182	}
183	else	183	else
184	{	184	{
185	GNOpenSCManager = NULL;	185	GNOpenSCManager = NULL;
186	GNCreateService = NULL;	186	GNCreateService = NULL;
187	GNCloseServiceHandle = NULL;	187	GNCloseServiceHandle = NULL;
188	GNDeleteService = NULL;	188	GNDeleteService = NULL;
189	GNRegisterServiceCtrlHandler = NULL;	189	GNRegisterServiceCtrlHandler = NULL;
190	GNSetServiceStatus = NULL;	190	GNSetServiceStatus = NULL;
191	GNStartServiceCtrlDispatcher = NULL;	191	GNStartServiceCtrlDispatcher = NULL;
192	GNControlService = NULL;	192	GNControlService = NULL;
193	GNOpenService = NULL;	193	GNOpenService = NULL;
194		194
195	GNLsaOpenPolicy = NULL;	195	GNLsaOpenPolicy = NULL;
196	GNLsaAddAccountRights = NULL;	196	GNLsaAddAccountRights = NULL;
197	GNLsaRemoveAccountRights = NULL;	197	GNLsaRemoveAccountRights = NULL;
198	GNLsaClose = NULL;	198	GNLsaClose = NULL;
199	GNLookupAccountName = NULL;	199	GNLookupAccountName = NULL;
200		200
201	GNGetFileSecurity = NULL;	201	GNGetFileSecurity = NULL;
202	GNInitializeSecurityDescriptor = NULL;	202	GNInitializeSecurityDescriptor = NULL;
203	GNGetSecurityDescriptorDacl = NULL;	203	GNGetSecurityDescriptorDacl = NULL;
204	GNGetAclInformation = NULL;	204	GNGetAclInformation = NULL;
205	GNInitializeAcl = NULL;	205	GNInitializeAcl = NULL;
206	GNGetAce = NULL;	206	GNGetAce = NULL;
207	GNEqualSid = NULL;	207	GNEqualSid = NULL;
208	GNAddAce = NULL;	208	GNAddAce = NULL;
209	GNAddAccessAllowedAce = NULL;	209	GNAddAccessAllowedAce = NULL;
210	GNSetNamedSecurityInfo = NULL;	210	GNSetNamedSecurityInfo = NULL;
211	}	211	}
212		212
213	/* Account function */	213	/* Account function */
214	hNetapi = LoadLibrary ("netapi32.dll");	214	hNetapi = LoadLibrary ("netapi32.dll");
215	if (hNetapi)	215	if (hNetapi)
216	{	216	{
217	GNNetUserAdd = (TNetUserAdd) GetProcAddress (hNetapi, "NetUserAdd");	217	GNNetUserAdd = (TNetUserAdd) GetProcAddress (hNetapi, "NetUserAdd");
218	GNNetUserSetInfo = (TNetUserSetInfo)	218	GNNetUserSetInfo = (TNetUserSetInfo)
219	GetProcAddress (hNetapi, "NetUserSetInfo");	219	GetProcAddress (hNetapi, "NetUserSetInfo");
220	}	220	}
221	else	221	else
222	{	222	{
223	GNNetUserAdd = NULL;	223	GNNetUserAdd = NULL;
224	GNNetUserSetInfo = NULL;	224	GNNetUserSetInfo = NULL;
225	}	225	}
226		226
227	return ret;	227	return ret;
228	}	228	}