2 files changed, 48 insertions, 13 deletions
diff --git a/make/config/nativewindow/win32-CustomJavaCode.java b/make/config/nativewindow/win32-CustomJavaCode.java
index 0c1a3a402..5d0c82998 100644
--- a/make/config/nativewindow/win32-CustomJavaCode.java
+++ b/make/config/nativewindow/win32-CustomJavaCode.java
@@ -1,22 +1,50 @@
   
-  static {
-    NWJNILibLoader.loadNativeWindow("win32");
-    
-    if( !initIDs0() ) {
-        throw new NativeWindowException("GDI: Could not initialized native stub");
-    }
-  }
+  private static final boolean DEBUG = Debug.debug("GDI");
+
+  private static final String dummyWindowClassNameBase = "_dummyWindow_clazz" ;
+  private static RegisteredClassFactory dummyWindowClassFactory;
+  private static boolean isInit = false;
 
-  public static synchronized void initSingleton() {
-  }
   private static native boolean initIDs0();
+  private static native long getDummyWndProc0();
 
-  private static Object createDummyWindowSync = new Object();
+  public static synchronized void initSingleton(boolean firstX11ActionOnProcess) {
+    if(!isInit) {
+        NWJNILibLoader.loadNativeWindow("win32");
+        
+        if( !initIDs0() ) {
+            throw new NativeWindowException("GDI: Could not initialized native stub");
+        }
+
+        if(DEBUG) {
+            System.out.println("GDI.isFirstX11ActionOnProcess: "+firstX11ActionOnProcess);
+        }
+
+        dummyWindowClassFactory = new RegisteredClassFactory(dummyWindowClassNameBase, getDummyWndProc0());
+        isInit = true;
+    }
+  }
+
+  private static RegisteredClass dummyWindowClass = null;
+  private static Object dummyWindowSync = new Object();
 
   public static long CreateDummyWindow(int x, int y, int width, int height) {
-      synchronized(createDummyWindowSync) {
-          return CreateDummyWindow0(x, y, width, height);
+      synchronized(dummyWindowSync) {
+          dummyWindowClass = dummyWindowClassFactory.getSharedClass();
+          return CreateDummyWindow0(dummyWindowClass.getHandle(), dummyWindowClass.getName(), dummyWindowClass.getName(), x, y, width, height);
+      }
+  }
+
+  public static boolean DestroyDummyWindow(long hwnd) {
+      boolean res;
+      synchronized(dummyWindowSync) {
+          if( null == dummyWindowClass ) {
+              throw new InternalError("GDI Error ("+dummyWindowClassFactory.getSharedRefCount()+"): SharedClass is null");
+          }
+          res = DestroyWindow(hwnd);
+          dummyWindowClassFactory.releaseSharedClass();
       }
+      return res;
   }
 
   public static Point GetRelativeLocation(long src_win, long dest_win, int src_x, int src_y) {
@@ -24,3 +52,7 @@
   }
   private static native Object GetRelativeLocation0(long src_win, long dest_win, int src_x, int src_y);
 
+  public static native boolean CreateWindowClass(long hInstance, String clazzName, long wndProc);
+  public static native boolean DestroyWindowClass(long hInstance, String className);
+  static native long CreateDummyWindow0(long hInstance, String className, String windowName, int x, int y, int width, int height);
+
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index e140ed3aa..0ba7d63bc 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -22,7 +22,10 @@ Opaque long void **
 
 Import javax.media.nativewindow.util.Point
 Import javax.media.nativewindow.NativeWindowException
+Import javax.media.nativewindow.windows.RegisteredClass
+Import javax.media.nativewindow.windows.RegisteredClassFactory
 Import com.jogamp.nativewindow.impl.NWJNILibLoader
+import com.jogamp.nativewindow.impl.Debug
 
 CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
@@ -33,7 +36,7 @@ CustomCCode #include <stddef.h>
 
 Include ../intptr.cfg
 
-CustomCCode extern HWND CreateDummyWindow0( int x, int y, int width, int height ) ;
+CustomCCode extern HINSTANCE   GetApplicationHandle();
 
 IncludeAs CustomJavaCode GDI win32-CustomJavaCode.java