advapi32: Avoid defining SECURITY_INFORMATION multiple times. (try2)
Francois Gouget
fgouget at free.fr
Sat Feb 28 13:00:33 CST 2015
---
As suggested by Nikolay Sivov.
Note that the previous patch was wrong anyway since including svcctl.h
first caused PSECURITY_INFORMATION to not be defined (fortunately it did
not have any bad consequences).
include/wine/svcctl.idl | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl
index e8463b5..4af6b9a 100644
--- a/include/wine/svcctl.idl
+++ b/include/wine/svcctl.idl
@@ -65,12 +65,13 @@ interface svcctl
typedef [context_handle] void *SC_RPC_LOCK;
typedef [context_handle] void *SC_NOTIFY_RPC_HANDLE;
- typedef DWORD SECURITY_INFORMATION;
-
/* undocumented access rights */
cpp_quote("#define SERVICE_SET_STATUS 0x8000")
-cpp_quote("#if 0 /* already defined in winsvc.h */")
+cpp_quote("#if 0 /* already defined in winsvc.h / winnt.h */")
+
+typedef DWORD SECURITY_INFORMATION;
+
typedef struct _QUERY_SERVICE_CONFIGA {
DWORD dwServiceType;
DWORD dwStartType;
--
2.1.4
More information about the wine-patches
mailing list