CP Adjust apiset fallback for user32 dependencies in WebView2 (#7977)

brianostms · bkudiess · commit 3b41a5e9a832 · 2022-12-15T11:43:04.000-08:00
commit 80a4bf4
diff --git a/dev/WebView2/WebView2.cpp b/dev/WebView2/WebView2.cpp
@@ -29,7 +29,13 @@ static constexpr wstring_view s_error_cwv2_not_present_closed{ L"Failed because
 
 WebView2::WebView2()
 {
-    if (auto user32module = GetModuleHandleW(L"user32.dll"))
+    auto user32module = GetModuleHandleW(L"ext-ms-win-rtcore-webview-l1-1-0.dll");
+    if (!user32module)
+    {
+        user32module = GetModuleHandleW(L"user32.dll");
+    }
+
+    if (user32module)
     {
         m_fnClientToScreen = reinterpret_cast<decltype(m_fnClientToScreen)>(GetProcAddress(user32module, "ClientToScreen"));
         m_fnSendMessageW = reinterpret_cast<decltype(m_fnSendMessageW)>(GetProcAddress(user32module, "SendMessageW"));

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,13 @@ static constexpr wstring_view s_error_cwv2_not_present_closed{ L"Failed because`
`29`	`29`
`30`	`30`	`WebView2::WebView2()`
`31`	`31`	`{`
`32`		`- if (auto user32module = GetModuleHandleW(L"user32.dll"))`
	`32`	`+ auto user32module = GetModuleHandleW(L"ext-ms-win-rtcore-webview-l1-1-0.dll");`
	`33`	`+ if (!user32module)`
	`34`	`+ {`
	`35`	`+ user32module = GetModuleHandleW(L"user32.dll");`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ if (user32module)`
`33`	`39`	`{`
`34`	`40`	`m_fnClientToScreen = reinterpret_cast<decltype(m_fnClientToScreen)>(GetProcAddress(user32module, "ClientToScreen"));`
`35`	`41`	`m_fnSendMessageW = reinterpret_cast<decltype(m_fnSendMessageW)>(GetProcAddress(user32module, "SendMessageW"));`