Fixes for re-enabling more MSVC level 4 warnings: sandbox/ edition

sandbox/win/tests/validation_tests/commands.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <Aclapi.h>
 #include <windows.h>
 #include <string>
 
 #include "sandbox/win/tests/validation_tests/commands.h"
 
@@ skipping 258 matching lines @@
       ::CloseHandle(test_handle);
       if (result != ERROR_ACCESS_DENIED) {
         return SBOX_TEST_SUCCEEDED;
       }
     } else if (::GetLastError() != ERROR_ACCESS_DENIED) {
       return SBOX_TEST_FAILED;
     }
   }
 
   // Open by name with WRITE_DAC.
-  if ((desktop = ::OpenDesktop(desktop_name, 0, FALSE, WRITE_DAC)) ||
-      ::GetLastError() != ERROR_ACCESS_DENIED) {
+  desktop = ::OpenDesktop(desktop_name, 0, FALSE, WRITE_DAC);
+  if (desktop || ::GetLastError() != ERROR_ACCESS_DENIED) {
     ::CloseDesktop(desktop);
     return SBOX_TEST_SUCCEEDED;
   }
 
   return SBOX_TEST_DENIED;
 }
 
 BOOL CALLBACK DesktopTestEnumProc(LPTSTR desktop_name, LPARAM result) {
   return TRUE;
 }
@@ skipping 33 matching lines @@
   }
 
   if (!::VirtualFree(memory, 0, MEM_RELEASE))
     return SBOX_TEST_FAILED;
 
   return SBOX_TEST_SUCCEEDED;
 }
 
 
 }  // namespace sandbox