Upgrade to 3.3626.1895. Improve search for runtime

ThomasMatern · ThomasMatern · commit 87f20dfc17ce · 2020-04-11T20:37:15.000+12:00
diff --git a/patches/prebuilt_1895.patch b/patches/prebuilt_1895.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/cefclient/browser/browser_window_std_win.cc b/tests/cefclient/browser/browser_window_std_win.cc
+index fa7ee02..90f17aa 100644
+--- a/tests/cefclient/browser/browser_window_std_win.cc
++++ b/tests/cefclient/browser/browser_window_std_win.cc
+@@ -65,7 +65,7 @@ void BrowserWindowStdWin::ShowPopup(ClientWindowHandle parent_handle,
+                  static_cast<int>(height), SWP_NOZORDER | SWP_NOACTIVATE);
+ 
+     const bool no_activate =
+-        GetWindowLongPtr(parent_handle, GWL_EXSTYLE) & WS_EX_NOACTIVATE;
++        (GetWindowLongPtr(parent_handle, GWL_EXSTYLE) & WS_EX_NOACTIVATE) != 0;
+     ShowWindow(hwnd, no_activate ? SW_SHOWNOACTIVATE : SW_SHOW);
+   }
+ }
diff --git a/src/version/cef_version_win.h b/src/version/cef_version_win.h
@@ -35,16 +35,16 @@
 #ifndef CEF_INCLUDE_CEF_VERSION_H_
 #define CEF_INCLUDE_CEF_VERSION_H_
 
-#define CEF_VERSION "3.3578.1870.gc974488"
+#define CEF_VERSION "3.3626.1895.g7001d56"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1870
-#define CEF_COMMIT_HASH "c974488bae67171e814b9666de3000867ff7bd76"
+#define CEF_COMMIT_NUMBER 1895
+#define CEF_COMMIT_HASH "7001d56090315a4207abac1dd9358219fd76b155"
 #define COPYRIGHT_YEAR 2019
 
-#define CHROME_VERSION_MAJOR 71
+#define CHROME_VERSION_MAJOR 72
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 3578
-#define CHROME_VERSION_PATCH 98
+#define CHROME_VERSION_BUILD 3626
+#define CHROME_VERSION_PATCH 121
 
 #define DO_MAKE_STRING(p) #p
 #define MAKE_STRING(p) DO_MAKE_STRING(p)
diff --git a/tools/make_installer.py b/tools/make_installer.py
@@ -387,20 +387,15 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir):
     # Python 2.7
     if os.path.exists(os.path.join(pkg_dir, "cefpython_py27.pyd")):
         if ARCH32:
-            search_paths = [
-                # This runtime version is shipped with Python 2.7.14
-                r"c:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b"
-                r"_9.0.30729.1_none_e163563597edeada\msvcp90.dll",
-            ]
+            # This runtime version is shipped with Python 2.7.14
+            search_paths = glob.glob(r'c:\Windows\winsxs\x86_microsoft.vc90.*\msvcp90.dll')
         else:
-            search_paths = [
-                # This runtime version is shipped with Python 2.7.14
-                r"c:\Windows\winsxs\amd64_microsoft.vc90.crt_1fc8b3b9a1e18e3b"
-                r"_9.0.30729.1_none_99b61f5e8371c1d4\msvcp90.dll",
-            ]
+            # This runtime version is shipped with Python 2.7.14
+            search_paths = glob.glob(r'c:\Windows\winsxs\amd64_microsoft.vc90.*\msvcp90.dll')
         root_search_paths.append(search_paths)
 
-    assert len(root_search_paths)
+    if not root_search_paths:
+        raise Exception("C++ extension dll dependency not found.")
 
     for search_paths in root_search_paths:
         found = False
