Fix pack size related marshal issues.

.vscode/launch.json

@@ -0,0 +1,45 @@
+{
+	// 使用 IntelliSense 了解相关属性。 
+	// 悬停以查看现有属性的描述。
+	// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+
+		{
+			"name": "Debug generator",
+			"type": "debugpy",
+			"request": "launch",
+			"program": "${workspaceFolder}/CodeGen/Steamworks.NET_CodeGen.py",
+			"cwd": "${workspaceFolder}/CodeGen/",
+			"console": "integratedTerminal",
+			"justMyCode": true
+		},
+		{
+			"name": "Debug comparer",
+			"type": "debugpy",
+			"request": "launch",
+			"program": "${workspaceFolder}/CodeGen/SteamworksParser/compare_with_official.py",
+			"cwd": "${workspaceFolder}/CodeGen/SteamworksParser/",
+			"console": "integratedTerminal",
+			"justMyCode": true
+		},
+		{
+			"name": "Test pack size",
+			"type": "debugpy",
+			"request": "launch",
+			"program": "${workspaceFolder}/CodeGen/SteamworksParser/test_pack_size.py",
+			"cwd": "${workspaceFolder}/CodeGen/SteamworksParser/",
+			"console": "integratedTerminal",
+			"justMyCode": true
+		},
+		{
+			"name": "Debug parser",
+			"type": "debugpy",
+			"request": "launch",
+			"program": "${workspaceFolder}/CodeGen/SteamworksParser/debug_entrypoint.py",
+			"console": "integratedTerminal",
+			"cwd": "${workspaceFolder}/CodeGen/SteamworksParser/",
+			"justMyCode": true
+		}
+	]
+}

CodeGen/SteamworksParser/.editorconfig

@@ -0,0 +1,5 @@
+root = true
+charset = utf-8
+indent_size = 4
+indent_style = space
+tab_width = 4

CodeGen/SteamworksParser/.gitignore

@@ -0,0 +1,4 @@
+*.pyc
+__pycache__
+steamtest/
+bin

CodeGen/SteamworksParser/.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Debug parser",
+			"type": "debugpy",
+			"request": "launch",
+			"program": "${workspaceFolder}/debug_entrypoint.py",
+			"console": "integratedTerminal",
+			"cwd": "${workspaceFolder}",
+			"justMyCode": true
+		}
+	]
+}

CodeGen/SteamworksParser/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Riley Labrecque
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

CodeGen/SteamworksParser/README.md

