Bug 907 - Cleanup Commit e9c711a86aa05f4f24c69972532833f5a98911a3

Cleanup Commit e9c711a86aa05f4f24c69972532833f5a98911a3:
  - Fix while loop in SendCloseMessage (native)

  - static 'threadid' must be volatile

  - Whitespace

  - Redundancy
    - CreateDummyWindow

  - Scope (java, move JNI funcs back to private)

  - Remove [invalid] pointer usage (native)
    - ThreadParam's threadReady and hWndPtr shall not be pointers - invalid
    - No need to use a threadReady pointer.

  - Validate threadid (native)

TODO:
  - Make 'native dispatch thread' optional
  - Store 'native dispatch thread' in window class

2 files changed, 125 insertions, 128 deletions

diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/GDIUtil.java b/src/nativewindow/classes/jogamp/nativewindow/windows/GDIUtil.java
index 0cf813ad5..6c639c754 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/windows/GDIUtil.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/windows/GDIUtil.java
@@ -59,8 +59,10 @@ public class GDIUtil implements ToolkitProperties {
                     if( !initIDs0() ) {
                         throw new NativeWindowException("GDI: Could not initialized native stub");
                     }
-		    long a = getDummyWndProc0();
-                    dummyWindowClassFactory = new RegisteredClassFactory(dummyWindowClassNameBase, a);
+                    dummyWindowClassFactory = new RegisteredClassFactory(dummyWindowClassNameBase, getDummyWndProc0());
+                    if(DEBUG) {
+                        System.out.println("GDI.initSingleton() dummyWindowClassFactory "+dummyWindowClassFactory);
+                    }
                     isInit = true;
                 }
             }
