Merge pull request #70 from MicrosoftEdge/smoketesting

Update projects to use latest WebView2 SDK 1.0.721-prerelease

Author: oggy22

SampleApps/WebView2APISample/AppStartPage.cpp

@@ -4,8 +4,11 @@
 
 #include "stdafx.h"
 
-#include <algorithm>
+#ifdef USE_WEBVIEW2_WIN10
 #include <pathcch.h>
+#else
+#include <Shlwapi.h>
+#endif
 #include <Psapi.h>
 
 #include "AppStartPage.h"
@@ -31,8 +34,16 @@ bool AreFileUrisEqual(std::wstring leftUri, std::wstring rightUri)
 std::wstring ResolvePathAndTrimFile(std::wstring path)
 {
     wchar_t resultPath[MAX_PATH];
+#ifdef USE_WEBVIEW2_WIN10
     PathCchCanonicalize(resultPath, ARRAYSIZE(resultPath), path.c_str());
     PathCchRemoveFileSpec(resultPath, ARRAYSIZE(resultPath));
+#else
+    // Surpress compiler warning for PathCanonicalize. It is only used on Win7
+    // where PathCchCanonicalize doesn't exist.
+    #pragma warning(suppress : 4995)
+    PathCanonicalize(resultPath, path.c_str());
+    PathRemoveFileSpec(resultPath);
+#endif
     return resultPath;
 }
 

SampleApps/WebView2APISample/AppWindow.cpp

@@ -1245,12 +1245,14 @@ double AppWindow::GetDpiScale()
     return DpiUtil::GetDpiForWindow(m_mainWindow) * 1.0f / USER_DEFAULT_SCREEN_DPI;
 }
 
-#ifdef USE_WEBVIEW2_WIN10
 double AppWindow::GetTextScale()
 {
+#ifdef USE_WEBVIEW2_WIN10
     return m_uiSettings ? m_uiSettings.TextScaleFactor() : 1.0f;
-}
+#else
+    return 1.0f;
 #endif
+}
 
 void AppWindow::AddRef()
 {

SampleApps/WebView2APISample/AppWindow.h

@@ -58,9 +58,7 @@ class AppWindow
     std::wstring GetLocalUri(std::wstring path);
     std::function<void()> GetAcceleratorKeyFunction(UINT key);
     double GetDpiScale();
-#ifdef USE_WEBVIEW2_WIN10
     double GetTextScale();
-#endif
 
     void ReinitializeWebView();
 

SampleApps/WebView2APISample/Toolbar.cpp

@@ -137,14 +137,9 @@ void Toolbar::UpdateFont()
     LOGFONT logFont;
     GetObject(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), &logFont);
     double dpiScale = m_appWindow->GetDpiScale();
-#ifdef USE_WEBVIEW2_WIN10
     double textScale = m_appWindow->GetTextScale();
     logFont.lfHeight *= dpiScale * textScale;
     logFont.lfWidth *= dpiScale * textScale;
-#else
-    logFont.lfHeight *= dpiScale;
-    logFont.lfWidth *= dpiScale;
-#endif
     StringCchCopy(logFont.lfFaceName, ARRAYSIZE(logFont.lfFaceName), s_fontName);
     m_font = CreateFontIndirect(&logFont);
 }