[Wasm64] Fix -sFETCH build and add some basic testing (#17432)

Fixes: #17414

Author: sbc100

src/Fetch.js

@@ -460,14 +460,14 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #endif
     {{{ runtimeKeepalivePop() }}}
     callUserCallback(() => {
-      if (onsuccess) {{{ makeDynCall('vi', 'onsuccess') }}}(fetch);
+      if (onsuccess) {{{ makeDynCall('vp', 'onsuccess') }}}(fetch);
       else if (successcb) successcb(fetch);
     }, fetchAttrSynchronous);
   };
 
   var reportProgress = (fetch, xhr, e) => {
     callUserCallback(() => {
-      if (onprogress) {{{ makeDynCall('vi', 'onprogress') }}}(fetch);
+      if (onprogress) {{{ makeDynCall('vp', 'onprogress') }}}(fetch);
       else if (progresscb) progresscb(fetch);
     }, fetchAttrSynchronous);
   };
@@ -478,7 +478,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #endif
     {{{ runtimeKeepalivePop() }}}
     callUserCallback(() => {
-      if (onerror) {{{ makeDynCall('vi', 'onerror') }}}(fetch);
+      if (onerror) {{{ makeDynCall('vp', 'onerror') }}}(fetch);
       else if (errorcb) errorcb(fetch);
     }, fetchAttrSynchronous);
   };
@@ -488,7 +488,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
     console.log('fetch: ready state change. e: ' + e);
 #endif
     callUserCallback(() => {
-      if (onreadystatechange) {{{ makeDynCall('vi', 'onreadystatechange') }}}(fetch);
+      if (onreadystatechange) {{{ makeDynCall('vp', 'onreadystatechange') }}}(fetch);
       else if (readystatechangecb) readystatechangecb(fetch);
     }, fetchAttrSynchronous);
   };
@@ -511,7 +511,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #endif
       {{{ runtimeKeepalivePop() }}}
       callUserCallback(() => {
-        if (onsuccess) {{{ makeDynCall('vi', 'onsuccess') }}}(fetch);
+        if (onsuccess) {{{ makeDynCall('vp', 'onsuccess') }}}(fetch);
         else if (successcb) successcb(fetch);
       }, fetchAttrSynchronous);
     };
@@ -521,7 +521,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #endif
       {{{ runtimeKeepalivePop() }}}
       callUserCallback(() => {
-        if (onsuccess) {{{ makeDynCall('vi', 'onsuccess') }}}(fetch);
+        if (onsuccess) {{{ makeDynCall('vp', 'onsuccess') }}}(fetch);
         else if (successcb) successcb(fetch);
       }, fetchAttrSynchronous);
     };

src/library_fetch.js

@@ -13,7 +13,9 @@ var LibraryFetch = {
   $Fetch__postset: 'Fetch.staticInit();',
 #endif
   $Fetch: Fetch,
+  _emscripten_fetch_get_response_headers_length__sig: 'pi',
   _emscripten_fetch_get_response_headers_length: fetchGetResponseHeadersLength,
+  _emscripten_fetch_get_response_headers__sig: 'pipp',
   _emscripten_fetch_get_response_headers: fetchGetResponseHeaders,
   _emscripten_fetch_free: fetchFree,
 
@@ -24,6 +26,7 @@ var LibraryFetch = {
 #endif
   $fetchXHR: fetchXHR,
 
+  emscripten_start_fetch__sig: 'vp',
   emscripten_start_fetch: startFetch,
   emscripten_start_fetch__deps: [
     '$Fetch',

system/include/emscripten/fetch.h

@@ -137,7 +137,7 @@ typedef struct emscripten_fetch_attr_t {
 
 typedef struct emscripten_fetch_t {
   // Unique identifier for this fetch in progress.
-  unsigned int id;
+  uint32_t id;
 
   // Custom data that can be tagged along the process.
   void *userData;

system/lib/fetch/emscripten_fetch.c

@@ -33,8 +33,8 @@ static void fetch_free(emscripten_fetch_t* fetch);
 
 // APIs defined in JS
 void emscripten_start_fetch(emscripten_fetch_t* fetch);
-int32_t _emscripten_fetch_get_response_headers_length(int32_t fetchID);
-int32_t _emscripten_fetch_get_response_headers(int32_t fetchID, int32_t dst, int32_t dstSizeBytes);
+size_t _emscripten_fetch_get_response_headers_length(int32_t fetchID);
+size_t _emscripten_fetch_get_response_headers(int32_t fetchID, char *dst, size_t dstSizeBytes);
 void _emscripten_fetch_free(unsigned int);
 
 typedef struct emscripten_fetch_queue {
@@ -254,13 +254,13 @@ EMSCRIPTEN_RESULT emscripten_fetch_close(emscripten_fetch_t* fetch) {
 size_t emscripten_fetch_get_response_headers_length(emscripten_fetch_t *fetch) {
   if (!fetch || fetch->readyState < STATE_HEADERS_RECEIVED) return 0;
 
-  return (size_t)_emscripten_fetch_get_response_headers_length((int32_t)fetch->id);
+  return (size_t)_emscripten_fetch_get_response_headers_length(fetch->id);
 }
 
 size_t emscripten_fetch_get_response_headers(emscripten_fetch_t *fetch, char *dst, size_t dstSizeBytes) {
   if (!fetch || fetch->readyState < STATE_HEADERS_RECEIVED) return 0;
 
-  return (size_t)_emscripten_fetch_get_response_headers((int32_t)fetch->id, (int32_t)dst, (int32_t)dstSizeBytes);
+  return (size_t)_emscripten_fetch_get_response_headers(fetch->id, dst, dstSizeBytes);
 }
 
 char **emscripten_fetch_unpack_response_headers(const char *headersString) {

tests/test_browser.py

@@ -106,6 +106,21 @@ def metafunc(self, with_wasm2js):
   return metafunc
 
 
+def also_with_wasm64(f):
+  assert callable(f)
+
+  def metafunc(self, with_wasm64):
+    if with_wasm64:
+      self.set_setting('MEMORY64', 2)
+      f(self)
+    else:
+      f(self)
+
+  metafunc._parameterize = {'': (False,),
+                            'wasm64': (True,)}
+  return metafunc
+
+
 def shell_with_script(shell_file, output_file, replacement):
   shell = read_file(path_from_root('src', shell_file))
   create_file(output_file, shell.replace('{{{ SCRIPT }}}', replacement))
@@ -4626,6 +4641,7 @@ def test_fetch_stream_file(self):
     self.btest_exit('fetch/stream_file.cpp',
                     args=['-sFETCH_DEBUG', '-sFETCH', '-sINITIAL_MEMORY=536870912'])
 
+  @also_with_wasm64
   def test_fetch_headers_received(self):
     self.btest_exit('fetch/headers_received.cpp', args=['-sFETCH_DEBUG', '-sFETCH'])