@@ -0,0 +1,40 @@
+# SteamworksParser
+
+This is a simple parser for the [Steamworks](https://partner.steamgames.com/) header files.
+
+SteamworksParser is used to generate the [Steamworks.NET](https://github.com/rlabrecque/Steamworks.NET) bindings via [Steamworks.NET-CodeGen](https://github.com/rlabrecque/Steamworks.NET-CodeGen).
+
+You might be wondering why not just use something like libclang to parse the C++. The primary reason was that I wanted to retain comments and formating information.
+
+## Usage Example
+
+Pull this package into your project folder.
+
+```python
+    import sys
+    from SteamworksParser import steamworksparser
+
+    def main():
+        if len(sys.argv) != 2:
+            print('Usage: test.py <path/to/steamworks_sdk/sdk/public/steam/>')
+            return
+
+        steamworksparser.Settings.warn_utf8bom = True
+        steamworksparser.Settings.warn_includeguardname = True
+        steamworksparser.Settings.warn_spacing = True
+        parser = steamworksparser.parse(sys.argv[1])
+
+        with open('test.json', 'w') as out:
+            out.write('{\n')
+
+            out.write('    "typedefs":[\n')
+            for typedef in parser.typedefs:
+                out.write('        {\n')
+                out.write('            "typedef":"' + typedef.name + '",\n')
+                out.write('            "type":"' + typedef.type + '"\n')
+                out.write('        },\n')
+
+
+    if __name__ == '__main__':
+        main()
+```

CodeGen/SteamworksParser/compare_with_official.py

@@ -0,0 +1,88 @@
+from types import SimpleNamespace
+from steamworksparser import Struct, StructField, parse, Settings
+import os
+import json
+import itertools
+# Settings.print_skippedtypedefs = True
+# Settings.print_unuseddefines = True
+# Settings.warn_spacing = True
+# Settings.print_debug = True
+
+parser = parse("./steamtest") # put steam headers inside
+
+os.makedirs("./bin/compare-official", exist_ok=True)
+os.makedirs("./bin/native", exist_ok=True)
+
+
+mismatchCallbackDiagnostics:list[tuple[int, str, str]] = [] # (callbackid, message, code)
+matchCallbackIds: list[int] = []
+redundantCallbackIds: list[int] = []
+
+fieldsMatchedStructs: list[Struct] = []
+
+with open("./steamtest/steam_api.json") as f:
+    official = json.load(f, object_hook=lambda d: SimpleNamespace(**d))
+    flattenedCallbacks = [callback for file in parser.files for callback in file.callbacks]
+    flattenedStructs = [struct for file in parser.files for struct in file.structs]
+
+
+    for cb in flattenedCallbacks:
+        idParts = cb.callbackid.strip().split(' ')
+        idConst = parser.resolveConstValue(idParts[0].strip())
+        identity = None
+        if len(idParts) == 3:
+            identity = int(idConst.value) + int(idParts[2])
+        else:
+            identity = int(idConst.value)
+
+        officialCBs: list = official.callback_structs
+        officialCB = next((o for o in officialCBs if o.callback_id == identity), None)
+        diag = None
+        if officialCB is None:
+            redundantCallbackIds.append(identity)
+            continue
+        if officialCB.struct != cb.name and identity != 1108: # 1108 is shared between CL and GS
+            diag = (identity, f"Name mismatch, ours is `{cb.name}`, official one is `{officialCB.struct}`", 'E1')
+            mismatchCallbackDiagnostics.append(diag)
+            continue
+
+        if len(officialCB.fields) != len(cb.fields):
+            diag = (identity, f"Callback `{cb.name}`'s field count({len(cb.fields)}) is not execpted({len(officialCB.fields)})", 'E4')
+            continue
+
+        for i, fld in enumerate(officialCB.fields):
+            official_field = officialCB.fields[i]
+            our_field = cb.fields[i]
+
+            # compare name
+            if official_field.fieldname != our_field.name:
+                diag = (identity, f"field[{i}]'s name mismatch, `{official_field.fieldname}` expected, got `{our_field.name}`", 'E2')
+                break
+
+            def our_type_to_official_format(ourFld: StructField):
+                if ourFld.arraysize:
+                    return f"{ourFld.type} [{ourFld.arraysize}]"
+                else:
+                    return ourFld.type
+
+            # compare type
+            typeGot = our_type_to_official_format(our_field)
+            if official_field.fieldtype != typeGot:
+                arrayDiag = our_field.arraysize or "None"
+                diag = (identity, f"Callback {officialCB.struct} field[{i}] ({official_field.fieldname})'s type mismatch, "\
+                        f"`{official_field.fieldtype}` excepted, got `{our_field.name}: {typeGot}`", 'E3')
+                break
+
+        if diag is not None:
+            mismatchCallbackDiagnostics.append(diag)
+            continue
+
+with open("./bin/compare-official/result.txt", "w", encoding="utf-8") as compareF:
+    diagLines: list[str] = []
+    for diag in mismatchCallbackDiagnostics:
+        diagString = f"{diag[2]}: {diag[1]}.\n\tCallback id {diag[0]}."
+        diagLines.append(diagString)
+        print(diagString)
+
+    diagLines = [line + '\n' for line in diagLines]
+    compareF.writelines(diagLines)

CodeGen/SteamworksParser/debug_entrypoint.py

@@ -0,0 +1,41 @@
+from steamworksparser import parse, Settings
+import os
+import json
+import itertools
+# Settings.print_skippedtypedefs = True
+# Settings.print_unuseddefines = True
+# Settings.warn_spacing = True
+Settings.print_debug = True
+
+parser = parse("./steamtest") # put steam headers inside
+
+os.makedirs("bin/compare-official", exist_ok=True)
+os.makedirs("bin/native", exist_ok=True)
+
+with open("bin/native/pack-size-test.cpp", "w", encoding="utf-8") as f:
+    f.write("#include <iostream>\n")
+    f.write("#include \"steam_api.h\"\n")
+    f.write("#include \"steam_gameserver.h\"\n")
+    f.write("#include \"isteamgamecoordinator.h\"\n")
+    f.write("#include \"steamnetworkingfakeip.h\"\n")
+    f.write("#ifdef _MSC_VER\n")
+    f.write("#include \"fcntl.h\"\n")
+    f.write("#include \"io.h\"\n")
+    f.write("#endif\n")
+
+    f.write("int main() {\n")
+    f.write("#ifdef _MSC_VER\n")
+    f.write("fflush(stdout);\n")
+    f.write("_setmode(_fileno(stdout), _O_BINARY);\n")
+    f.write("#endif\n")
+    structInspectionTemplate = "std::cout << \"{0}\" << '\\t' << sizeof({0}) << '\\t' << alignof({0}) << '\\n';\n"
+    for interface in parser.files:
+        for s in interface.callbacks:
+            f.write(structInspectionTemplate.format(s.name))
+        for s in interface.structs:
+            if not s.should_not_generate():
+                f.write(structInspectionTemplate.format(s.name))
+
+    f.write('}')
+
+    # generated file still need some fix at 25/11/19