NativeWindow/Windows: Fix CreateDummyWindow gluegen and usage

NativeWindow+JOGL/Windows: Complete Opaque types

6 files changed, 21 insertions, 12 deletions

diff --git a/make/config/jogl/gl-desktop.cfg b/make/config/jogl/gl-desktop.cfg
index ce2fefe2f..a91f5ac5b 100644
--- a/make/config/jogl/gl-desktop.cfg
+++ b/make/config/jogl/gl-desktop.cfg
@@ -13,18 +13,19 @@ GLHeader GL/glext.h
 # Directives needed when processing wglext.h on Windows and other platforms
 #
 Opaque boolean BOOL
-ReturnsString wglGetExtensionsStringARB
-ReturnsString wglGetExtensionsStringEXT
 Opaque long HANDLE
+Opaque long PROC
+Opaque long HINSTANCE
+Opaque long HWND
 Opaque long HBITMAP
 Opaque long HDC
 Opaque long HGDIOBJ
 Opaque long HGLRC
 Opaque long HPBUFFERARB
 Opaque long HPBUFFEREXT
-Opaque boolean BOOL
-Opaque long PROC
 Opaque long void **
+ReturnsString wglGetExtensionsStringARB
+ReturnsString wglGetExtensionsStringEXT
 
 # XID needs to be treated as a long for 32/64 bit compatibility
 Opaque long XID
diff --git a/make/config/jogl/gl3-desktop.cfg b/make/config/jogl/gl3-desktop.cfg
index 19eef4270..96e59aa05 100644
--- a/make/config/jogl/gl3-desktop.cfg
+++ b/make/config/jogl/gl3-desktop.cfg
@@ -12,18 +12,19 @@ GLHeader GL3/gl3ext.h
 # Directives needed when processing wglext.h on Windows and other platforms
 #
 Opaque boolean BOOL
-ReturnsString wglGetExtensionsStringARB
-ReturnsString wglGetExtensionsStringEXT
 Opaque long HANDLE
+Opaque long PROC
+Opaque long HINSTANCE
+Opaque long HWND
 Opaque long HBITMAP
 Opaque long HDC
 Opaque long HGDIOBJ
 Opaque long HGLRC
 Opaque long HPBUFFERARB
 Opaque long HPBUFFEREXT
-Opaque boolean BOOL
-Opaque long PROC
 Opaque long void **
+ReturnsString wglGetExtensionsStringARB
+ReturnsString wglGetExtensionsStringEXT
 
 #
 # Directives needed when processing cglext.h on MacOSX and other platforms
diff --git a/make/config/nativewindow/win32-CustomJavaCode.java b/make/config/nativewindow/win32-CustomJavaCode.java
index cd5b00b79..54a7fa53a 100644
--- a/make/config/nativewindow/win32-CustomJavaCode.java
+++ b/make/config/nativewindow/win32-CustomJavaCode.java
@@ -17,6 +17,10 @@
     return hInstance;
   }
 
+  public static long CreateDummyWindow(int x, int y, int width, int height) {
+      return CreateDummyWindow0(getModuleHandle(), x, y, width, height);
+  }
+
   public static Point GetRelativeLocation(long src_win, long dest_win, int src_x, int src_y) {
     return (Point) GetRelativeLocation0(src_win, dest_win, src_x, src_y);
   }
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index b7535b5e1..46c4f2f92 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -8,16 +8,16 @@ JavaClass GDI
 Style AllStatic
 
 Opaque boolean BOOL
-Opaque long HINSTANCE
 Opaque long HANDLE
+Opaque long PROC
+Opaque long HINSTANCE
+Opaque long HWND
 Opaque long HBITMAP
 Opaque long HDC
 Opaque long HGDIOBJ
 Opaque long HGLRC
 Opaque long HPBUFFERARB
 Opaque long HPBUFFEREXT
-Opaque boolean BOOL
-Opaque long PROC
 Opaque long void **
 
 Import javax.media.nativewindow.util.Point
@@ -33,5 +33,7 @@ CustomCCode #include <stddef.h>
 
 Include ../intptr.cfg
 
+CustomCCode extern HWND CreateDummyWindow0( HINSTANCE hInstance, int x, int y, int width, int height ) ;
+
 IncludeAs CustomJavaCode GDI win32-CustomJavaCode.java
 
diff --git a/make/stub_includes/win32/windows.h b/make/stub_includes/win32/windows.h
index a1162f531..d9f9e692a 100644
--- a/make/stub_includes/win32/windows.h
+++ b/make/stub_includes/win32/windows.h
@@ -23,6 +23,7 @@ typedef HANDLE              HDC;
 typedef HANDLE              HGDIOBJ;
 typedef HANDLE              HGLRC;
 typedef HANDLE              HMODULE;
+typedef HANDLE              HINSTANCE;
 typedef HANDLE              HPALETTE;
 typedef HANDLE              HWND;
 typedef long                LONG;
diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h
index e4942b21b..e31cd8c5a 100644
--- a/make/stub_includes/win32/wingdi.h
+++ b/make/stub_includes/win32/wingdi.h
@@ -168,7 +168,7 @@ WINGDIAPI HGDIOBJ WINAPI SelectObject(HDC, HGDIOBJ);
 // Routines for creation of a dummy window, device context and OpenGL
 // context for the purposes of getting wglChoosePixelFormatARB and
 // associated routines
-           HWND        CreateDummyWindow( int x, int y, int width, int height ) ;
+           HWND        CreateDummyWindow0( HINSTANCE hInstance, int x, int y, int width, int height ) ;
 WINUSERAPI BOOL WINAPI ShowWindow(HWND hWnd, int nCmdShow);
 WINUSERAPI HDC  WINAPI GetDC(HWND);
 WINUSERAPI int  WINAPI ReleaseDC(HWND hWnd, HDC hDC);