Update Windows to sync with Mac changes.

Author: jdarpinian

latency-benchmark.gyp

@@ -51,7 +51,7 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'src/getopt.c',
+            'src/win/getopt.c',
             'src/win/main.cpp',
             'src/win/screenscraper.cpp',
             'src/win/stdafx.h',

src/clioptions.c

@@ -24,7 +24,7 @@ void parse_commandline(int argc, const char **argv, clioptions *options) {
   int c;
 
   //TODO: use getopt_long for better looking cli args
-  while ((c = getopt(argc, (char **)argv, "ab:d:r:e:p:")) != -1) {
+  while ((c = getopt(argc, (char **)argv, "ab:d:r:e:p:h:")) != -1) {
     switch(c) {
     case 'a':
       options->automated = true;
@@ -41,6 +41,9 @@ void parse_commandline(int argc, const char **argv, clioptions *options) {
     case 'p':
       options->magic_pattern = optarg;
       break;
+    case 'h':
+      options->parent_handle = optarg;
+      break;
     case ':':
       fprintf(stderr, "Option -%c requires an operand\n", optopt);
       print_usage_and_exit();
@@ -55,7 +58,7 @@ void parse_commandline(int argc, const char **argv, clioptions *options) {
   if (options->magic_pattern) {
     if (options->automated || options->browser || options->results_url ||
         options->browser_args) {
-      fprintf(stderr, "-p is incompatible with all other options.\n");
+      fprintf(stderr, "-p is incompatible with all other options except -h.\n");
       print_usage_and_exit();
     }
   }

src/clioptions.h

@@ -11,6 +11,8 @@ typedef struct {
   char *magic_pattern; // When launching a native reference test window, this
                        // contains the magic pattern to draw, encoded in
                        // hexadecimal.
+  char *parent_handle; // On Windows, this option is passed to child processes
+                       // holding the HANDLE value of their parent.
 } clioptions;
 
 void parse_commandline(int argc, const char **argv, clioptions *options);

src/win/main.cpp

@@ -178,61 +178,34 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
   // Prevent automatic DPI scaling.
   SetProcessDPIAware();
 
-  clioptions *opts = parse_commandline(__argc, (const char **)__argv);
-  if (opts == NULL) {
-    return 1;
-  }
-
-  int cliopts = 1;
-  if (opts->automated)
-	  cliopts++;
-
-  if (opts->browser == NULL) {
-    opts->browser = "";
-  } else {
-	  cliopts += 2;
-  }
-
-  if (opts->results == NULL) {
-    opts->results = "";
-  } else {
-	  cliopts += 2;
-  }
-
-  if (opts->browser_args == NULL) {
-    opts->browser_args = "";
-  } else {
-	  cliopts += 2;
-  }
-
-  if (__argc == cliopts) {
-    debug_log("running server");
-    HDC desktop = GetDC(NULL);
-    assert(desktop);
-    if (GetDeviceCaps(desktop, LOGPIXELSX) != 96) {
-      MessageBox(NULL, "Unfortunately, due to browser bugs you must set the Windows DPI scaling factor to \"100%\" or \"Smaller\" (96 DPI) for this test to work. Please change it and reboot.",
-                 "Unsupported DPI", MB_ICONERROR | MB_OK);
-      WinExec("DpiScaling.exe", SW_NORMAL);
+  clioptions opts;
+  parse_commandline(__argc, (const char **)__argv, &opts);
+
+  if (opts.magic_pattern) {
+    assert(opts.parent_handle);
+    debug_log("opening native reference window");
+    // The -p argument is the magic pattern to draw on the window, encoded as hex.
+    memset(pattern, 0, sizeof(pattern));
+    if (!parse_hex_magic_pattern(opts.magic_pattern, pattern)) {
+      debug_log("Failed to parse pattern");
       return 1;
     }
-    ReleaseDC(NULL, desktop);
-    run_server(opts);
-  }
-  free(opts);
-
-  debug_log("opening native reference window");
-  if (__argc != (cliopts+2)) {
-    debug_log("Unrecognized number of arguments: %d", __argc);
-    return 1;
-  }
-  // The first argument is the magic pattern to draw on the window, encoded as hex.
-  memset(pattern, 0, sizeof(pattern));
-  if (!parse_hex_magic_pattern(__argv[cliopts], pattern)) {
-    debug_log("Failed to parse pattern");
+    // The -h argument is the HANDLE of the parent process, encoded as hex.
+    HANDLE parent_process = (HANDLE)_strtoui64(opts.parent_handle, NULL, 16);
+    message_loop(parent_process);
+    return 0;
+  }
+
+  debug_log("running server");
+  HDC desktop = GetDC(NULL);
+  assert(desktop);
+  if (GetDeviceCaps(desktop, LOGPIXELSX) != 96) {
+    MessageBox(NULL, "Unfortunately, due to browser bugs you must set the Windows DPI scaling factor to \"100%\" or \"Smaller\" (96 DPI) for this test to work. Please change it and reboot.",
+                "Unsupported DPI", MB_ICONERROR | MB_OK);
+    WinExec("DpiScaling.exe", SW_NORMAL);
     return 1;
   }
-  // The second argument is the handle of the parent process.
-  HANDLE parent_process = (HANDLE)_strtoui64(__argv[cliopts+1], NULL, 16);
-  message_loop(parent_process);
+  ReleaseDC(NULL, desktop);
+  run_server(&opts);
   return 0;
 }

src/win/screenscraper.cpp

@@ -419,7 +419,7 @@ bool open_native_reference_window(uint8_t *test_pattern_for_window) {
   // reference window process. If that's too painful, you can configure
   // Visual Studio to pass arguments on startup to debug the native reference
   // window code in isolation. Here are some sample arguments that will work:
-  // 2923BEE16CD6529049F1BBE9 0
+  // -p 2923BEE16CD6529049F1BBE9 -h 0
 
   if (window_process_handle != NULL) {
     debug_log("native window already open");
@@ -439,7 +439,7 @@ bool open_native_reference_window(uint8_t *test_pattern_for_window) {
     debug_log("DuplicateHandle failed");
     return false;
   }
-  sprintf_s(command_line, sizeof(command_line), "%s %s %X", GetCommandLine(),
+  sprintf_s(command_line, sizeof(command_line), "%s -p %s -h %X", GetCommandLine(),
             hex_pattern, current_process_handle);
   if (!CreateProcess(NULL, command_line, NULL, NULL, TRUE, 0, NULL, NULL,
                      &startup_info, &process_info)) {