--- old/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java 2018-06-20 15:17:13.966680800 +0530 +++ new/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java 2018-06-20 15:17:11.364711600 +0530 @@ -317,27 +317,43 @@ return defaultPrintService; } + /* Windows provides *PrinterChangeNotification* functions that provides + information about printer status changes of the local printers but not + network printers. + Alternatively, Windows provides a way thro' which one can get the + network printer status changes by using WMI, RegistryKeyChange combination, + which is a slightly complex mechanism. + The Windows WMI offers an async and sync method to read thro' registry + via the WQL query. The async method is considered dangerous as it leaves + open a channel until we close it. But the async method has the advantage of + being notified of a change in registry by calling callback without polling for it. + The sync method uses the polling mechanism to notify. + RegistryValueChange cannot be used in combination with WMI to get registry + value change notification because of an error that may be generated because the + scope of the query would be too big to handle(at times). + Hence an alternative mechanism is choosen via the EnumPrinters by polling for the + count of printer status changes(add\remove) and based on it update the printers + list. + */ class PrinterChangeListener implements Runnable { - long chgObj; + long prevRemotePrintersCount = 0; + PrinterChangeListener() { - chgObj = notifyFirstPrinterChange(null); + prevRemotePrintersCount = GetRemotePrintersCount(); } @Override public void run() { - if (chgObj != -1) { - while (true) { - // wait for configuration to change - if (notifyPrinterChange(chgObj) != 0) { - try { - refreshServices(); - } catch (SecurityException se) { - break; - } - } else { - notifyClosePrinterChange(chgObj); - break; - } + while(true) { + long currentRemotePrintersCount = GetRemotePrintersCount(); + if(prevRemotePrintersCount != currentRemotePrintersCount) { + + // updated the printers data + // printers list now contains both local and network printer data + refreshServices(); + + // store the current data for next comparison + prevRemotePrintersCount = currentRemotePrintersCount; } } } @@ -345,7 +361,5 @@ private native String getDefaultPrinterName(); private native String[] getAllPrinterNames(); - private native long notifyFirstPrinterChange(String printer); - private native void notifyClosePrinterChange(long chgObj); - private native int notifyPrinterChange(long chgObj); + private native long GetRemotePrintersCount(); } --- old/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp 2018-06-20 15:17:27.638508400 +0530 +++ new/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp 2018-06-20 15:17:25.129540300 +0530 @@ -44,7 +44,6 @@ #define PAPERNAME_LENGTH 64 #define TRAYNAME_LENGTH 24 - static BOOL IsSupportedLevel(HANDLE hPrinter, DWORD dwLevel) { BOOL isSupported = FALSE; DWORD cbBuf = 0; @@ -117,7 +116,6 @@ CATCH_BAD_ALLOC_RET(NULL); } - JNIEXPORT jobjectArray JNICALL Java_sun_print_PrintServiceLookupProvider_getAllPrinterNames(JNIEnv *env, jobject peer) @@ -174,65 +172,18 @@ CATCH_BAD_ALLOC_RET(NULL); } - JNIEXPORT jlong JNICALL -Java_sun_print_PrintServiceLookupProvider_notifyFirstPrinterChange(JNIEnv *env, - jobject peer, - jstring printer) { - HANDLE hPrinter; - - LPTSTR printerName = NULL; - if (printer != NULL) { - printerName = (LPTSTR)JNU_GetStringPlatformChars(env, - printer, - NULL); - JNU_ReleaseStringPlatformChars(env, printer, printerName); - } - - // printerName - "Win NT/2K/XP: If NULL, it indicates the local printer - // server" - MSDN. Win9x : OpenPrinter returns 0. - BOOL ret = OpenPrinter(printerName, &hPrinter, NULL); - if (!ret) { - return (jlong)-1; - } - - // PRINTER_CHANGE_PRINTER = PRINTER_CHANGE_ADD_PRINTER | - // PRINTER_CHANGE_SET_PRINTER | - // PRINTER_CHANGE_DELETE_PRINTER | - // PRINTER_CHANGE_FAILED_CONNECTION_PRINTER - HANDLE chgObj = FindFirstPrinterChangeNotification(hPrinter, - PRINTER_CHANGE_PRINTER, - 0, - NULL); - return (chgObj == INVALID_HANDLE_VALUE) ? (jlong)-1 : (jlong)chgObj; -} - - - -JNIEXPORT void JNICALL -Java_sun_print_PrintServiceLookupProvider_notifyClosePrinterChange(JNIEnv *env, - jobject peer, - jlong chgObject) { - FindClosePrinterChangeNotification((HANDLE)chgObject); -} +Java_sun_print_PrintServiceLookupProvider_GetRemotePrintersCount(JNIEnv *env, + jobject peer) { + DWORD cbNeeded = 0; + DWORD cReturned = 0; + ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, + NULL, 4, NULL, 0, &cbNeeded, &cReturned); -JNIEXPORT jint JNICALL -Java_sun_print_PrintServiceLookupProvider_notifyPrinterChange(JNIEnv *env, - jobject peer, - jlong chgObject) { - DWORD dwChange; - - DWORD ret = WaitForSingleObject((HANDLE)chgObject, INFINITE); - if (ret == WAIT_OBJECT_0) { - return(FindNextPrinterChangeNotification((HANDLE)chgObject, - &dwChange, NULL, NULL)); - } else { - return 0; - } + return (cbNeeded/sizeof(PRINTER_INFO_4)); } - JNIEXPORT jfloatArray JNICALL Java_sun_print_Win32PrintService_getMediaPrintableArea(JNIEnv *env, jobject peer, --- /dev/null 2018-06-20 15:17:42.000000000 +0530 +++ new/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java 2018-06-20 15:17:38.487434600 +0530 @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2018, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8153732 + * @requires (os.family == "Windows") + * @summary Windows remote printer changes do not reflect in lookupPrintServices() + * @run main/manual RemotePrinterStatusRefresh + */ + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.print.PageFormat; +import java.awt.print.Paper; +import java.awt.print.PrinterException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import java.awt.print.PrinterJob; +import javax.print.PrintService; + +public class RemotePrinterStatusRefresh +{ + private static TestUI test = null; + public static void main(String args[]) throws Exception { + final CountDownLatch latch = new CountDownLatch(1); + + // Test UI creation + test = new TestUI(latch); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + test.createUI(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + + // RemotePrinterStatusRefresh creation + RemotePrinterStatusRefresh RemotePrinterStatusRefresh = new RemotePrinterStatusRefresh(); + SwingUtilities.invokeAndWait(() -> { + collectPrintersList(test.resultsTextArea, true); + }); + + // 3 min = 180000 msec + if(waitForFlag(180000)) { + SwingUtilities.invokeAndWait(() -> { + collectPrintersList(test.resultsTextArea, false); + }); + } else { + dispose(); + throw new RuntimeException("No new network printer got added/removed!! Test timed out!!"); + } + + boolean status = latch.await(1, TimeUnit.MINUTES); + if (!status) { + dispose(); + throw new RuntimeException("Test timed out."); + } + + if (test.testResult == false) { + dispose(); + throw new RuntimeException("Test Failed."); + } + + dispose(); + } + + public static void dispose() throws Exception { + SwingUtilities.invokeAndWait(() -> { + test.disposeUI(); + }); + } + + public static boolean waitForFlag (long maxTimeoutInMsec) throws Exception { + while(!test.isAdded && maxTimeoutInMsec > 0) { + maxTimeoutInMsec -= 100; + Thread.sleep(100); + } + + if(maxTimeoutInMsec <= 0) { + return false; + } else { + return true; + } + } + + private static void collectPrintersList(JTextArea textArea, boolean before) { + if(before) { + System.out.println("List of printers(before): "); + textArea.setText("List of printers(before): \n"); + for (PrintService printServiceBefore : PrinterJob.lookupPrintServices()) { + System.out.println(printServiceBefore); + textArea.append(printServiceBefore.toString()); + textArea.append("\n"); + } + } else { + textArea.append("\n"); + System.out.println("List of printers(after): "); + textArea.append("List of printers(after): \n"); + for (PrintService printServiceAfter : PrinterJob.lookupPrintServices()) { + System.out.println(printServiceAfter); + textArea.append(printServiceAfter.toString()); + textArea.append("\n"); + } + } + } +} + +class TestUI { + private static JFrame mainFrame; + private static JPanel mainControlPanel; + + private static JTextArea instructionTextArea; + + private static JPanel resultButtonPanel; + private static JButton passButton; + private static JButton failButton; + private static JButton addedButton; + + private static JPanel testPanel; + private static JButton testButton; + private static JLabel buttonPressCountLabel; + + private static GridBagLayout layout; + private final CountDownLatch latch; + public boolean testResult = false; + public volatile Boolean isAdded = false; + public static JTextArea resultsTextArea; + + public TestUI(CountDownLatch latch) throws Exception { + this.latch = latch; + } + + public final void createUI() { + mainFrame = new JFrame("RemotePrinterStatusRefresh"); + layout = new GridBagLayout(); + mainControlPanel = new JPanel(layout); + resultButtonPanel = new JPanel(layout); + testPanel = new JPanel(layout); + GridBagConstraints gbc = new GridBagConstraints(); + + // Create Test instructions + String instructions + = "This test displays the current list of printers(before) attached to \n" + + "this computer in the results panel.\n\n" + + "Please follow the below steps for this manual test\n" + + "--------------------------------------------------------------------\n" + + "Step 1: Add/Remove a new network printer and then click on \n" + + " 'Printer Added/Removed' button\n" + + "Step 2: Once the new network printer is added, see if it is \n" + + " the same as displayed in the results panel.\n" + + "Step 3: If displayed then click 'Pass' else click on 'Fail' button"; + + instructionTextArea = new JTextArea(); + instructionTextArea.setText(instructions); + instructionTextArea.setEditable(false); + instructionTextArea.setBorder(BorderFactory. + createTitledBorder("Test Instructions")); + + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionTextArea, gbc); + + gbc.gridx = 0; + gbc.gridy = 1; + testPanel.add(Box.createVerticalStrut(50)); + mainControlPanel.add(testPanel); + + addedButton = new JButton("Printer Added/Removed"); + addedButton.setActionCommand("Added"); + addedButton.addActionListener((ActionEvent e) -> { + System.out.println("Added Button pressed!"); + isAdded = true; + }); + + // Create resultButtonPanel with Pass, Fail buttons + passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + System.out.println("Pass Button pressed!"); + testResult = true; + latch.countDown(); + disposeUI(); + }); + + failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener((ActionEvent e) -> { + System.out.println("Fail Button pressed!"); + testResult = false; + latch.countDown(); + disposeUI(); + }); + + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(addedButton, gbc); + + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + + gbc.gridx = 2; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + resultsTextArea = new JTextArea(); + resultsTextArea.setEditable(false); + resultsTextArea.setBorder(BorderFactory. + createTitledBorder("Results")); + + gbc.gridx = 0; + gbc.gridy = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(resultsTextArea, gbc); + + gbc.gridx = 0; + gbc.gridy = 2; + mainControlPanel.add(resultButtonPanel, gbc); + + mainFrame.add(mainControlPanel); + mainFrame.pack(); + mainFrame.setVisible(true); + } + + public void disposeUI() { + mainFrame.dispose(); + } +} \ No newline at end of file