Win32 builds and runs against 1.0.705.50-prerelease

WPF and WinForms build and run against 1.0.705.50 (release version)

Author: Ognjen Sobajic

SampleApps/WebView2APISample/AppStartPage.cpp

@@ -4,11 +4,8 @@
 
 #include "stdafx.h"
 
-#ifdef USE_WEBVIEW2_WIN10
+#include <algorithm>
 #include <pathcch.h>
-#else
-#include <Shlwapi.h>
-#endif
 #include <Psapi.h>
 
 #include "AppStartPage.h"
@@ -34,16 +31,8 @@ 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,14 +1245,12 @@ 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
 }
+#endif
 
 void AppWindow::AddRef()
 {

SampleApps/WebView2APISample/AppWindow.h

@@ -58,7 +58,9 @@ 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,9 +137,14 @@ 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);
 }

SampleApps/WebView2APISample/ViewComponent.cpp

@@ -221,10 +221,10 @@ bool ViewComponent::HandleWindowMessage(
             SetRasterizationScale(1.5f);
             return true;
         case IDM_BOUNDS_MODE_RAW_PIXELS:
-            SetBoundsMode(COREWEBVIEW2_BOUNDS_MODE_USE_RAW_PIXELS);
+            SetBoundsMode(COREWEBVIEW2_USE_RAW_PIXELS);
             return true;
         case IDM_BOUNDS_MODE_VIEW_PIXELS:
-            SetBoundsMode(COREWEBVIEW2_BOUNDS_MODE_USE_RASTERIZATION_SCALE);
+            SetBoundsMode(COREWEBVIEW2_USE_RASTERIZATION_SCALE);
             return true;
         case IDM_SCALE_50:
             SetScale(0.5f);
@@ -496,8 +496,7 @@ void ViewComponent::SetRasterizationScale(float additionalScale)
         additionalScale * m_appWindow->GetDpiScale() * m_appWindow->GetTextScale();
 #else
         additionalScale;
-#endif
-    CHECK_FAILURE(m_controllerExperimental->put_RasterizationScale(rasterizationScale));
+#endif    CHECK_FAILURE(m_controllerExperimental->put_RasterizationScale(rasterizationScale));
 }
 //! [RasterizationScale]
 

SampleApps/WebView2APISample/ViewComponent.h

@@ -84,7 +84,7 @@ class ViewComponent : public ComponentBase
     bool m_useCursorId = false;
     wil::com_ptr<DropTarget> m_dropTarget;
     float m_webviewAdditionalRasterizationScale = 1.0f;
-    COREWEBVIEW2_BOUNDS_MODE m_boundsMode = COREWEBVIEW2_BOUNDS_MODE_USE_RAW_PIXELS;
+    COREWEBVIEW2_BOUNDS_MODE m_boundsMode = COREWEBVIEW2_USE_RAW_PIXELS;
 
     EventRegistrationToken m_zoomFactorChangedToken = {};
     EventRegistrationToken m_rasterizationScaleChangedToken = {};