Use orientationIndex enum from header. NFC (#21550)

Author: cwoffenden

src/generated_struct_info32.json

@@ -185,6 +185,7 @@
         "EMSCRIPTEN_FULLSCREEN_SCALE_CENTER": 3,
         "EMSCRIPTEN_FULLSCREEN_SCALE_DEFAULT": 0,
         "EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH": 1,
+        "EMSCRIPTEN_ORIENTATION_UNSUPPORTED": 0,
         "EMSCRIPTEN_RESULT_DEFERRED": 1,
         "EMSCRIPTEN_RESULT_FAILED": -6,
         "EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED": -2,

src/generated_struct_info64.json

@@ -185,6 +185,7 @@
         "EMSCRIPTEN_FULLSCREEN_SCALE_CENTER": 3,
         "EMSCRIPTEN_FULLSCREEN_SCALE_DEFAULT": 0,
         "EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH": 1,
+        "EMSCRIPTEN_ORIENTATION_UNSUPPORTED": 0,
         "EMSCRIPTEN_RESULT_DEFERRED": 1,
         "EMSCRIPTEN_RESULT_FAILED": -6,
         "EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED": -2,

src/library_html5.js

@@ -940,7 +940,7 @@ var LibraryHTML5 = {
     // alternative selection from OrientationLockType enum
     var orientationsType2 = ['portrait',         'portrait',           'landscape',         'landscape'];
 
-    var orientationIndex = 0;
+    var orientationIndex = {{{ cDefs.EMSCRIPTEN_ORIENTATION_UNSUPPORTED }}};
     var orientationAngle = 0;
     var screenOrientObj  = screenOrientation();
     if (typeof screenOrientObj === 'object') {

src/modules.mjs

@@ -300,7 +300,7 @@ const C_STRUCTS = new Proxy(structs, {
   get(target, prop, receiver) {
     if (!(prop in target)) {
       throw new Error(
-        `Missing C struct ${prop}! If you just added it to struct_info.json, you need to run ./tools/gen_struct_info.py`,
+        `Missing C struct ${prop}! If you just added it to struct_info.json, you need to run ./tools/maint/gen_struct_info.py (then run a second time with --wasm64)`,
       );
     }
     return target[prop];
@@ -311,7 +311,7 @@ const C_DEFINES = new Proxy(defines, {
   get(target, prop, receiver) {
     if (!(prop in target)) {
       throw new Error(
-        `Missing C define ${prop}! If you just added it to struct_info.json, you need to run ./tools/gen_struct_info.py`,
+        `Missing C define ${prop}! If you just added it to struct_info.json, you need to run ./tools/maint/gen_struct_info.py (then run a second time with --wasm64)`,
       );
     }
     return target[prop];

src/struct_info.json

@@ -785,7 +785,9 @@
 
             "EMSCRIPTEN_DEVICE_MOTION_EVENT_SUPPORTS_ACCELERATION",
             "EMSCRIPTEN_DEVICE_MOTION_EVENT_SUPPORTS_ACCELERATION_INCLUDING_GRAVITY",
-            "EMSCRIPTEN_DEVICE_MOTION_EVENT_SUPPORTS_ROTATION_RATE"
+            "EMSCRIPTEN_DEVICE_MOTION_EVENT_SUPPORTS_ROTATION_RATE",
+
+            "EMSCRIPTEN_ORIENTATION_UNSUPPORTED"
         ],
         "structs": {
             "EmscriptenKeyboardEvent": [

test/test_other.py

@@ -14027,13 +14027,13 @@ def test_missing_struct_info(self):
       {{{ C_STRUCTS.Foo }}}
     ''')
     err = self.expect_fail([EMCC, test_file('hello_world.c'), '--js-library=lib.js'])
-    self.assertContained('Error: Missing C struct Foo! If you just added it to struct_info.json, you need to run ./tools/gen_struct_info.py', err)
+    self.assertContained('Error: Missing C struct Foo! If you just added it to struct_info.json, you need to run ./tools/maint/gen_struct_info.py (then run a second time with --wasm64)', err)
 
     create_file('lib.js', '''
       {{{ C_DEFINES.Foo }}}
     ''')
     err = self.expect_fail([EMCC, test_file('hello_world.c'), '--js-library=lib.js'])
-    self.assertContained('Error: Missing C define Foo! If you just added it to struct_info.json, you need to run ./tools/gen_struct_info.py', err)
+    self.assertContained('Error: Missing C define Foo! If you just added it to struct_info.json, you need to run ./tools/maint/gen_struct_info.py (then run a second time with --wasm64)', err)
 
   def run_wasi_test_suite_test(self, name):
     if not os.path.exists(path_from_root('test/third_party/wasi-test-suite')):