JDK-8201539 Fix DirectWrite crash on Monocle.

appveyor.yml

@@ -33,7 +33,7 @@ build_script:
       $env:VSVARS32FILE = "$env:VCINSTALLDIR\vcvars32.bat"
       refreshenv
       # Must invoke gradle with cmd.exe so stderr output doesn't fail the build:
-  - cmd: gradlew all test -PCOMPILE_WEBKIT=false -PCONF=DebugNative --stacktrace -x :web:test --info --no-daemon
+  - cmd: gradlew all test -PCOMPILE_WEBKIT=false -PCONF=DebugNative -PFULL_TEST=true -PUSE_ROBOT=true -PHEADLESS_TEST=true -PUNSTABLE_TEST=true --stacktrace -x :web:test --info --no-daemon
 
 on_finish:
   - ps: |

buildSrc/win.gradle

@@ -32,6 +32,7 @@ WIN.compileSwing = true;
 WIN.compileSWT = true;
 WIN.compileFXPackager = true;
 
+WIN.includeMonocle = true;
 WIN.includeNull3d = true
 
 // Lambda for naming the generated libs

modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/IWICImagingFactory.java

@@ -25,13 +25,32 @@
 
 package com.sun.javafx.font.directwrite;
 
+import com.sun.javafx.font.Disposer;
+
 class IWICImagingFactory extends IUnknown {
+
+    DWDisposer disposer;
+
     IWICImagingFactory(long ptr) {
         super(ptr);
+        disposer = new IWICImagingFactoryDisposer(this);
+        Disposer.addRecord(this, disposer);
     }
 
     IWICBitmap CreateBitmap(int uiWidth, int uiHeight, int pixelFormat, int options) {
         long result = OS.CreateBitmap(ptr, uiWidth, uiHeight, pixelFormat, options);
         return result != 0 ? new IWICBitmap(result) : null;
     }
+
+    private static class IWICImagingFactoryDisposer extends DWDisposer {
+
+        IWICImagingFactoryDisposer(IUnknown resource) {
+            super(resource);
+        }
+
+        public synchronized void dispose() {
+            super.dispose();
+            OS.UninitializeCOM(resource.ptr);
+        }
+    }
 }

modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java

@@ -342,6 +342,7 @@ static final native int GetGlyphPlacements(long ptr,
 
     //IWICImagingFactory
     static final native long CreateBitmap(long ptr, int uiWidth, int uiHeight, int pixelFormat, int options);
+    static final native void UninitializeCOM(long ptr);
 
     //IWICBitmap
     static final native long Lock(long ptr, int x, int y, int width, int height, int flags);

modules/javafx.graphics/src/main/native-font/directwrite.cpp

@@ -867,8 +867,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1WICCreateImagingFactory)
             IID_PPV_ARGS(&result)
             );
 
-    /* Unload COM as no other COM objects will be create directly */
-    CoUninitialize();
     return SUCCEEDED(hr) ? (jlong)result : NULL;
 }
 
@@ -2359,6 +2357,12 @@ JNIEXPORT jlong JNICALL OS_NATIVE(CreateBitmap)
     return SUCCEEDED(hr) ? (jlong)result : NULL;
 }
 
+JNIEXPORT void JNICALL OS_NATIVE(UninitializeCOM)
+    (JNIEnv *env, jclass that, jlong arg0)
+{
+    CoUninitialize();
+}
+
 /*IWICBitmap*/
 JNIEXPORT jlong JNICALL OS_NATIVE(Lock)
     (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)