Fix glfw usage of callUserCallback and add checks around it (#17441)

Supersedes #17438 and #17376.

Author: sbc100

src/library_glfw.js

@@ -80,7 +80,6 @@ var LibraryGLFW = {
     },
 
   $GLFW__deps: ['emscripten_get_now', '$GL', '$Browser', '$GLFW_Window',
-    '$callUserCallback',
     '$allocateUTF8',
 #if FILESYSTEM
     '$FS',
@@ -591,27 +590,23 @@ var LibraryGLFW = {
 
       if (!GLFW.active.windowSizeFunc) return;
 
-      callUserCallback(function() {
 #if USE_GLFW == 2
-        {{{ makeDynCall('vii', 'GLFW.active.windowSizeFunc') }}}(GLFW.active.width, GLFW.active.height);
+      {{{ makeDynCall('vii', 'GLFW.active.windowSizeFunc') }}}(GLFW.active.width, GLFW.active.height);
 #endif
 
 #if USE_GLFW == 3
-        {{{ makeDynCall('viii', 'GLFW.active.windowSizeFunc') }}}(GLFW.active.id, GLFW.active.width, GLFW.active.height);
+      {{{ makeDynCall('viii', 'GLFW.active.windowSizeFunc') }}}(GLFW.active.id, GLFW.active.width, GLFW.active.height);
 #endif
-      });
     },
 
     onFramebufferSizeChanged: function() {
       if (!GLFW.active) return;
 
       if (!GLFW.active.framebufferSizeFunc) return;
 
-      callUserCallback(function() {
 #if USE_GLFW == 3
-        {{{ makeDynCall('viii', 'GLFW.active.framebufferSizeFunc') }}}(GLFW.active.id, GLFW.active.width, GLFW.active.height);
+      {{{ makeDynCall('viii', 'GLFW.active.framebufferSizeFunc') }}}(GLFW.active.id, GLFW.active.width, GLFW.active.height);
 #endif
-      });
     },
 
     getTime: function() {
@@ -1132,7 +1127,7 @@ var LibraryGLFW = {
     Module["canvas"].addEventListener('drop', GLFW.onDrop, true);
     Module["canvas"].addEventListener('dragover', GLFW.onDragover, true);
 
-    Browser.resizeListeners.push(function(width, height) {
+    Browser.resizeListeners.push((width, height) => {
        GLFW.onCanvasResize(width, height);
     });
     return 1; // GL_TRUE

tests/browser/test_glfw3.c

@@ -41,6 +41,13 @@ assert(glfwSet##Function(Value) == Value); /* The previously set callback */
 assert(glfwSet##Function(Window, Value) == NULL);  /* Default value (no callback was set) */ \
 assert(glfwSet##Function(Window, Value) == Value); /* The previously set callback */
 
+static int exited = 0;
+
+__attribute__((destructor))
+void onExit() {
+  exited = 1;
+}
+
 int main()
 {
     GLFWwindow *window;
@@ -121,9 +128,11 @@ int main()
         glfwSetWindowSize(window, 1, 1);
         glfwGetWindowSize(window, &w, &h);
         assert(w == 1 && h == 1);
+        assert(exited == 0);
 
         glfwSetWindowSize(window, 640, 480);
         glfwGetFramebufferSize(window, &w, &h);
+        assert(exited == 0);
 
         // XXX: not implemented
         // glfwIconifyWindow(window);