Fix a possible resource leak in ColorizationColorAffectsBorders

(cherry picked from commit 0c911b6ffe)

make/MacBundles.gmk

@@ -61,15 +61,17 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       FILES := $(call CacheFind, $(JRE_IMAGE_DIR)), \
   ))
 
-   $(eval $(call SetupCopyFiles, COPY_LIBJLI_JDK, \
+  $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
-      FILES := $(JDK_IMAGE_DIR)/lib/jli/libjli.dylib, \
+	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
-      DEST := $(JDK_MACOSX_CONTENTS_DIR)/MacOS, \
+	$(MKDIR) -p $(@D)
-  ))
+	$(RM) $@
+	$(LN) -s ../Home/lib/jli/libjli.dylib $@
 
-  $(eval $(call SetupCopyFiles, COPY_LIBJLI_JRE, \
+  $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
-      FILES := $(JRE_IMAGE_DIR)/lib/jli/libjli.dylib, \
+	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
-      DEST := $(JRE_MACOSX_CONTENTS_DIR)/MacOS, \
+	$(MKDIR) -p $(@D)
-  ))
+	$(RM) $@
+	$(LN) -s ../Home/lib/jli/libjli.dylib $@
 
   $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \
       SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \
@@ -95,19 +97,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           @@VENDOR@@ => $(BUNDLE_VENDOR) , \
   ))
 
-  $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set: $(COPY_JDK_IMAGE)
+  jdk-bundle: $(COPY_JDK_IMAGE) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
+      $(BUILD_JDK_PLIST)
 	$(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR))
-	$(TOUCH) $@
 
-  $(SUPPORT_OUTPUTDIR)/images/_jre_bundle_attribute_set: $(COPY_JRE_IMAGE)
+  jre-bundle: $(COPY_JRE_IMAGE) $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
+      $(BUILD_JRE_PLIST)
 	$(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR))
-	$(TOUCH) $@
-
-  jdk-bundle: $(COPY_JDK_IMAGE) $(COPY_LIBJLI_JDK) \
-      $(BUILD_JDK_PLIST) $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set
-
-  jre-bundle: $(COPY_JRE_IMAGE) $(COPY_LIBJLI_JRE) \
-      $(BUILD_JRE_PLIST) $(SUPPORT_OUTPUTDIR)/images/_jre_bundle_attribute_set
 
 else # Not macosx
 

src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp

@@ -499,12 +499,38 @@ void CheckFontSmoothingSettings(HWND hWnd) {
     }
 }
 