@@ -91,7 +93,11 @@ public class GDIUtil implements ToolkitProperties {
 
     public static long CreateDummyWindow(int x, int y, int width, int height) {
         synchronized(dummyWindowSync) {
-            dummyWindowClass = dummyWindowClassFactory.getSharedClass();
+            if(DEBUG) {
+                System.out.println("GDI.CreateDummyWindow() dummyWindowClassFactory "+dummyWindowClassFactory);
+                System.out.println("GDI.CreateDummyWindow() dummyWindowClass "+dummyWindowClass);
+            }
+            // FIXME return CreateDummyWindow0(dummyWindowClass.getHInstance(), dummyWindowClass.getName(), dummyWindowClass.getName(), x, y, width, height);
             return CreateDummyWindowAndMessageLoop(dummyWindowClass.getHInstance(), dummyWindowClass.getName(), dummyWindowClass.getName(), x, y, width, height);
         }
     }
@@ -102,6 +108,7 @@ public class GDIUtil implements ToolkitProperties {
             if( null == dummyWindowClass ) {
                 throw new InternalError("GDI Error ("+dummyWindowClassFactory.getSharedRefCount()+"): SharedClass is null");
             }
+            // FIXME res = GDI.DestroyWindow(hwnd);
             res = SendCloseMessage(hwnd);
             dummyWindowClassFactory.releaseSharedClass();
         }
@@ -124,13 +131,13 @@ public class GDIUtil implements ToolkitProperties {
     public static native boolean DestroyWindowClass(long hInstance, String className);
 
     private static native boolean initIDs0();
-    static native long getDummyWndProc0();
+    private static native long getDummyWndProc0();
     private static native Object GetRelativeLocation0(long src_win, long dest_win, int src_x, int src_y);
     private static native boolean IsChild0(long win);
     private static native boolean IsUndecorated0(long win);
 
-    static native long CreateDummyWindow0(long hInstance, String className, String windowName, int x, int y, int width, int height);
+    private static native long CreateDummyWindow0(long hInstance, String className, String windowName, int x, int y, int width, int height);
 
-    static native long CreateDummyWindowAndMessageLoop(long hInstance, String className, String windowName, int x, int y, int width, int height);
-    static native boolean SendCloseMessage(long win);
+    private static native long CreateDummyWindowAndMessageLoop(long hInstance, String className, String windowName, int x, int y, int width, int height);
+    private static native boolean SendCloseMessage(long win);
 }
diff --git a/src/nativewindow/native/win32/GDImisc.c b/src/nativewindow/native/win32/GDImisc.c
index 40f42f285..d3ac3873c 100644
--- a/src/nativewindow/native/win32/GDImisc.c
+++ b/src/nativewindow/native/win32/GDImisc.c
@@ -31,7 +31,7 @@ static const char * const ClazzNamePointCstrSignature = "(II)V";
 static jclass pointClz = NULL;
 static jmethodID pointCstr = NULL;
 
-static DWORD threadid = 0;
+static volatile DWORD threadid = 0;
 
 typedef struct ThreadParam_s
 {
@@ -42,8 +42,8 @@ typedef struct ThreadParam_s
   jint y;
   jint width;
   jint height;
-  volatile HWND *hWndPtr;
-  volatile BOOL *threadReady;
+  volatile HWND hWnd;
+  volatile BOOL threadReady;
 } ThreadParam;
 
 #define TM_OPENWIN WM_APP+1
@@ -52,69 +52,60 @@ typedef struct ThreadParam_s
 
 DWORD WINAPI ThreadFunc(LPVOID param)
 {
- MSG msg;
- BOOL bRet;
- ThreadParam *startupThreadParam = (ThreadParam*)param;
-
-  /* there can not be any messages for us now, as the creator waits for
-     threadReady before continuing, but we must use this PeekMessage() to
-     create the thread message queue */
-  PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
-
-  /* now we can safely say: we have a qeue and are ready to receive messages */
-  *(startupThreadParam->threadReady) = TRUE;
-
-  while( (bRet = GetMessage( &msg, NULL, 0, 0 )) != 0)
-    {
-      if (bRet == -1)
-	{
-	  return 0;
-	}
-      else
-	{
-	  switch(msg.message)
-	    {
-	    case TM_OPENWIN:
-	      {
-		ThreadParam *tParam = (ThreadParam*)msg.wParam;
-		HINSTANCE hInstance = (HINSTANCE) (intptr_t) tParam->jHInstance;
-		DWORD dwExStyle;
-		DWORD dwStyle;
-
-		dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
-		dwStyle = WS_OVERLAPPEDWINDOW;
-
-		HWND hwnd = CreateWindowEx( dwExStyle,
-					    tParam->wndClassName,
-					    tParam->wndName,
-				dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-			  tParam->x, tParam->y, tParam->width, tParam->height,
-					    NULL, NULL, hInstance, NULL );
-
-		*(tParam->hWndPtr) = hwnd;
-		*(tParam->threadReady) = TRUE;
-	      }
-	      break;
-	    case TM_CLOSEWIN:
-	      {
-		ThreadParam *tParam = (ThreadParam*)msg.wParam;
-		HWND hwnd = *(tParam->hWndPtr);
-		DestroyWindow(hwnd);
-		*(tParam->threadReady) = TRUE;
-	      }
-	      break;
-	    case TM_STOP:
-	      return 0;
-	      break;	    
-	    default:
-	      TranslateMessage(&msg); 
-	      DispatchMessage(&msg); 
-	      break;
-	    }
-	}
+    MSG msg;
+    BOOL bRet;
+    ThreadParam *startupThreadParam = (ThreadParam*)param;
+
+    /* there can not be any messages for us now, as the creator waits for
+       threadReady before continuing, but we must use this PeekMessage() to
+       create the thread message queue */
+    PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
+
+    /* now we can safely say: we have a qeue and are ready to receive messages */
+    startupThreadParam->threadReady = TRUE;
+
+    while( (bRet = GetMessage( &msg, NULL, 0, 0 )) != 0) {
+        if (bRet == -1) {
+            return 0;
+        } else {
+            switch(msg.message) {
+                case TM_OPENWIN: {
+                    ThreadParam *tParam = (ThreadParam*)msg.wParam;
+                    HINSTANCE hInstance = (HINSTANCE) (intptr_t) tParam->jHInstance;
+                    DWORD dwExStyle;
+                    DWORD dwStyle;
+        
+                    dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
+                    dwStyle = WS_OVERLAPPEDWINDOW;
+        
+                    HWND hwnd = CreateWindowEx( dwExStyle,
+                                    tParam->wndClassName,
+                                    tParam->wndName,
+                                    dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+                                    tParam->x, tParam->y, tParam->width, tParam->height,
+                                    NULL, NULL, hInstance, NULL );
+        
+                    tParam->hWnd = hwnd;
+                    tParam->threadReady = TRUE;
+                  }
+                  break;
+                case TM_CLOSEWIN: {
+                    ThreadParam *tParam = (ThreadParam*)msg.wParam;
+                    HWND hwnd = tParam->hWnd;
+                    DestroyWindow(hwnd);
+                    tParam->threadReady = TRUE;
+                  }
+                  break;
+                case TM_STOP:
+                  return 0;
+                default:
+                  TranslateMessage(&msg); 
+                  DispatchMessage(&msg); 
+                  break;
+            }
+        }
     }
-
- return 0;
+    return 0;
 } /* ThreadFunc */
 
 
@@ -129,13 +120,18 @@ HINSTANCE GetApplicationHandle() {
  */
 JNIEXPORT jboolean JNICALL
 Java_jogamp_nativewindow_windows_GDIUtil_CreateWindowClass
-    (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jClazzName, jlong wndProc) 
+    (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jClazzName, jlong wndProc)
 {
     HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance;
     const TCHAR* clazzName = NULL;
     WNDCLASS  wc;
     jboolean res;
 
+    if( 0 != threadid ) {
+        NativewindowCommon_throwNewRuntimeException(env, "Native threadid already created 0x%X", (int)threadid);
+        return JNI_FALSE;
+    }
+
 #ifdef UNICODE
     clazzName = NewtCommon_GetNullTerminatedStringChars(env, jClazzName);
 #else
@@ -146,7 +142,7 @@ Java_jogamp_nativewindow_windows_GDIUtil_CreateWindowClass
     if( GetClassInfo( hInstance,  clazzName, &wc ) ) {
         // registered already
         res = JNI_TRUE;
-    } else {      
+    } else {
         // register now
         ZeroMemory( &wc, sizeof( wc ) );
         wc.style = CS_HREDRAW | CS_VREDRAW ;
@@ -168,26 +164,16 @@ Java_jogamp_nativewindow_windows_GDIUtil_CreateWindowClass
     (*env)->ReleaseStringUTFChars(env, jClazzName, clazzName);
 #endif
 
-    if(res == JNI_TRUE)
-      {
-	volatile BOOL threadReady = FALSE;
-	ThreadParam tParam = {0};
-	tParam.threadReady = &threadReady;
-
-	CreateThread(NULL, 0, ThreadFunc, (LPVOID)&tParam, 0, &(threadid));
-	if(threadid)
-	  {
-	    while(1)
-	      {
-		if(threadReady)
-		  break;
-	      }
-	  }
-	else
-	  {
-	    res = JNI_FALSE;
-	  }
-      }
+    if( JNI_TRUE == res ) {
+        ThreadParam tParam = {0};
+
+        CreateThread(NULL, 0, ThreadFunc, (LPVOID)&tParam, 0, (DWORD *)&threadid);
+        if(threadid) {
+            while(!tParam.threadReady) { /* nop */ }
+        } else {
+            res = JNI_FALSE;
+        }
+    }
 
     return res;
 }
@@ -219,6 +205,11 @@ Java_jogamp_nativewindow_windows_GDIUtil_DestroyWindowClass
     (*env)->ReleaseStringUTFChars(env, jClazzName, clazzName);
 #endif
 
+    if( 0 == threadid ) {
+        NativewindowCommon_throwNewRuntimeException(env, "Native threadid zero 0x%X", (int)threadid);
+        return JNI_FALSE;
+    }
+
     PostThreadMessage(threadid, TM_STOP, 0, 0);
 
     return res;
@@ -233,17 +224,21 @@ JNIEXPORT jlong JNICALL
 Java_jogamp_nativewindow_windows_GDIUtil_CreateDummyWindowAndMessageLoop
     (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jWndClassName, jstring jWndName, jint x, jint y, jint width, jint height) 
 {
-  volatile HWND hWnd = 0;
-  volatile BOOL threadReady = FALSE;
-  ThreadParam tParam = {0};
-
-  tParam.jHInstance = jHInstance;
-  tParam.x = x;
-  tParam.y = y;
-  tParam.width = width;
-  tParam.height = height;
-  tParam.hWndPtr = &hWnd;
-  tParam.threadReady = &threadReady;
+    volatile HWND hWnd = 0;
+    ThreadParam tParam = {0};
+
+    if( 0 == threadid ) {
+        NativewindowCommon_throwNewRuntimeException(env, "Native threadid zero 0x%X", (int)threadid);
+        return JNI_FALSE;
+    }
+
+    tParam.jHInstance = jHInstance;
+    tParam.x = x;
+    tParam.y = y;
+    tParam.width = width;
+    tParam.height = height;
+    tParam.hWnd = hWnd;
+    tParam.threadReady = FALSE;
 
 #ifdef UNICODE
     tParam.wndClassName = NewtCommon_GetNullTerminatedStringChars(env, jWndClassName);
@@ -253,13 +248,9 @@ Java_jogamp_nativewindow_windows_GDIUtil_CreateDummyWindowAndMessageLoop
     tParam.wndName = (*env)->GetStringUTFChars(env, jWndName, NULL);
 #endif
 
-  PostThreadMessage(threadid, TM_OPENWIN, (WPARAM)&tParam, 0);
+    PostThreadMessage(threadid, TM_OPENWIN, (WPARAM)&tParam, 0);
 
-  while(1)
-    {
-      if(threadReady)
-	break;
-    }
+    while(!tParam.threadReady) { /* nop */ }
 
 #ifdef UNICODE
     free((void*) tParam.wndClassName);
@@ -269,7 +260,7 @@ Java_jogamp_nativewindow_windows_GDIUtil_CreateDummyWindowAndMessageLoop
     (*env)->ReleaseStringUTFChars(env, jWndName, tParam.wndName);
 #endif
 
-  return (jlong) (intptr_t) hWnd;
+    return (jlong) (intptr_t) hWnd;
 }
 
 /*   Java->C glue code:
@@ -345,9 +336,8 @@ JNIEXPORT jboolean JNICALL Java_jogamp_nativewindow_windows_GDIUtil_initIDs0
     return JNI_TRUE;
 }
 
-LRESULT CALLBACK DummyWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  return DefWindowProc(hWnd,uMsg,wParam,lParam);
+LRESULT CALLBACK DummyWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+    return DefWindowProc(hWnd,uMsg,wParam,lParam);
 }
 
 /*
@@ -358,7 +348,7 @@ LRESULT CALLBACK DummyWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 JNIEXPORT jlong JNICALL Java_jogamp_nativewindow_windows_GDIUtil_getDummyWndProc0
   (JNIEnv *env, jclass clazz)
 {
-  return (jlong) (intptr_t) DummyWndProc;
+    return (jlong) (intptr_t) DummyWndProc;
 }
 
 /*
@@ -415,21 +405,21 @@ JNIEXPORT jboolean JNICALL Java_jogamp_nativewindow_windows_GDIUtil_IsUndecorate
 JNIEXPORT jboolean JNICALL Java_jogamp_nativewindow_windows_GDIUtil_SendCloseMessage
 (JNIEnv *env, jclass unused, jlong jwin)
 {
-  ThreadParam tParam = {0};
-  volatile HWND hwnd = (HWND) (intptr_t) jwin;
-  volatile BOOL threadReady = FALSE;
+    ThreadParam tParam = {0};
+    volatile HWND hwnd = (HWND) (intptr_t) jwin;
 
-  tParam.hWndPtr = &(hwnd);
-  tParam.threadReady = &(threadReady);
+    if( 0 == threadid ) {
+        NativewindowCommon_throwNewRuntimeException(env, "Native threadid zero 0x%X", (int)threadid);
+        return JNI_FALSE;
+    }
 
-  PostThreadMessage(threadid, TM_CLOSEWIN, (WPARAM)&tParam, 0);
+    tParam.hWnd = hwnd;
+    tParam.threadReady = FALSE;
 
-  while(1)
-    {
-      if(threadReady)
-	break;
-    }
+    PostThreadMessage(threadid, TM_CLOSEWIN, (WPARAM)&tParam, 0);
 
-  return JNI_TRUE;
+    while(!tParam.threadReady) { /* nop */ }
+
+    return JNI_TRUE;
 }