diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
commit | d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch) | |
tree | 9080b73624389403a198257fe0547bb4634e64d2 /src/util/winproc.c | |
parent | 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff) | |
download | gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip |
converting to GNUNET_LOG_from*
Diffstat (limited to 'src/util/winproc.c')
-rw-r--r-- | src/util/winproc.c | 230 |
1 files changed, 116 insertions, 114 deletions
diff --git a/src/util/winproc.c b/src/util/winproc.c index 9594c5d6f..cf4240cd7 100644 --- a/src/util/winproc.c +++ b/src/util/winproc.c | |||
@@ -72,9 +72,9 @@ TSetNamedSecurityInfo GNSetNamedSecurityInfo; | |||
72 | void | 72 | void |
73 | plibc_panic (int err, char *msg) | 73 | plibc_panic (int err, char *msg) |
74 | { | 74 | { |
75 | GNUNET_log (((err == | 75 | LOG (((err == |
76 | INT_MAX) ? GNUNET_ERROR_TYPE_DEBUG : GNUNET_ERROR_TYPE_ERROR), | 76 | INT_MAX) ? GNUNET_ERROR_TYPE_DEBUG : GNUNET_ERROR_TYPE_ERROR), |
77 | "%s", msg); | 77 | "%s", msg); |
78 | } | 78 | } |
79 | 79 | ||
80 | /** | 80 | /** |
@@ -99,137 +99,139 @@ 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 = | 103 | GNNtQuerySystemInformation = |
104 | (TNtQuerySystemInformation) GetProcAddress (hNTDLL, | 104 | (TNtQuerySystemInformation) GetProcAddress (hNTDLL, |
105 | "NtQuerySystemInformation"); | 105 | "NtQuerySystemInformation"); |
106 | } | 106 | } |
107 | else | 107 | else |
108 | { | 108 | { |
109 | GNNtQuerySystemInformation = NULL; | 109 | GNNtQuerySystemInformation = NULL; |
110 | } | 110 | } |
111 | 111 | ||
112 | /* Functions to get information about a network adapter */ | 112 | /* Functions to get information about a network adapter */ |
113 | hIphlpapi = LoadLibrary ("iphlpapi.dll"); | 113 | hIphlpapi = LoadLibrary ("iphlpapi.dll"); |
114 | if (hIphlpapi) | 114 | if (hIphlpapi) |
115 | { | 115 | { |
116 | GNGetIfEntry = (TGetIfEntry) GetProcAddress (hIphlpapi, "GetIfEntry"); | 116 | GNGetIfEntry = (TGetIfEntry) GetProcAddress (hIphlpapi, "GetIfEntry"); |
117 | GNGetIpAddrTable = | 117 | GNGetIpAddrTable = |
118 | (TGetIpAddrTable) GetProcAddress (hIphlpapi, "GetIpAddrTable"); | 118 | (TGetIpAddrTable) GetProcAddress (hIphlpapi, "GetIpAddrTable"); |
119 | GNGetIfTable = (TGetIfTable) GetProcAddress (hIphlpapi, "GetIfTable"); | 119 | GNGetIfTable = (TGetIfTable) GetProcAddress (hIphlpapi, "GetIfTable"); |
120 | GNGetBestInterface = | 120 | GNGetBestInterface = |
121 | (TGetBestInterface) GetProcAddress (hIphlpapi, "GetBestInterface"); | 121 | (TGetBestInterface) GetProcAddress (hIphlpapi, "GetBestInterface"); |
122 | GGetAdaptersInfo = | 122 | GGetAdaptersInfo = |
123 | (TGetAdaptersInfo) GetProcAddress (hIphlpapi, "GetAdaptersInfo"); | 123 | (TGetAdaptersInfo) GetProcAddress (hIphlpapi, "GetAdaptersInfo"); |
124 | } | 124 | } |
125 | else | 125 | else |
126 | { | 126 | { |
127 | GNGetIfEntry = NULL; | 127 | GNGetIfEntry = NULL; |
128 | GNGetIpAddrTable = NULL; | 128 | GNGetIpAddrTable = NULL; |
129 | GNGetIfTable = NULL; | 129 | GNGetIfTable = NULL; |
130 | GNGetBestInterface = NULL; | 130 | GNGetBestInterface = NULL; |
131 | GGetAdaptersInfo = NULL; | 131 | GGetAdaptersInfo = NULL; |
132 | } | 132 | } |
133 | 133 | ||
134 | /* Service & Account functions */ | 134 | /* Service & Account functions */ |
135 | hAdvapi = LoadLibrary ("advapi32.dll"); | 135 | hAdvapi = LoadLibrary ("advapi32.dll"); |
136 | if (hAdvapi) | 136 | if (hAdvapi) |
137 | { | 137 | { |
138 | GNOpenSCManager = | 138 | GNOpenSCManager = |
139 | (TOpenSCManager) GetProcAddress (hAdvapi, "OpenSCManagerA"); | 139 | (TOpenSCManager) GetProcAddress (hAdvapi, "OpenSCManagerA"); |
140 | GNCreateService = | 140 | GNCreateService = |
141 | (TCreateService) GetProcAddress (hAdvapi, "CreateServiceA"); | 141 | (TCreateService) GetProcAddress (hAdvapi, "CreateServiceA"); |
142 | GNCloseServiceHandle = | 142 | GNCloseServiceHandle = |
143 | (TCloseServiceHandle) GetProcAddress (hAdvapi, "CloseServiceHandle"); | 143 | (TCloseServiceHandle) GetProcAddress (hAdvapi, "CloseServiceHandle"); |
144 | GNDeleteService = | 144 | GNDeleteService = |
145 | (TDeleteService) GetProcAddress (hAdvapi, "DeleteService"); | 145 | (TDeleteService) GetProcAddress (hAdvapi, "DeleteService"); |
146 | GNRegisterServiceCtrlHandler = | 146 | GNRegisterServiceCtrlHandler = |
147 | (TRegisterServiceCtrlHandler) GetProcAddress (hAdvapi, | 147 | (TRegisterServiceCtrlHandler) GetProcAddress (hAdvapi, |
148 | "RegisterServiceCtrlHandlerA"); | 148 | "RegisterServiceCtrlHandlerA"); |
149 | GNSetServiceStatus = | 149 | GNSetServiceStatus = |
150 | (TSetServiceStatus) GetProcAddress (hAdvapi, "SetServiceStatus"); | 150 | (TSetServiceStatus) GetProcAddress (hAdvapi, "SetServiceStatus"); |
151 | GNStartServiceCtrlDispatcher = | 151 | GNStartServiceCtrlDispatcher = |
152 | (TStartServiceCtrlDispatcher) GetProcAddress (hAdvapi, | 152 | (TStartServiceCtrlDispatcher) GetProcAddress (hAdvapi, |
153 | "StartServiceCtrlDispatcherA"); | 153 | "StartServiceCtrlDispatcherA"); |
154 | GNControlService = | 154 | GNControlService = |
155 | (TControlService) GetProcAddress (hAdvapi, "ControlService"); | 155 | (TControlService) GetProcAddress (hAdvapi, "ControlService"); |
156 | GNOpenService = (TOpenService) GetProcAddress (hAdvapi, "OpenServiceA"); | 156 | GNOpenService = (TOpenService) GetProcAddress (hAdvapi, "OpenServiceA"); |
157 | 157 | ||
158 | GNLsaOpenPolicy = | 158 | GNLsaOpenPolicy = |
159 | (TLsaOpenPolicy) GetProcAddress (hAdvapi, "LsaOpenPolicy"); | 159 | (TLsaOpenPolicy) GetProcAddress (hAdvapi, "LsaOpenPolicy"); |
160 | GNLsaAddAccountRights = | 160 | GNLsaAddAccountRights = |
161 | (TLsaAddAccountRights) GetProcAddress (hAdvapi, "LsaAddAccountRights"); | 161 | (TLsaAddAccountRights) GetProcAddress (hAdvapi, |
162 | GNLsaRemoveAccountRights = | 162 | "LsaAddAccountRights"); |
163 | (TLsaRemoveAccountRights) GetProcAddress (hAdvapi, | 163 | GNLsaRemoveAccountRights = |
164 | "LsaRemoveAccountRights"); | 164 | (TLsaRemoveAccountRights) GetProcAddress (hAdvapi, |
165 | GNLsaClose = (TLsaClose) GetProcAddress (hAdvapi, "LsaClose"); | 165 | "LsaRemoveAccountRights"); |
166 | GNLookupAccountName = | 166 | GNLsaClose = (TLsaClose) GetProcAddress (hAdvapi, "LsaClose"); |
167 | (TLookupAccountName) GetProcAddress (hAdvapi, "LookupAccountNameA"); | 167 | GNLookupAccountName = |
168 | (TLookupAccountName) GetProcAddress (hAdvapi, "LookupAccountNameA"); | ||
168 | 169 | ||
169 | GNGetFileSecurity = | 170 | GNGetFileSecurity = |
170 | (TGetFileSecurity) GetProcAddress (hAdvapi, "GetFileSecurityA"); | 171 | (TGetFileSecurity) GetProcAddress (hAdvapi, "GetFileSecurityA"); |
171 | GNInitializeSecurityDescriptor = | 172 | GNInitializeSecurityDescriptor = |
172 | (TInitializeSecurityDescriptor) GetProcAddress (hAdvapi, | 173 | (TInitializeSecurityDescriptor) GetProcAddress (hAdvapi, |
173 | "InitializeSecurityDescriptor"); | 174 | "InitializeSecurityDescriptor"); |
174 | GNGetSecurityDescriptorDacl = | 175 | GNGetSecurityDescriptorDacl = |
175 | (TGetSecurityDescriptorDacl) GetProcAddress (hAdvapi, | 176 | (TGetSecurityDescriptorDacl) GetProcAddress (hAdvapi, |
176 | "GetSecurityDescriptorDacl"); | 177 | "GetSecurityDescriptorDacl"); |
177 | GNGetAclInformation = | 178 | GNGetAclInformation = |
178 | (TGetAclInformation) GetProcAddress (hAdvapi, "GetAclInformation"); | 179 | (TGetAclInformation) GetProcAddress (hAdvapi, "GetAclInformation"); |
179 | GNInitializeAcl = | 180 | GNInitializeAcl = |
180 | (TInitializeAcl) GetProcAddress (hAdvapi, "InitializeAcl"); | 181 | (TInitializeAcl) GetProcAddress (hAdvapi, "InitializeAcl"); |
181 | GNGetAce = (TGetAce) GetProcAddress (hAdvapi, "GetAce"); | 182 | GNGetAce = (TGetAce) GetProcAddress (hAdvapi, "GetAce"); |
182 | GNEqualSid = (TEqualSid) GetProcAddress (hAdvapi, "EqualSid"); | 183 | GNEqualSid = (TEqualSid) GetProcAddress (hAdvapi, "EqualSid"); |
183 | GNAddAce = (TAddAce) GetProcAddress (hAdvapi, "AddAce"); | 184 | GNAddAce = (TAddAce) GetProcAddress (hAdvapi, "AddAce"); |
184 | GNAddAccessAllowedAce = | 185 | GNAddAccessAllowedAce = |
185 | (TAddAccessAllowedAce) GetProcAddress (hAdvapi, "AddAccessAllowedAce"); | 186 | (TAddAccessAllowedAce) GetProcAddress (hAdvapi, |
186 | GNSetNamedSecurityInfo = | 187 | "AddAccessAllowedAce"); |
187 | (TSetNamedSecurityInfo) GetProcAddress (hAdvapi, | 188 | GNSetNamedSecurityInfo = |
188 | "SetNamedSecurityInfoA"); | 189 | (TSetNamedSecurityInfo) GetProcAddress (hAdvapi, |
189 | } | 190 | "SetNamedSecurityInfoA"); |
191 | } | ||
190 | else | 192 | else |
191 | { | 193 | { |
192 | GNOpenSCManager = NULL; | 194 | GNOpenSCManager = NULL; |
193 | GNCreateService = NULL; | 195 | GNCreateService = NULL; |
194 | GNCloseServiceHandle = NULL; | 196 | GNCloseServiceHandle = NULL; |
195 | GNDeleteService = NULL; | 197 | GNDeleteService = NULL; |
196 | GNRegisterServiceCtrlHandler = NULL; | 198 | GNRegisterServiceCtrlHandler = NULL; |
197 | GNSetServiceStatus = NULL; | 199 | GNSetServiceStatus = NULL; |
198 | GNStartServiceCtrlDispatcher = NULL; | 200 | GNStartServiceCtrlDispatcher = NULL; |
199 | GNControlService = NULL; | 201 | GNControlService = NULL; |
200 | GNOpenService = NULL; | 202 | GNOpenService = NULL; |
201 | 203 | ||
202 | GNLsaOpenPolicy = NULL; | 204 | GNLsaOpenPolicy = NULL; |
203 | GNLsaAddAccountRights = NULL; | 205 | GNLsaAddAccountRights = NULL; |
204 | GNLsaRemoveAccountRights = NULL; | 206 | GNLsaRemoveAccountRights = NULL; |
205 | GNLsaClose = NULL; | 207 | GNLsaClose = NULL; |
206 | GNLookupAccountName = NULL; | 208 | GNLookupAccountName = NULL; |
207 | 209 | ||
208 | GNGetFileSecurity = NULL; | 210 | GNGetFileSecurity = NULL; |
209 | GNInitializeSecurityDescriptor = NULL; | 211 | GNInitializeSecurityDescriptor = NULL; |
210 | GNGetSecurityDescriptorDacl = NULL; | 212 | GNGetSecurityDescriptorDacl = NULL; |
211 | GNGetAclInformation = NULL; | 213 | GNGetAclInformation = NULL; |
212 | GNInitializeAcl = NULL; | 214 | GNInitializeAcl = NULL; |
213 | GNGetAce = NULL; | 215 | GNGetAce = NULL; |
214 | GNEqualSid = NULL; | 216 | GNEqualSid = NULL; |
215 | GNAddAce = NULL; | 217 | GNAddAce = NULL; |
216 | GNAddAccessAllowedAce = NULL; | 218 | GNAddAccessAllowedAce = NULL; |
217 | GNSetNamedSecurityInfo = NULL; | 219 | GNSetNamedSecurityInfo = NULL; |
218 | } | 220 | } |
219 | 221 | ||
220 | /* Account function */ | 222 | /* Account function */ |
221 | hNetapi = LoadLibrary ("netapi32.dll"); | 223 | hNetapi = LoadLibrary ("netapi32.dll"); |
222 | if (hNetapi) | 224 | if (hNetapi) |
223 | { | 225 | { |
224 | GNNetUserAdd = (TNetUserAdd) GetProcAddress (hNetapi, "NetUserAdd"); | 226 | GNNetUserAdd = (TNetUserAdd) GetProcAddress (hNetapi, "NetUserAdd"); |
225 | GNNetUserSetInfo = | 227 | GNNetUserSetInfo = |
226 | (TNetUserSetInfo) GetProcAddress (hNetapi, "NetUserSetInfo"); | 228 | (TNetUserSetInfo) GetProcAddress (hNetapi, "NetUserSetInfo"); |
227 | } | 229 | } |
228 | else | 230 | else |
229 | { | 231 | { |
230 | GNNetUserAdd = NULL; | 232 | GNNetUserAdd = NULL; |
231 | GNNetUserSetInfo = NULL; | 233 | GNNetUserSetInfo = NULL; |
232 | } | 234 | } |
233 | 235 | ||
234 | return ret; | 236 | return ret; |
235 | } | 237 | } |