+BOOL GetDwmColorizationColorFromRegistry(DWORD& colorizationColor, DWORD& colorizationColorBalance) {
+    // DwmGetColorizationColor is unreliable: it doesn't extract the actual accent color value set by user. To get the
+    // actual value (usable e.g. to calculate the border colors), we have to use the registry.
+    DWORD colorizationColorBgr = 0;
+    DWORD dwordSize(sizeof(DWORD));
+
+    HKEY hKey = NULL;
+    if (::RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\DWM", 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE;
+    if (::RegQueryValueEx(hKey, L"ColorizationColor", NULL, NULL, reinterpret_cast<LPBYTE>(&colorizationColorBgr), &dwordSize) != ERROR_SUCCESS) {
+        RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    int b = colorizationColorBgr & 0xFF;
+    int g = (colorizationColorBgr & 0xFF00) >> 8;
+    int r = (colorizationColorBgr & 0xFF0000) >> 16;
+    colorizationColor = RGB(r, g, b);
+
+    if (::RegQueryValueEx(hKey, L"ColorizationColorBalance", NULL, NULL, reinterpret_cast<LPBYTE>(&colorizationColorBalance), &dwordSize) != ERROR_SUCCESS) {
+        colorizationColorBalance = -1;
+    }
+    RegCloseKey(hKey);
+
+    return TRUE;
+}
+
 BOOL ColorizationColorAffectsBorders() {
     DWORD result = 0;
     DWORD bufSize(sizeof(DWORD));
     HKEY hKey = NULL;
     if (::RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\DWM"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) return TRUE;
-    if (::RegQueryValueEx(hKey, _T("ColorPrevalence"), NULL, NULL, reinterpret_cast<LPBYTE>(&result), &bufSize) != ERROR_SUCCESS) return TRUE;
+    if (::RegQueryValueEx(hKey, _T("ColorPrevalence"), NULL, NULL, reinterpret_cast<LPBYTE>(&result), &bufSize) != ERROR_SUCCESS) result = 1;
     RegCloseKey(hKey);
     return result == 0 ? FALSE : TRUE;
 }
@@ -530,11 +556,14 @@ void AwtDesktopProperties::GetColorParameters() {
     BOOL enabled;
     DwmIsCompositionEnabled(&enabled);
     if (enabled) {
-        DWORD color;
+        DWORD color = 0;
-        BOOL opaque = FALSE;
+        DWORD balance = 0;
-        // [tav] todo: listen WM_DWMCOLORIZATIONCOLORCHANGED
+
-        DwmGetColorizationColor(&color, &opaque);
+        if (GetDwmColorizationColorFromRegistry(color, balance)) {
-        SetColorProperty(TEXT("win.dwm.colorizationColor"), RGB(GetBValue(color), GetGValue(color), GetRValue(color)));
+            SetColorProperty(TEXT("win.dwm.colorizationColor"), color);
+            SetIntegerProperty(TEXT("win.dwm.colorizationColorBalance"), balance);
+        }
+
         SetBooleanProperty(TEXT("win.dwm.colorizationColor.affects.borders"), ColorizationColorAffectsBorders());
     }
 

src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp

@@ -1842,15 +1842,30 @@ MsgRouting AwtFrame::WmNcCalcSize(BOOL wParam, LPNCCALCSIZE_PARAMS lpncsp, LRESU
         rect->top += insets.bottom;
         // [moklev] Workaround for RIDER-27069, IDEA-211327
         if (!this->IsUndecorated()) {
-            rect->right += this->ScaleUpX(1);
-            // [tav] Decrement NC bottom only when taskbar is bottom/autohide (JBR-1786)
             APPBARDATA abData;
+            abData.uEdge = 0;
             abData.cbSize = sizeof(abData);
-            if (::SHAppBarMessage(ABM_GETTASKBARPOS, &abData) &&
+            if (::SHAppBarMessage(ABM_GETSTATE, &abData) == ABS_AUTOHIDE &&
-                abData.uEdge == ABE_BOTTOM &&
+                ::SHAppBarMessage(ABM_GETTASKBARPOS, &abData))
-                ::SHAppBarMessage(ABM_GETSTATE, &abData) == ABS_AUTOHIDE)
             {
-                rect->bottom -= 1;
+                // [tav] leave one pixel for autohide taskbar
+                switch (abData.uEdge) {
+                    case ABE_TOP:
+                        rect->top += 1;
+                        break;
+                    case ABE_LEFT:
+                        rect->left += 1;
+                        break;
+                    case ABE_BOTTOM:
+                        rect->bottom -= 1;
+                        break;
+                    case ABE_RIGHT:
+                        rect->right -= 1;
+                        break;
+                }
+            }
+            if (abData.uEdge != ABE_RIGHT) {
+                rect->right += this->ScaleUpX(1);
             }
         }
     }

src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

@@ -1025,6 +1025,14 @@ LRESULT CALLBACK AwtToolkit::WndProc(HWND hWnd, UINT message,
       }
 // Remove this define when we move to newer (XP) version of SDK.
 #define WM_THEMECHANGED                 0x031A
+
+#ifndef WM_DWMCOMPOSITIONCHANGED
+#define WM_DWMCOMPOSITIONCHANGED        0x031E
+#define WM_DWMNCRENDERINGCHANGED        0x031F
+#define WM_DWMCOLORIZATIONCOLORCHANGED  0x0320
+#define WM_DWMWINDOWMAXIMIZEDCHANGED    0x0321
+#endif // WM_DWMCOMPOSITIONCHANGED
+      case WM_DWMCOLORIZATIONCOLORCHANGED:
       case WM_THEMECHANGED: {
           /* Upcall to WToolkit when user changes configuration.
            *
@@ -1040,12 +1048,7 @@ LRESULT CALLBACK AwtToolkit::WndProc(HWND hWnd, UINT message,
           }
           return 0;
       }
-#ifndef WM_DWMCOMPOSITIONCHANGED
+
-#define WM_DWMCOMPOSITIONCHANGED        0x031E
-#define WM_DWMNCRENDERINGCHANGED        0x031F
-#define WM_DWMCOLORIZATIONCOLORCHANGED  0x0320
-#define WM_DWMWINDOWMAXIMIZEDCHANGED    0x0321
-#endif // WM_DWMCOMPOSITIONCHANGED
       case WM_DWMCOMPOSITIONCHANGED: {
           DWMResetCompositionEnabled();
           return 0;