mir/Proton
2
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton synced 2025-09-05 09:15:11 +00:00
Code Issues Releases Wiki Activity

lsteamclient: Explicitly specify alignment of sub-structs

Browse Source 
SteamNetConnectionInfo_t has 8-byte alignment on win32, but 4-byte on
Linux. Since we use the same struct on each in lsteamclient,
winSteamNetConnectionStatusChangedCallback_t_712's members would
incorrectly be aligned to 4-byte boundaries.
This commit is contained in:
Andrew Eikum
2019-05-30 15:20:14 -05:00
parent 5ed5cbf286
commit 381ab5f3dc
3 changed files with 68 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lsteamclient/gen_wrapper.py
View File

@@ -765,6 +765,16 @@ generated_cb_ids = []
cpp_files_need_close_brace = []
cb_table = {}
def get_field_attribute_str(field):
if field.type.kind != clang.cindex.TypeKind.RECORD:
return ""
win_struct = find_windows_struct(field.type)
if win_struct is None:
align = field.type.get_align()
else:
align = win_struct.get_align()
return " __attribute__((aligned(" + str(align) + ")))"
#because of struct packing differences between win32 and linux, we
#need to convert these structs from their linux layout to the win32
#layout.
@@ -799,7 +809,7 @@ def handle_struct(sdkver, struct):
m.type.get_pointee().kind == clang.cindex.TypeKind.FUNCTIONPROTO:
to_file.write(" void *%s; /*fn pointer*/\n" % m.displayname)
else:
to_file.write(" %s %s;\n" % (m.type.spelling, m.displayname))
to_file.write(" %s %s%s;\n" % (m.type.spelling, m.displayname, get_field_attribute_str(m)))
to_file.write("} __attribute__ ((ms_struct));\n")
to_file.write("#pragma pack( pop )\n")