Fix regression of commit 47dc069104723f3d2e8d9ebdd700182e067163d0: Lock shared surface before using it's HDC for pbuffer creation

3 files changed, 144 insertions, 134 deletions

diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index ecb4e4987..308da5834 100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -31,7 +31,7 @@ REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.TestWindows01NE
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT
-scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot %1 %2 %3 %4 %5 %6
+REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot %1 %2 %3 %4 %5 %6
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot %1 %2 %3 %4 %5 %6
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.nativewindow.TestRecursiveToolkitLockCORE
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.parenting.TestParenting03AWT -time 100000
@@ -82,6 +82,7 @@ REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLDeb
 
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
+scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT
 
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.glsl.TestFBOMRTNEWT01
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 1797ff4fd..091bd350c 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -254,7 +254,7 @@ function testswt() {
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02AWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting03AWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingFocusTraversal01AWT $*
-testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer01GLCanvasAWT $*
+#testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer01GLCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer02NewtCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestTranslucentParentingAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT
@@ -288,7 +288,7 @@ testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer0
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo02 $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
 
 #
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
index 740fb5466..0988f3eca 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
@@ -41,6 +41,7 @@
 package jogamp.opengl.windows.wgl;
 
 import javax.media.nativewindow.NativeSurface;
+import javax.media.nativewindow.NativeWindowException;
 import javax.media.nativewindow.SurfaceChangeable;
 import javax.media.opengl.GL;
 import javax.media.opengl.GLContext;
@@ -117,143 +118,151 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
   private void createPbuffer() {
     WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) getNativeSurface().getGraphicsConfiguration();
     SharedResource sharedResource = ((WindowsWGLDrawableFactory)factory).getOrCreateSharedResource(config.getScreen().getDevice());
-    long parentHdc = sharedResource.getDrawable().getNativeSurface().getSurfaceHandle();
-    WGLExt wglExt = sharedResource.getContext().getWGLExt();
-    
-    if (DEBUG) {
-        System.out.println("Pbuffer config: " + config);
-    }
-
-    int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
-    float[] fattributes = new float[1];
-    int[]   floatModeTmp = new int[1];
-    int     niattribs   = 0;
-    int     width, height;
-
-    GLCapabilitiesImmutable chosenCaps = (GLCapabilitiesImmutable)config.getChosenCapabilities();
-    GLProfile glProfile = chosenCaps.getGLProfile();
-
-    if (DEBUG) {
-      System.out.println("Pbuffer parentHdc = " + toHexString(parentHdc));
-      System.out.println("Pbuffer chosenCaps: " + chosenCaps);
-    }
-
-    if(!WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(chosenCaps,
-                                    iattributes, sharedResource, -1, floatModeTmp)){
-      throw new GLException("Pbuffer-related extensions not supported");
-    }
-
-    floatMode = floatModeTmp[0];
-    boolean rtt      = chosenCaps.getPbufferRenderToTexture();
-    boolean rect     = chosenCaps.getPbufferRenderToTextureRectangle();
-    boolean useFloat = chosenCaps.getPbufferFloatingPointBuffers();
-    // boolean ati      = false;
-
-    /**
-    if (useFloat) {
-      ati = (floatMode == GLPbuffer.ATI_FLOAT);
-    } */
-
-    int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
-    int   nformats;
-    int[] nformatsTmp = new int[1];
-    if (!wglExt.wglChoosePixelFormatARB(parentHdc,
-                                        iattributes, 0,
-                                        fattributes, 0,
-                                        WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
-                                        pformats, 0,
-                                        nformatsTmp, 0)) {
-      throw new GLException("pbuffer creation error: wglChoosePixelFormat() failed");
-    }
-    nformats = nformatsTmp[0];
-    if (nformats <= 0) {
-      throw new GLException("pbuffer creation error: Couldn't find a suitable pixel format");
+    NativeSurface sharedSurface = sharedResource.getDrawable().getNativeSurface();
+    if (NativeSurface.LOCK_SURFACE_NOT_READY >= sharedSurface.lockSurface()) {
+      throw new NativeWindowException("Could not lock (sharedSurface): "+this);
     }
-
-    if (DEBUG) {
-      System.err.println("" + nformats + " suitable pixel formats found");
-      for (int i = 0; i < nformats; i++) {
-        WGLGLCapabilities dbgCaps = WindowsWGLGraphicsConfiguration.wglARBPFID2GLCapabilities(sharedResource, parentHdc, pformats[i], glProfile, false, true);
-        System.err.println("pixel format " + pformats[i] + " (index " + i + "): " + dbgCaps);
-      }
-    }
-
-    int pfdid = 0;
-    long tmpBuffer = 0;
-    {
-        int whichFormat;
-        // Loop is a workaround for bugs in NVidia's recent drivers
-        for (whichFormat = 0; whichFormat < nformats; whichFormat++) {
-          int format = pformats[whichFormat];
-
-          // Create the p-buffer.
-          niattribs = 0;
-
-          if (rtt) {
-            iattributes[niattribs++]   = WGLExt.WGL_TEXTURE_FORMAT_ARB;
-            if (useFloat) {
-              iattributes[niattribs++] = WGLExt.WGL_TEXTURE_FLOAT_RGB_NV;
-            } else {
-              iattributes[niattribs++] = WGLExt.WGL_TEXTURE_RGBA_ARB;
+    try {
+        long sharedHdc = sharedSurface.getSurfaceHandle();
+        WGLExt wglExt = sharedResource.getContext().getWGLExt();
+        
+        if (DEBUG) {
+            System.out.println("Pbuffer config: " + config);
+        }
+    
+        int[]   iattributes = new int  [2*WindowsWGLGraphicsConfiguration.MAX_ATTRIBS];
+        float[] fattributes = new float[1];
+        int[]   floatModeTmp = new int[1];
+        int     niattribs   = 0;
+        int     width, height;
+    
+        GLCapabilitiesImmutable chosenCaps = (GLCapabilitiesImmutable)config.getChosenCapabilities();
+        GLProfile glProfile = chosenCaps.getGLProfile();
+    
+        if (DEBUG) {
+          System.out.println("Pbuffer parentHdc = " + toHexString(sharedHdc));
+          System.out.println("Pbuffer chosenCaps: " + chosenCaps);
+        }
+    
+        if(!WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(chosenCaps,
+                                        iattributes, sharedResource, -1, floatModeTmp)){
+          throw new GLException("Pbuffer-related extensions not supported");
+        }
+    
+        floatMode = floatModeTmp[0];
+        boolean rtt      = chosenCaps.getPbufferRenderToTexture();
+        boolean rect     = chosenCaps.getPbufferRenderToTextureRectangle();
+        boolean useFloat = chosenCaps.getPbufferFloatingPointBuffers();
+        // boolean ati      = false;
+    
+        /**
+        if (useFloat) {
+          ati = (floatMode == GLPbuffer.ATI_FLOAT);
+        } */
+    
+        int[] pformats = new int[WindowsWGLGraphicsConfiguration.MAX_PFORMATS];
+        int   nformats;
+        int[] nformatsTmp = new int[1];
+        if (!wglExt.wglChoosePixelFormatARB(sharedHdc,
+                                            iattributes, 0,
+                                            fattributes, 0,
+                                            WindowsWGLGraphicsConfiguration.MAX_PFORMATS,
+                                            pformats, 0,
+                                            nformatsTmp, 0)) {
+          throw new GLException("pbuffer creation error: wglChoosePixelFormat() failed");
+        }
+        nformats = nformatsTmp[0];
+        if (nformats <= 0) {
+          throw new GLException("pbuffer creation error: Couldn't find a suitable pixel format");
+        }
+    
+        if (DEBUG) {
+          System.err.println("" + nformats + " suitable pixel formats found");
+          for (int i = 0; i < nformats; i++) {
+            WGLGLCapabilities dbgCaps = WindowsWGLGraphicsConfiguration.wglARBPFID2GLCapabilities(sharedResource, sharedHdc, pformats[i], glProfile, false, true);
+            System.err.println("pixel format " + pformats[i] + " (index " + i + "): " + dbgCaps);
+          }
+        }
+    
+        int pfdid = 0;
+        long tmpBuffer = 0;
+        {
+            int whichFormat;
+            // Loop is a workaround for bugs in NVidia's recent drivers
+            for (whichFormat = 0; whichFormat < nformats; whichFormat++) {
+              int format = pformats[whichFormat];
+    
+              // Create the p-buffer.
+              niattribs = 0;
+    
+              if (rtt) {
+                iattributes[niattribs++]   = WGLExt.WGL_TEXTURE_FORMAT_ARB;
+                if (useFloat) {
+                  iattributes[niattribs++] = WGLExt.WGL_TEXTURE_FLOAT_RGB_NV;
+                } else {
+                  iattributes[niattribs++] = WGLExt.WGL_TEXTURE_RGBA_ARB;
+                }
+    
+                iattributes[niattribs++] = WGLExt.WGL_TEXTURE_TARGET_ARB;
+                iattributes[niattribs++] = rect ? WGLExt.WGL_TEXTURE_RECTANGLE_NV : WGLExt.WGL_TEXTURE_2D_ARB;
+    
+                iattributes[niattribs++] = WGLExt.WGL_MIPMAP_TEXTURE_ARB;
+                iattributes[niattribs++] = GL.GL_FALSE;
+    
+                iattributes[niattribs++] = WGLExt.WGL_PBUFFER_LARGEST_ARB;
+                iattributes[niattribs++] = GL.GL_FALSE;
+              }
+    
+              iattributes[niattribs++] = 0;
+    
+              tmpBuffer = wglExt.wglCreatePbufferARB(sharedHdc, format, getWidth(), getHeight(), iattributes, 0);
+              if (tmpBuffer != 0) {
+                // Done
+                break;
+              }
             }
-
-            iattributes[niattribs++] = WGLExt.WGL_TEXTURE_TARGET_ARB;
-            iattributes[niattribs++] = rect ? WGLExt.WGL_TEXTURE_RECTANGLE_NV : WGLExt.WGL_TEXTURE_2D_ARB;
-
-            iattributes[niattribs++] = WGLExt.WGL_MIPMAP_TEXTURE_ARB;
-            iattributes[niattribs++] = GL.GL_FALSE;
-
-            iattributes[niattribs++] = WGLExt.WGL_PBUFFER_LARGEST_ARB;
-            iattributes[niattribs++] = GL.GL_FALSE;
+    
+            if (0 == tmpBuffer) {
+              throw new GLException("pbuffer creation error: wglCreatePbuffer() failed: tried " + nformats +
+                                    " pixel formats, last error was: " + wglGetLastError());
+            }
+            pfdid = pformats[whichFormat];
+        }
+    
+        // Get the device context.
+        long tmpHdc = wglExt.wglGetPbufferDCARB(tmpBuffer);
+        if (tmpHdc == 0) {
+          throw new GLException("pbuffer creation error: wglGetPbufferDC() failed");
+        }
+    
+        NativeSurface ns = getNativeSurface();
+        // Set up instance variables
+        buffer = tmpBuffer;
+        ((SurfaceChangeable)ns).setSurfaceHandle(tmpHdc);
+        cachedWGLExt = wglExt;   
+    
+        // Re-query chosen pixel format
+        {
+          WGLGLCapabilities newCaps = WindowsWGLGraphicsConfiguration.wglARBPFID2GLCapabilities(sharedResource, sharedHdc, pfdid, glProfile, false, true);
+          if(null == newCaps) {
+            throw new GLException("pbuffer creation error: unable to re-query chosen PFD ID: " + pfdid + ", hdc " + GLDrawableImpl.toHexString(tmpHdc));
           }
-
-          iattributes[niattribs++] = 0;
-
-          tmpBuffer = wglExt.wglCreatePbufferARB(parentHdc, format, getWidth(), getHeight(), iattributes, 0);
-          if (tmpBuffer != 0) {
-            // Done
-            break;
+          if(newCaps.isOnscreen() || !newCaps.isPBuffer()) {
+            throw new GLException("Error: Selected Onscreen Caps for PBuffer: "+newCaps);
           }
+          config.setCapsPFD(newCaps);
         }
-
-        if (0 == tmpBuffer) {
-          throw new GLException("pbuffer creation error: wglCreatePbuffer() failed: tried " + nformats +
-                                " pixel formats, last error was: " + wglGetLastError());
-        }
-        pfdid = pformats[whichFormat];
-    }
-
-    // Get the device context.
-    long tmpHdc = wglExt.wglGetPbufferDCARB(tmpBuffer);
-    if (tmpHdc == 0) {
-      throw new GLException("pbuffer creation error: wglGetPbufferDC() failed");
-    }
-
-    NativeSurface ns = getNativeSurface();
-    // Set up instance variables
-    buffer = tmpBuffer;
-    ((SurfaceChangeable)ns).setSurfaceHandle(tmpHdc);
-    cachedWGLExt = wglExt;   
-
-    // Re-query chosen pixel format
-    {
-      WGLGLCapabilities newCaps = WindowsWGLGraphicsConfiguration.wglARBPFID2GLCapabilities(sharedResource, parentHdc, pfdid, glProfile, false, true);
-      if(null == newCaps) {
-        throw new GLException("pbuffer creation error: unable to re-query chosen PFD ID: " + pfdid + ", hdc " + GLDrawableImpl.toHexString(tmpHdc));
-      }
-      if(newCaps.isOnscreen() || !newCaps.isPBuffer()) {
-        throw new GLException("Error: Selected Onscreen Caps for PBuffer: "+newCaps);
-      }
-      config.setCapsPFD(newCaps);
+    
+        // Determine the actual width and height we were able to create.
+        int[] tmp = new int[1];
+        wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_WIDTH_ARB,  tmp, 0 );
+        width = tmp[0];
+        wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_HEIGHT_ARB, tmp, 0 );
+        height = tmp[0];
+        ((SurfaceChangeable)ns).surfaceSizeChanged(width, height);
+    } finally {
+        sharedSurface.unlockSurface();
     }
-
-    // Determine the actual width and height we were able to create.
-    int[] tmp = new int[1];
-    wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_WIDTH_ARB,  tmp, 0 );
-    width = tmp[0];
-    wglExt.wglQueryPbufferARB( buffer, WGLExt.WGL_PBUFFER_HEIGHT_ARB, tmp, 0 );
-    height = tmp[0];
-    ((SurfaceChangeable)ns).surfaceSizeChanged(width, height);
   }
 
   private static String wglGetLastError() {