Merge branch 'master' into pull/726-merged-master

Author: jerboaa

jdk/src/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,10 @@
 import java.awt.peer.DesktopPeer;
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Native;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 
 /**
@@ -39,50 +42,76 @@
  */
 public class CDesktopPeer implements DesktopPeer {
 
+    @Native private static final int OPEN = 0;
+    @Native private static final int BROWSE = 1;
+    @Native private static final int EDIT = 2;
+    @Native private static final int PRINT = 3;
+    @Native private static final int MAIL = 4;
+
     public boolean isSupported(Action action) {
         // OPEN, EDIT, PRINT, MAIL, BROWSE all supported.
         // Though we don't really differentiate between OPEN / EDIT
         return true;
     }
 
     public void open(File file) throws IOException {
-        this.lsOpenFile(file, false);
+        this.lsOpenFile(file, OPEN);
     }
 
     public void edit(File file) throws IOException {
-        this.lsOpenFile(file, false);
+        this.lsOpenFile(file, EDIT);
     }
 
     public void print(File file) throws IOException {
-        this.lsOpenFile(file, true);
+        this.lsOpenFile(file, PRINT);
     }
 
     public void mail(URI uri) throws IOException {
-        this.lsOpen(uri);
+        this.lsOpen(uri, MAIL);
     }
 
     public void browse(URI uri) throws IOException {
-        this.lsOpen(uri);
+        this.lsOpen(uri, BROWSE);
     }
 
-    private void lsOpen(URI uri) throws IOException {
-        int status = _lsOpenURI(uri.toString());
+    private void lsOpen(URI uri, int action) throws IOException {
+        int status = _lsOpenURI(uri.toString(), action);
 
         if (status != 0 /* noErr */) {
-            throw new IOException("Failed to mail or browse " + uri + ". Error code: " + status);
+            String actionString = (action == MAIL) ? "mail" : "browse";
+            throw new IOException("Failed to " + actionString + " " + uri
+                                  + ". Error code: " + status);
         }
     }
 
-    private void lsOpenFile(File file, boolean print) throws IOException {
-        int status = _lsOpenFile(file.getCanonicalPath(), print);
-
+    private void lsOpenFile(File file, int action) throws IOException {
+        int status = -1;
+        Path tmpFile = null;
+        String tmpTxtPath = null;
+
+        try {
+            if (action == EDIT) {
+                tmpFile = Files.createTempFile("TmpFile", ".txt");
+                tmpTxtPath = tmpFile.toAbsolutePath().toString();
+            }
+            status = _lsOpenFile(file.getCanonicalPath(), action, tmpTxtPath);
+        } catch (Exception e) {
+            throw new IOException("Failed to create tmp file: ", e);
+        } finally {
+            if (tmpFile != null) {
+                Files.deleteIfExists(tmpFile);
+            }
+        }
         if (status != 0 /* noErr */) {
-            throw new IOException("Failed to open, edit or print " + file + ". Error code: " + status);
+            String actionString = (action == OPEN) ? "open"
+                                                   : (action == EDIT) ? "edit" : "print";
+            throw new IOException("Failed to " + actionString + " " + file
+                                  + ". Error code: " + status);
         }
     }
 
-    private static native int _lsOpenURI(String uri);
+    private static native int _lsOpenURI(String uri, int action);
 
-    private static native int _lsOpenFile(String path, boolean print);
+    private static native int _lsOpenFile(String path, int action, String tmpTxtPath);
 
 }

jdk/src/macosx/native/sun/awt/AWTWindow.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1495,6 +1495,7 @@ - (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame {
             int shieldLevel = CGShieldingWindowLevel();
             window.preFullScreenLevel = [nsWindow level];
             [nsWindow setLevel: shieldLevel];
+            [nsWindow makeKeyAndOrderFront: nil];
 
             NSRect screenRect = [[nsWindow screen] frame];
             [nsWindow setFrame:screenRect display:YES];

jdk/src/macosx/native/sun/awt/CDesktopPeer.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,27 +27,61 @@
 #import <CoreFoundation/CoreFoundation.h>
 #import <ApplicationServices/ApplicationServices.h>
 #import <JavaNativeFoundation/JavaNativeFoundation.h>
+#import <AppKit/AppKit.h>
+#import "sun_lwawt_macosx_CDesktopPeer.h"
 
 /*
  * Class:     sun_lwawt_macosx_CDesktopPeer
  * Method:    _lsOpenURI
- * Signature: (Ljava/lang/String;)I;
+ * Signature: (Ljava/lang/String;I)I
  */
 JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenURI
-(JNIEnv *env, jclass clz, jstring uri)
+(JNIEnv *env, jclass clz, jstring uri, jint action)
 {
-    OSStatus status = noErr;
+    __block OSStatus status = noErr;
 JNF_COCOA_ENTER(env);
 
-    // I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know.
-    // So we use LaunchServices directly.
-
-    NSURL *url = [NSURL URLWithString:JNFJavaToNSString(env, uri)];
-
-    LSLaunchFlags flags = kLSLaunchDefaults;
-
-    LSApplicationParameters params = {0, flags, NULL, NULL, NULL, NULL, NULL};
-    status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0);
+    NSURL *urlToOpen = [NSURL URLWithString:JNFJavaToNSString(env, uri)];
+    NSURL *appURI = nil;
+
+    if (action == sun_lwawt_macosx_CDesktopPeer_BROWSE) {
+        // To get the defaultBrowser
+        NSURL *httpsURL = [NSURL URLWithString:@"https://"];
+        NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+        appURI = [workspace URLForApplicationToOpenURL:httpsURL];
+    } else if (action == sun_lwawt_macosx_CDesktopPeer_MAIL) {
+        // To get the default mailer
+        NSURL *mailtoURL = [NSURL URLWithString:@"mailto://"];
+        NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+        appURI = [workspace URLForApplicationToOpenURL:mailtoURL];
+    }
+
+    if (appURI == nil) {
+        return -1;
+    }
+
+    // Prepare NSOpenConfig object
+    NSArray<NSURL *> *urls = @[urlToOpen];
+    NSWorkspaceOpenConfiguration *configuration = [NSWorkspaceOpenConfiguration configuration];
+    configuration.activates = YES; // To bring app to foreground
+    configuration.promptsUserIfNeeded = YES; // To allow macOS desktop prompts
+
+    // dispatch semaphores used to wait for the completion handler to update and return status
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC)); // 1 second timeout
+
+    // Asynchronous call to openURL
+    [[NSWorkspace sharedWorkspace] openURLs:urls
+                                    withApplicationAtURL:appURI
+                                    configuration:configuration
+                                    completionHandler:^(NSRunningApplication *app, NSError *error) {
+        if (error) {
+            status = (OSStatus) error.code;
+        }
+        dispatch_semaphore_signal(semaphore);
+    }];
+
+    dispatch_semaphore_wait(semaphore, timeout);
 
 JNF_COCOA_EXIT(env);
     return status;
@@ -56,30 +90,72 @@
 /*
  * Class:     sun_lwawt_macosx_CDesktopPeer
  * Method:    _lsOpenFile
- * Signature: (Ljava/lang/String;Z)I;
+ * Signature: (Ljava/lang/String;I;Ljava/lang/String;)I;
  */
 JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenFile
-(JNIEnv *env, jclass clz, jstring jpath, jboolean print)
+(JNIEnv *env, jclass clz, jstring jpath, jint action, jstring jtmpTxtPath)
 {
-    OSStatus status = noErr;
+    __block OSStatus status = noErr;
 JNF_COCOA_ENTER(env);
 
-    // I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know.
-    // So we use LaunchServices directly.
-
     NSString *path  = JNFNormalizedNSStringForPath(env, jpath);
-
-    NSURL *url = [NSURL fileURLWithPath:(NSString *)path];
+    NSURL *urlToOpen = [NSURL fileURLWithPath:(NSString *)path];
 
     // This byzantine workaround is necesary, or else directories won't open in Finder
-    url = (NSURL *)CFURLCreateWithFileSystemPath(NULL, (CFStringRef)[url path], kCFURLPOSIXPathStyle, false);
-
-    LSLaunchFlags flags = kLSLaunchDefaults;
-    if (print) flags |= kLSLaunchAndPrint;
-
-    LSApplicationParameters params = {0, flags, NULL, NULL, NULL, NULL, NULL};
-    status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0);
-    [url release];
+    urlToOpen = (NSURL *)CFURLCreateWithFileSystemPath(NULL, (CFStringRef)[urlToOpen path],
+                                                        kCFURLPOSIXPathStyle, false);
+
+    NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+    NSURL *appURI = [workspace URLForApplicationToOpenURL:urlToOpen];
+    NSURL *defaultTerminalApp = [workspace URLForApplicationToOpenURL:[NSURL URLWithString:@"file:///bin/sh"]];
+
+    // Prepare NSOpenConfig object
+    NSArray<NSURL *> *urls = @[urlToOpen];
+    NSWorkspaceOpenConfiguration *configuration = [NSWorkspaceOpenConfiguration configuration];
+    configuration.activates = YES; // To bring app to foreground
+    configuration.promptsUserIfNeeded = YES;  // To allow macOS desktop prompts
+
+    // pre-checks for open/print/edit before calling openURLs API
+    if (action == sun_lwawt_macosx_CDesktopPeer_OPEN
+            || action == sun_lwawt_macosx_CDesktopPeer_PRINT) {
+        if (appURI == nil
+            || [[urlToOpen absoluteString] containsString:[appURI absoluteString]]
+            || [[defaultTerminalApp absoluteString] containsString:[appURI absoluteString]]) {
+            return -1;
+        }
+        // Additionally set forPrinting=TRUE for print
+        if (action == sun_lwawt_macosx_CDesktopPeer_PRINT) {
+            configuration.forPrinting = YES;
+        }
+    } else if (action == sun_lwawt_macosx_CDesktopPeer_EDIT) {
+        if (appURI == nil
+            || [[urlToOpen absoluteString] containsString:[appURI absoluteString]]) {
+            return -1;
+        }
+        // for EDIT: if (defaultApp = TerminalApp) then set appURI = DefaultTextEditor
+        if ([[defaultTerminalApp absoluteString] containsString:[appURI absoluteString]]) {
+            NSString *path  = JNFNormalizedNSStringForPath(env, jtmpTxtPath);
+            NSURL *tempFilePath = [NSURL fileURLWithPath:(NSString *)path];
+            appURI = [workspace URLForApplicationToOpenURL:tempFilePath];
+        }
+    }
+
+    // dispatch semaphores used to wait for the completion handler to update and return status
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC)); // 1 second timeout
+
+    // Asynchronous call - openURLs:withApplicationAtURL
+    [[NSWorkspace sharedWorkspace] openURLs:urls
+                                   withApplicationAtURL:appURI
+                                   configuration:configuration
+                                   completionHandler:^(NSRunningApplication *app, NSError *error) {
+        if (error) {
+            status = (OSStatus) error.code;
+        }
+        dispatch_semaphore_signal(semaphore);
+    }];
+
+    dispatch_semaphore_wait(semaphore, timeout);
 
 JNF_COCOA_EXIT(env);
     return status;

jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,13 @@ public Soundbank getSoundbank(AudioInputStream ais)
                         "Can not allocate enough memory to read audio data.");
             }
 
+            long maximumHeapSize = (long) ((Runtime.getRuntime().maxMemory() -
+                    (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())) * 0.9);
+            if (totalSize > maximumHeapSize) {
+                throw new InvalidMidiDataException(
+                        "Insufficient heap size to render audio data.");
+            }
+
             if (ais.getFrameLength() == -1 || totalSize > MEGABYTE) {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 byte[] buff = new byte[DEFAULT_BUFFER_SIZE - (DEFAULT_BUFFER_SIZE % frameSize)];

jdk/src/share/classes/com/sun/net/httpserver/Headers.java

@@ -26,6 +26,7 @@
 package com.sun.net.httpserver;
 
 import java.util.*;
+import sun.net.httpserver.Utils;
 
 /**
  * HTTP request and response headers are represented by this class which implements
@@ -129,8 +130,14 @@ public String getFirst (String key) {
         }
 
         public List<String> put(String key, List<String> value) {
+            // checkHeader is called in this class to fail fast
+            // It also must be called in sendResponseHeaders because
+            // Headers instances internal state can be modified
+            // external to these methods.
+            Utils.checkHeader(key, false);
+
             for (String v : value)
-                checkValue(v);
+                Utils.checkHeader(v, true);
             return map.put (normalize(key), value);
         }
 
@@ -142,7 +149,8 @@ public List<String> put(String key, List<String> value) {
          * @param value the header value to add to the header
          */
         public void add (String key, String value) {
-            checkValue(value);
+            Utils.checkHeader(key, false);
+            Utils.checkHeader(value, true);
             String k = normalize(key);
             List<String> l = map.get(k);
             if (l == null) {
@@ -152,30 +160,6 @@ public void add (String key, String value) {
             l.add (value);
         }
 
-        private static void checkValue(String value) {
-            int len = value.length();
-            for (int i=0; i<len; i++) {
-                char c = value.charAt(i);
-                if (c == '\r') {
-                    // is allowed if it is followed by \n and a whitespace char
-                    if (i >= len - 2) {
-                        throw new IllegalArgumentException("Illegal CR found in header");
-                    }
-                    char c1 = value.charAt(i+1);
-                    char c2 = value.charAt(i+2);
-                    if (c1 != '\n') {
-                        throw new IllegalArgumentException("Illegal char found after CR in header");
-                    }
-                    if (c2 != ' ' && c2 != '\t') {
-                        throw new IllegalArgumentException("No whitespace found after CRLF in header");
-                    }
-                    i+=2;
-                } else if (c == '\n') {
-                    throw new IllegalArgumentException("Illegal LF found in header");
-                }
-            }
-        }
-
         /**
          * sets the given value as the sole header value
          * for the given key. If the mapping does not