Free library even if proc lookup fails (#108312)

verath · web-flow · commit 41f13d2087a8 · 2022-08-11T20:45:03.000Z
diff --git a/dev/integration_tests/flutter_gallery/windows/runner/win32_window.cpp b/dev/integration_tests/flutter_gallery/windows/runner/win32_window.cpp
@@ -35,8 +35,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace
diff --git a/dev/manual_tests/windows/runner/win32_window.cpp b/dev/manual_tests/windows/runner/win32_window.cpp
@@ -35,8 +35,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace
diff --git a/examples/api/windows/runner/win32_window.cpp b/examples/api/windows/runner/win32_window.cpp
@@ -35,8 +35,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace
diff --git a/examples/platform_channel/windows/runner/win32_window.cpp b/examples/platform_channel/windows/runner/win32_window.cpp
@@ -35,8 +35,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace
diff --git a/packages/flutter_tools/templates/app_shared/windows.tmpl/runner/win32_window.cpp b/packages/flutter_tools/templates/app_shared/windows.tmpl/runner/win32_window.cpp
@@ -31,8 +31,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {`
`35`	`35`	`GetProcAddress(user32_module, "EnableNonClientDpiScaling"));`
`36`	`36`	`if (enable_non_client_dpi_scaling != nullptr) {`
`37`	`37`	`enable_non_client_dpi_scaling(hwnd);`
`38`		`- FreeLibrary(user32_module);`
`39`	`38`	`}`
	`39`	`+ FreeLibrary(user32_module);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`} // namespace`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {`
`31`	`31`	`GetProcAddress(user32_module, "EnableNonClientDpiScaling"));`
`32`	`32`	`if (enable_non_client_dpi_scaling != nullptr) {`
`33`	`33`	`enable_non_client_dpi_scaling(hwnd);`
`34`		`- FreeLibrary(user32_module);`
`35`	`34`	`}`
	`35`	`+ FreeLibrary(user32_module);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`} // namespace`