Fix problems in r293393.

chrome/installer/gcapi/gcapi_test.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 <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 void call_statically() {
   DWORD reason = 0;
   BOOL result_flag_on = FALSE;
   BOOL result_flag_off = FALSE;
 
   // running this twice verifies that the first call does not set
   // a flag that would make the second fail.  Thus, the results
   // of the two calls should be the same (no state should have changed)
   result_flag_off = GoogleChromeCompatibilityCheck(
       FALSE, GCAPI_INVOKED_STANDARD_SHELL, &reason);
   result_flag_on = GoogleChromeCompatibilityCheck(
       TRUE, GCAPI_INVOKED_STANDARD_SHELL, &reason);
 
   if (result_flag_off != result_flag_on)
       printf("Registry key flag is not being set properly.");
 
-  printf("Static call returned result as %ld and reason as %ld.\n",
+  printf("Static call returned result as %d and reason as %ld.\n",

[scottmg, 2014/09/05 17:09:40]

bah, I even looked up what BOOL was, saw that it was "int" and concluded that ld
was fine. Sigh.

          result_flag_on, reason);
 }
 
 void call_dynamically() {
   HMODULE module = LoadLibrary(L"gcapi_dll.dll");
   if (module == NULL) {
     printf("Couldn't load gcapi_dll.dll.\n");
     return;
   }
 
   GCCC_CompatibilityCheck gccfn = (GCCC_CompatibilityCheck) GetProcAddress(
       module, "GoogleChromeCompatibilityCheck");
   if (gccfn != NULL) {
     DWORD reason = 0;
 
     // running this twice verifies that the first call does not set
     // a flag that would make the second fail.  Thus, the results
     // of the two calls should be the same (no state should have changed)
     BOOL result_flag_off = gccfn(FALSE, GCAPI_INVOKED_STANDARD_SHELL, &reason);
     BOOL result_flag_on = gccfn(TRUE, GCAPI_INVOKED_STANDARD_SHELL, &reason);
 
     if (result_flag_off != result_flag_on)
       printf("Registry key flag is not being set properly.");
 
-    printf("Dynamic call returned result as %d and reason as %d.\n",
+    printf("Dynamic call returned result as %d and reason as %ld.\n",
            result_flag_on, reason);
   } else {
     printf("Couldn't find GoogleChromeCompatibilityCheck() in gcapi_dll.\n");
   }
   FreeLibrary(module);
 }
 
 const char kManualLaunchTests[] = "launch-chrome";
 
 int main(int argc, char* argv[]) {
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
 
   testing::InitGoogleTest(&argc, argv);
   RUN_ALL_TESTS();
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(kManualLaunchTests)) {
     call_dynamically();
     call_statically();
     printf("LaunchChrome returned %d.\n", LaunchGoogleChrome());
   }
 }