kernel: add brackets around (a)?b:c construct

Vitaliy Margolen wine-patch at kievinfo.com
Thu Sep 29 11:16:02 CDT 2005


I'm sorry I have overlooked this one adding OBJ_CASE_INSENSITIVE flag.

Vitaliy Margolen

changelog:
  kernel:
  - Add brackets around (a)?b:c construct
-------------- next part --------------
Index: dlls/kernel/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/sync.c,v
retrieving revision 1.88
diff -u -p -r1.88 sync.c
--- dlls/kernel/sync.c	26 Sep 2005 13:51:59 -0000	1.88
+++ dlls/kernel/sync.c	29 Sep 2005 16:11:48 -0000
@@ -446,7 +446,7 @@ HANDLE WINAPI CreateEventW( SECURITY_ATT
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
+                                    ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = sa ? sa->lpSecurityDescriptor : NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -504,7 +504,7 @@ HANDLE WINAPI OpenEventW( DWORD access, 
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (inherit) ? OBJ_INHERIT : 0;
+                                    ((inherit) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -642,7 +642,7 @@ HANDLE WINAPI CreateMutexW( SECURITY_ATT
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
+                                    ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = sa ? sa->lpSecurityDescriptor : NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -691,7 +691,7 @@ HANDLE WINAPI OpenMutexW( DWORD access, 
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE | 
-                                    (inherit) ? OBJ_INHERIT : 0;
+                                    ((inherit) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -765,7 +765,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE | 
-                                    (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
+                                    ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = sa ? sa->lpSecurityDescriptor : NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -814,7 +814,7 @@ HANDLE WINAPI OpenSemaphoreW( DWORD acce
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (inherit) ? OBJ_INHERIT : 0;
+                                    ((inherit) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -881,7 +881,7 @@ HANDLE WINAPI CreateWaitableTimerW( SECU
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
+                                    ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = sa ? sa->lpSecurityDescriptor : NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -931,7 +931,7 @@ HANDLE WINAPI OpenWaitableTimerW( DWORD 
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (inherit) ? OBJ_INHERIT : 0;
+                                    ((inherit) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = NULL;
     attr.SecurityQualityOfService = NULL;
     if (name)
@@ -1113,7 +1113,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR 
     attr.RootDirectory            = 0;
     attr.ObjectName               = &nt_name;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
+                                    ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = sa ? sa->lpSecurityDescriptor : NULL;
     attr.SecurityQualityOfService = NULL;
 
Index: dlls/kernel/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/virtual.c,v
retrieving revision 1.9
diff -u -p -r1.9 virtual.c
--- dlls/kernel/virtual.c	21 Sep 2005 11:42:30 -0000	1.9
+++ dlls/kernel/virtual.c	29 Sep 2005 16:11:48 -0000
@@ -305,7 +305,7 @@ HANDLE WINAPI CreateFileMappingW( HANDLE
     attr.RootDirectory            = 0;
     attr.ObjectName               = NULL;
     attr.Attributes               = OBJ_CASE_INSENSITIVE |
-                                    (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0;
+                                    ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor       = sa ? sa->lpSecurityDescriptor : NULL;
     attr.SecurityQualityOfService = NULL;
 
@@ -400,7 +400,7 @@ HANDLE WINAPI OpenFileMappingW( DWORD ac
     attr.Length = sizeof(attr);
     attr.RootDirectory = 0;
     attr.ObjectName = &nameW;
-    attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit) ? OBJ_INHERIT : 0;
+    attr.Attributes = OBJ_CASE_INSENSITIVE | ((inherit) ? OBJ_INHERIT : 0);
     attr.SecurityDescriptor = NULL;
     attr.SecurityQualityOfService = NULL;
     RtlInitUnicodeString( &nameW, name );


More information about the wine-patches mailing list