Improved box86 a bit, added an automation

CMakeLists.txt

@@ -382,7 +382,7 @@ endif()
 
 # If BOX86_ROOT contains a ".c", the build breaks...
 string(REPLACE ".c" "_private.h" MODROOT ${BOX86_ROOT})
-set(WRAPPEDS_HEAD "${BOX86_ROOT}/src/wrapped/wrappedd3dadapter9_gen.h")
+set(WRAPPEDS_HEAD "")
 foreach(A ${WRAPPEDS})
     string(REPLACE ".c" "_private.h" C ${A})
     string(REPLACE "${MODROOT}" "${BOX86_ROOT}" B ${C})

rebuild_wrappers.py

@@ -3,6 +3,8 @@
 import os
 import sys
 
+# Free values:
+# AB   F H J      QR T   XYZab    gh jk mno qrst   xyz
 values = ['E', 'e', 'v', 'c', 'w', 'i', 'I', 'C', 'W', 'u', 'U', 'f', 'd', 'D', 'K', 'l', 'L', 'p', 'V', 'O', 'S', '2', 'P', 'G', 'N', 'M']
 def splitchar(s):
 	try:
@@ -38,15 +40,25 @@ def main(root, defines, files, ver):
 	global values
 	
 	# Initialize variables: gbl for all values, redirects for redirections
-	gbl = {}
-	redirects = {}
+	# mytypedefs is a list of all functions per "*FE*" types per filename, mystructs of structures per filename
+	gbl        = {}
+	redirects  = {}
+	mytypedefs = {}
+	mystructs  = {}
+	mystructs_vals = {}
 	
 	# First read the files inside the headers
-	for filepath in files:
+	for filepath in files + [os.path.join(root, "src", "wrapped", "wrappedd3dadapter9_gen.h")]:
 		filename = filepath.split("/")[-1]
 		dependants = []
 		with open(filepath, 'r') as file:
 			for line in file:
+				def fail(s, causedby=None):
+					if causedby:
+						raise NotImplementedError(s + " ({0}:{1})".format(filename, line[:-1])) from causedby
+					else:
+						raise NotImplementedError(s + " ({0}:{1})".format(filename, line[:-1]))
+				
 				ln = line.strip()
 				# If the line is a `#' line (#ifdef LD80BITS/#ifndef LD80BITS/header)
 				if ln.startswith("#"):
@@ -74,26 +86,34 @@ def main(root, defines, files, ver):
 						elif preproc_cmd.startswith("else"):
 							dependants[-1] = invert(dependants[-1])
 						else:
-							raise NotImplementedError("Unknown preprocessor directive: {0} ({1}:{2})".format(
-								preproc_cmd.split(" ")[0], filename, line[:-1]
-							))
+							fail("Unknown preprocessor directive: {0}".format(preproc_cmd.split(" ")[0]))
 					except KeyError as k:
-						raise NotImplementedError("Unknown key: {0} ({1}:{2})".format(
-							k.args[0], filename, line[:-1]
-						), k)
+						fail("Unknown key: {0}".format(k.args[0]), k)
 				# If the line is a `GO...' line (GO/GOM/GO2/...)...
 				elif ln.startswith("GO"):
 					# ... then look at the second parameter of the line
+					gotype = ln.split("(")[0].strip()
+					funname = ln.split(",")[0].split("(")[1].strip()
 					ln = ln.split(",")[1].split(")")[0].strip()
 					
-					if ln[1] not in ["F"]:
-						raise NotImplementedError("Bad middle letter {0} ({1}:{2})".format(ln[1], filename, line[:-1]))
+					if len(ln) < 3:
+						fail("Type {0} too short".format(ln))
+					if "E" in ln:
+						if ("E" in ln[:2]) or ("E" in ln[3:]):
+							fail("emu64_t* not as the first parameter")
+						if len(ln) < 4:
+							fail("Type {0} too short".format(ln))
+					if ln[0] not in values:
+						fail("Invalid return type {0}".format(ln[0]))
+					
+					if ln[1] != "F":
+						fail("Bad middle letter {0}".format(ln[1]))
 					if any(c not in values for c in ln[2:]) or (('v' in ln[2:]) and (len(ln) > 3)):
 						old = ln
 						# This needs more work
 						acceptables = ['v', '0', '1'] + values
 						if any(c not in acceptables for c in ln[2:]):
-							raise NotImplementedError("{0} ({1}:{2})".format(ln[2:], filename, line[:-1]))
+							fail("Invalid type {0}".format(ln[2:]))
 						# Ok, this is acceptable: there is 0, 1 and/or void
 						ln = ln[:2] + (ln[2:]
 							.replace("v", "")   # void   -> nothing
@@ -105,6 +125,111 @@ def main(root, defines, files, ver):
 					gbl.setdefault(" && ".join(dependants), [])
 					if ln not in gbl[" && ".join(dependants)]:
 						gbl[" && ".join(dependants)].append(ln)
+					
+					if filename == "wrappedd3dadapter9_gen.h":
+						pass # Special case...
+					elif ln[2] == 'E':
+						if "//%%" in line:
+							# Do not dlsym functions containing "//%%" as metadata
+							pass
+						elif gotype == "GOS":
+							# Scan the rest of the line to extract the return structure ID
+							if filename[:-10] not in mystructs:
+								fail("No structure info in the file")
+							if "//%" not in line:
+								fail("Invalid GOS (missing structure ID info)")
+							if ln[0] != 'p':
+								fail("Invalid GOS return type ('{0}' and not 'p')".format(ln[0]))
+							#if (ln[2] != 'p') and ((ln[2] != 'E') or (ln[3] != 'p')): -> only allow pFEp for now
+							#	fail("Invalid GOS first parameter ('{0}' and not 'p' or 'Ep')".format(ln[2:4]))
+							if (ln[2] != 'E') or (ln[3] != 'p'):
+								fail("Invalid GOS first parameter ('{0}' and not 'Ep')".format(ln[2:4]))
+							
+							sid = line.split("//%")[1].split(" ")[0].strip()
+							if sid[0] == '{':
+								# Change type completely, not just the return type...
+								if sid[-1] != '}':
+									fail("Invalid type (EOL or space met, expected '}')")
+								if len(sid) < 5:
+									fail("Invalid type (Type {0} too short)".format(sid[1:-1]))
+								if sid[2] != "F":
+									fail("Invalid type (Bad middle letter {0})".format(sid[2]))
+								inval_char = lambda c:\
+									(c not in mystructs[filename[:-10]]) and (c not in acceptables) \
+									or (c == 'E') or (c == 'e')
+								if inval_char(sid[1]):
+									fail("Invalid type (Invalid return type {0})".format(sid[1]))
+								if any(map(inval_char, sid[3:-1])):
+									fail("Invalid type (Invalid type {0})".format(sid[3:-1]))
+								mytypedefs.setdefault(filename[:-10], {})
+								mytypedefs[filename[:-10]].setdefault(sid[1:-1], [])
+								mytypedefs[filename[:-10]][sid[1:-1]].append((0, funname))
+							else:
+								if len(sid) != 1:
+									fail("Invalid structure ID {0} (length is too big)".format(sid))
+								if sid not in mystructs[filename[:-10]]:
+									fail("Invalid structure ID {0} (unknown ID)".format(sid))
+								mytypedefs.setdefault(filename[:-10], {})
+								mytypedefs[filename[:-10]].setdefault(sid + "F" + ln[4:], [])
+								mytypedefs[filename[:-10]][sid + "F" + ln[4:]].append((1, funname))
+						elif "//%{" in line:
+							# Change type completely...
+							# ...Maybe?
+							if filename[:-10] not in mystructs:
+								fail("No structure info in the file")
+							
+							newtype = line.split("//%")[1].split(" ")[0].strip()
+							if newtype[-1] != '}':
+								fail("Invalid type (EOL or space met, expected '}')")
+							if len(newtype) < 5:
+								fail("Invalid type (Type {0} too short)".format(newtype[1:-1]))
+							if newtype[2] != "F":
+								fail("Invalid type (Bad middle letter {0})".format(newtype[2]))
+							inval_char = lambda c:\
+								(c not in mystructs[filename[:-10]]) and (c not in acceptables) \
+								or (c == 'E') or (c == 'e')
+							if inval_char(newtype[1]):
+								fail("Invalid type (Invalid return type {0})".format(newtype[1]))
+							if any(map(inval_char, newtype[3:-1])):
+								fail("Invalid type (Invalid type {0})".format(newtype[3:-1]))
+							mytypedefs.setdefault(filename[:-10], {})
+							mytypedefs[filename[:-10]].setdefault(newtype[1:-1], [])
+							mytypedefs[filename[:-10]][newtype[1:-1]].append((2, funname))
+						else:
+							# filename isn't stored with the '_private.h' part
+							if not filename.endswith('_private.h'):
+								fail("??? {0}".format(filename))
+							if len(ln) > 3:
+								ln = ln[:2] + ln[3:]
+							else:
+								ln = ln[:2] + "v"
+							mytypedefs.setdefault(filename[:-10], {})
+							mytypedefs[filename[:-10]].setdefault(ln, [])
+							mytypedefs[filename[:-10]][ln].append((3, funname))
+				elif ln.startswith("//%S"):
+					# Extract a structure ID-name pair
+					data = [s for s in map(lambda s: s.strip(), ln.split(" ")) if s != ""]
+					if len(data) != 3:
+						fail("Too much data ({0})".format(len(data)))
+					if not filename.endswith('_private.h'):
+						fail("??? {0}".format(filename))
+					if (data[0] != "//%S") or (len(data[1]) != 1):
+						fail("Invalid structure data {0} {1}".format(data[0], data[1]))
+					if data[1] in values:
+						fail("{0} cannot be used as a structure type".format(data[1]))
+					mystructs.setdefault(filename[:-10], {})
+					if data[1] in mystructs[filename[:-10]]:
+						fail("Duplicate structure ID {0} ({1}/{2})".format(data[1], mystructs[filename[:-10]], data[2]))
+					mystructs[filename[:-10]][data[1]] = data[2]
+					mystructs_vals.setdefault(filename[:-10], [])
+					mystructs_vals[filename[:-10]].append(data[1])
+	
+	if ("" not in gbl) or ("" not in redirects):
+		print("\033[1;31mThere is suspiciously not many types...\033[m")
+		print("Check the CMakeLists.txt file. If you are SURE there is nothing wrong"
+			  " (as a random example, `set()` resets the variable...), then comment out the following return.")
+		print("(Also, the program WILL crash later if you proceed.)")
+		return 2 # Check what you did, not proceeding
 	
 	gbl_vals = {}
 	for k in gbl:
@@ -184,17 +309,35 @@ def main(root, defines, files, ver):
 		gbl[k].sort(key=lambda v: splitchar(v))
 	values = values + ['0', '1']
 	for k in redirects:
-		redirects[k].sort(key=lambda v: splitchar(v[0]) + [0] + splitchar(v[1]))
+		redirects[k].sort(key=lambda v: splitchar(v[0]) + [-1] + splitchar(v[1]))
 	values = values[:-2]
+	mytypedefs_vals = {}
+	for fn in mytypedefs:
+		if fn in mystructs:
+			values = values + list(mystructs[fn].keys())
+		mytypedefs_vals[fn] = sorted(mytypedefs[fn].keys(), key=lambda v: splitchar(v))
+		if fn in mystructs:
+			values = values[:-len(mystructs[fn])]
+		for v in mytypedefs_vals[fn]:
+			mytypedefs[fn][v].sort()
 	
 	# Check if there was any new functions
 	functions_list = ""
 	for k in ["()"] + gbl_idxs:
 		for v in gbl[k]:
 			functions_list = functions_list + "#" + k + " " + v + "\n"
-	for k in (["()"] if "()" in redirects else []) + redirects_idxs:
+	for k in ["()"] + redirects_idxs:
 		for v in redirects[k]:
 			functions_list = functions_list + "#" + k + " " + v[0] + " -> " + v[1] + "\n"
+	for fn in sorted(mystructs.keys()):
+		for t in mystructs_vals[fn]:
+			# Structure Definition
+			functions_list = functions_list + fn + "/Sd" + t + mystructs[fn][t] + "\n"
+	for fn in sorted(mytypedefs.keys()):
+		for t in mytypedefs_vals[fn]:
+			# Structure Usage
+			for tnum, f in mytypedefs[fn][t]:
+				functions_list = functions_list + fn + "/Su" + t + str(tnum) + f + "\n"
 	
 	# functions_list is a unique string, compare it with the last run
 	try:
@@ -205,16 +348,16 @@ def main(root, defines, files, ver):
 			# Mark as OK for CMake
 			with open(os.path.join(root, "src", "wrapped", "generated", "functions_list.txt"), 'w') as file:
 				file.write(functions_list)
-			#return 0
+			return 0
 	except IOError:
 		# The file does not exist yet, first run
 		pass
 	
 	# Now the files rebuilding part
-	# File headers and guards
-	files_headers = {
+	# Files header and guard
+	files_header = {
 		"wrapper.c": """/*****************************************************************
- * File automatically generated by rebuild_wrappers.py (v%s)
+ * File automatically generated by rebuild_wrappers.py (v{version})
  *****************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
@@ -226,23 +369,23 @@ def main(root, defines, files, ver):
 #include "regs.h"
 #include "x86emu.h"
 
-typedef union ui64_s {
+typedef union ui64_s {lbr}
     int64_t     i;
     uint64_t    u;
     uint32_t    d[2];
-} ui64_t;
+{rbr} ui64_t;
 
-typedef struct _2uint_struct_s {
+typedef struct _2uint_struct_s {lbr}
 	uint32_t	a;
 	uint32_t	b;
-} _2uint_struct_t;
+{rbr} _2uint_struct_t;
 
 extern void* my__IO_2_1_stderr_;
 extern void* my__IO_2_1_stdin_ ;
 extern void* my__IO_2_1_stdout_;
 
 static void* io_convert(void* v)
-{
+{lbr}
 	if(!v)
 		return v;
 	if(v==my__IO_2_1_stderr_)
@@ -252,31 +395,31 @@ static void* io_convert(void* v)
 	if(v==my__IO_2_1_stdout_)
 		return stdout;
 	return v;
-}
+{rbr}
 
 typedef struct my_GValue_s
-{
+{lbr}
   int         g_type;
-  union {
+  union {lbr}
     int        v_int;
     int64_t    v_int64;
     uint64_t   v_uint64;
     float      v_float;
     double     v_double;
     void*      v_pointer;
-  } data[2];
-} my_GValue_t;
+  {rbr} data[2];
+{rbr} my_GValue_t;
 
 static void alignGValue(my_GValue_t* v, void* value)
-{
+{lbr}
     v->g_type = *(int*)value;
     memcpy(v->data, value+4, 2*sizeof(double));
-}
+{rbr}
 static void unalignGValue(void* value, my_GValue_t* v)
-{
+{lbr}
     *(int*)value = v->g_type;
     memcpy(value+4, v->data, 2*sizeof(double));
-}
+{rbr}
 
 void* VulkanFromx86(void* src, void** save);
 void VulkanTox86(void* src, void* save);
@@ -284,9 +427,10 @@ void VulkanTox86(void* src, void* save);
 #define ST0val ST0.d
 
 int of_convert(int);
+
 """,
 		"wrapper.h": """/*****************************************************************
- * File automatically generated by rebuild_wrappers.py (v%s)
+ * File automatically generated by rebuild_wrappers.py (v{version})
  *****************************************************************/
 #ifndef __WRAPPER_H_
 #define __WRAPPER_H_
@@ -317,58 +461,49 @@ typedef void (*wrapper_t)(x86emu_t* emu, uintptr_t fnc);
 // N = ... automatically sending 1 arg
 // M = ... automatically sending 2 args
 
+""",
+		"fntypes.h": """/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v{version})
+ *****************************************************************/
+#ifndef __{filename}TYPES_H_
+#define __{filename}TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
 """
 	}
-	files_guards = {"wrapper.c": """""",
+	files_guard = {"wrapper.c": """""",
 		"wrapper.h": """
-#endif //__WRAPPER_H_
+#endif // __WRAPPER_H_
+""",
+		"fntypes.h": """
+#endif // __{filename}TYPES_H_
 """
 	}
 	
-	# Rewrite the wrapper.h file:
-	with open(os.path.join(root, "src", "wrapped", "generated", "wrapper.h"), 'w') as file:
-		file.write(files_headers["wrapper.h"] % ver)
-		for v in gbl["()"]:
-			file.write("void " + v + "(x86emu_t *emu, uintptr_t fnc);\n")
-		for k in gbl_idxs:
-			file.write("\n#if " + k + "\n")
-			for v in gbl[k]:
-				file.write("void " + v + "(x86emu_t *emu, uintptr_t fnc);\n")
-			file.write("#endif\n")
-		file.write("\n")
-		if "()" in redirects:
-			for v in redirects["()"]:
-				file.write("void " + v[0] + "(x86emu_t *emu, uintptr_t fnc);\n")
-		for k in redirects_idxs:
-			file.write("\n#if " + k + "\n")
-			for v in redirects[k]:
-				file.write("void " + v[0] + "(x86emu_t *emu, uintptr_t fnc);\n")
-			file.write("#endif\n")
-		file.write(files_guards["wrapper.h"])
+	#           E            e             v       c         w          i          I          C          W           u           U           f        d         D              K         l           L            p        V        O          S        2                  P        G        N      M
+	tdtypes = ["x86emu_t*", "x86emu_t**", "void", "int8_t", "int16_t", "int32_t", "int64_t", "uint8_t", "uint16_t", "uint32_t", "uint64_t", "float", "double", "long double", "double", "intptr_t", "uintptr_t", "void*", "void*", "int32_t", "void*", "_2uint_struct_t", "void*", "void*", "...", "..."]
+	if len(values) != len(tdtypes):
+		raise NotImplementedError("len(values) = {lenval} != len(tdtypes) = {lentypes}".format(lenval=len(values), lentypes=len(tdtypes)))
+	def generate_typedefs(arr, file):
+		for v in arr:
+			file.write("typedef " + tdtypes[values.index(v[0])] + " (*" + v + "_t)"
+							+ "(" + ', '.join(tdtypes[values.index(t)] for t in v[2:]) + ");\n")
 	
 	# Rewrite the wrapper.c file:
 	with open(os.path.join(root, "src", "wrapped", "generated", "wrapper.c"), 'w') as file:
-		file.write(files_headers["wrapper.c"] % ver)
+		file.write(files_header["wrapper.c"].format(lbr="{", rbr="}", version=ver))
 		
 		# First part: typedefs
-		for v in gbl["()"]:
-			#         E            e             v       c         w          i          I          C          W           u           U           f        d         D              K         l           L            p        V        O          S        2         		 P        G        N      M
-			types = ["x86emu_t*", "x86emu_t**", "void", "int8_t", "int16_t", "int32_t", "int64_t", "uint8_t", "uint16_t", "uint32_t", "uint64_t", "float", "double", "long double", "double", "intptr_t", "uintptr_t", "void*", "void*", "int32_t", "void*", "_2uint_struct_t", "void*", "void*", "...", "..."]
-			if len(values) != len(types):
-					raise NotImplementedError("len(values) = {lenval} != len(types) = {lentypes}".format(lenval=len(values), lentypes=len(types)))
-			
-			file.write("typedef " + types[values.index(v[0])] + " (*" + v + "_t)"
-				+ "(" + ', '.join(types[values.index(t)] for t in v[2:]) + ");\n")
+		generate_typedefs(gbl["()"], file)
 		for k in gbl_idxs:
 			file.write("\n#if " + k + "\n")
-			for v in gbl[k]:
-				#         E            e             v       c         w          i          I          C          W           u           U           f        d         D              K         l           L            p        V        O          S        2      			 P        G        N      M
-				types = ["x86emu_t*", "x86emu_t**", "void", "int8_t", "int16_t", "int32_t", "int64_t", "uint8_t", "uint16_t", "uint32_t", "uint64_t", "float", "double", "long double", "double", "intptr_t", "uintptr_t", "void*", "void*", "int32_t", "void*", "_2uint_struct_t", "void*", "void*", "...", "..."]
-				if len(values) != len(types):
-						raise NotImplementedError("len(values) = {lenval} != len(types) = {lentypes}".format(lenval=len(values), lentypes=len(types)))
-				
-				file.write("typedef " + types[values.index(v[0])] + " (*" + v + "_t)"
-					+ "(" + ', '.join(types[values.index(t)] for t in v[2:]) + ");\n")
+			generate_typedefs(gbl[k], file)
 			file.write("#endif\n")
 		
 		file.write("\n")
@@ -488,16 +623,53 @@ typedef void (*wrapper_t)(x86emu_t* emu, uintptr_t fnc);
 				function_writer(file, v, v + "_t", v[0], v[2:])
 			file.write("#endif\n")
 		file.write("\n")
-		if "()" in redirects:
-			for v in redirects["()"]:
-				function_writer(file, v[0], v[1] + "_t", v[0][0], v[0][2:])
+		for v in redirects["()"]:
+			function_writer(file, v[0], v[1] + "_t", v[0][0], v[0][2:])
 		for k in redirects_idxs:
 			file.write("\n#if " + k + "\n")
 			for v in redirects[k]:
 				function_writer(file, v[0], v[1] + "_t", v[0][0], v[0][2:])
 			file.write("#endif\n")
 		
-		file.write(files_guards["wrapper.c"])
+		file.write(files_guard["wrapper.c"].format(lbr="{", rbr="}", version=ver))
+	
+	# Rewrite the wrapper.h file:
+	with open(os.path.join(root, "src", "wrapped", "generated", "wrapper.h"), 'w') as file:
+		file.write(files_header["wrapper.h"].format(lbr="{", rbr="}", version=ver))
+		for v in gbl["()"]:
+			file.write("void " + v + "(x86emu_t *emu, uintptr_t fnc);\n")
+		for k in gbl_idxs:
+			file.write("\n#if " + k + "\n")
+			for v in gbl[k]:
+				file.write("void " + v + "(x86emu_t *emu, uintptr_t fnc);\n")
+			file.write("#endif\n")
+		file.write("\n")
+		for v in redirects["()"]:
+			file.write("void " + v[0] + "(x86emu_t *emu, uintptr_t fnc);\n")
+		for k in redirects_idxs:
+			file.write("\n#if " + k + "\n")
+			for v in redirects[k]:
+				file.write("void " + v[0] + "(x86emu_t *emu, uintptr_t fnc);\n")
+			file.write("#endif\n")
+		file.write(files_guard["wrapper.h"].format(lbr="{", rbr="}", version=ver))
+	
+	for fn in mytypedefs:
+		with open(os.path.join(root, "src", "wrapped", "generated", fn + "types.h"), 'w') as file:
+			file.write(files_header["fntypes.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
+			if fn in mystructs:
+				values = values + mystructs_vals[fn]
+				tdtypes = tdtypes + [mystructs[fn][k] for k in mystructs_vals[fn]]
+			generate_typedefs(mytypedefs_vals[fn], file)
+			if fn in mystructs:
+				values = values[:-len(mystructs_vals[fn])]
+				tdtypes = tdtypes[:-len(mystructs_vals[fn])]
+			file.write("\n#define SUPER() ADDED_FUNCTIONS()")
+			for v in mytypedefs_vals[fn]:
+				for t, f in mytypedefs[fn][v]:
+					assert(t in [0, 1, 2, 3])
+					file.write(" \\\n\tGO({0}, {1}_t)".format(f, v))
+			file.write("\n")
+			file.write(files_guard["fntypes.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
 	
 	# Save the string for the next iteration, writing was successful
 	with open(os.path.join(root, "src", "wrapped", "generated", "functions_list.txt"), 'w') as file:

src/elfs/elfloader.c

@@ -679,7 +679,7 @@ Elf32_Sym* GetFunction(elfheader_t* h, const char* name)
     // TODO: create a hash on named to avoid this loop
     for (int i=0; i<h->numSymTab; ++i) {
         int type = ELF32_ST_TYPE(h->SymTab[i].st_info);
-        if(/*h->SymTab[i].st_info == 18*/type==STT_FUNC) {    // TODO: this "18" is probably defined somewhere
+        if(type==STT_FUNC) {
             const char * symname = h->StrTab+h->SymTab[i].st_name;
             if(strcmp(symname, name)==0) {
                 return h->SymTab+i;
@@ -693,7 +693,7 @@ Elf32_Sym* GetElfObject(elfheader_t* h, const char* name)
 {
     for (int i=0; i<h->numSymTab; ++i) {
         int type = ELF32_ST_TYPE(h->SymTab[i].st_info);
-        if(/*h->SymTab[i].st_info == 16*/type==STT_OBJECT) {
+        if(type==STT_OBJECT) {
             const char * symname = h->StrTab+h->SymTab[i].st_name;
             if(strcmp(symname, name)==0) {
                 return h->SymTab+i;

src/emu/rundc.h

@@ -38,7 +38,7 @@
         case 0xDD:
         case 0xDE:
         case 0xDF:  /* FCOMP */
-            fpu_fcom(emu, ST(nextop&7).d);  // TODO: is this ok?
+            fpu_fcom(emu, ST(nextop&7).d);
             fpu_do_pop(emu);
             break;
         case 0xE0:

src/emu/x86emu.c

@@ -17,6 +17,9 @@
 #include "x86run_private.h"
 #include "callback.h"
 #include "bridge.h"
+#ifdef HAVE_TRACE
+#include "x86trace.h"
+#endif
 #ifdef DYNAREC
 #include "custommem.h"
 #endif
@@ -357,8 +360,19 @@ void StopEmu(x86emu_t* emu, const char* reason)
     emu->quit = 1;
     printf_log(LOG_NONE, "%s", reason);
     // dump stuff...
-    printf_log(LOG_NONE, "CPU Regs=%s\n", DumpCPURegs(emu, R_EIP));
-    // TODO: stack, memory/instruction around EIP, etc..
+    printf_log(LOG_NONE, "\n==== CPU Registers ====\n%s\n", DumpCPURegs(emu, R_EIP));
+    printf_log(LOG_NONE, "\n======== Stack ========\nStack is from %lX to %lX\n", R_EBP, R_ESP);
+    if (R_EBP == R_ESP) {
+        printf_log(LOG_NONE, "EBP = ESP: leaf function detected; next 128 bytes should be either data or random.\n");
+    } else {
+        // TODO: display stack if operation should be allowed (to avoid crashes)
+        /* for (uint32_t *sp = R_EBP; sp >= R_ESP; --sp) {
+        } */
+    }
+    printf_log(LOG_NONE, "\n====== Past data ======\nOld IP: %tX\n", emu->old_ip);
+#ifdef HAVE_TRACE
+    printf_log(LOG_NONE, "%s\n", DecodeX86Trace(my_context->dec, emu->old_ip));
+#endif
 }
 
 void UnimpOpcode(x86emu_t* emu)
@@ -442,11 +456,11 @@ static inline void init_perfcounters (int32_t do_reset, int32_t enable_divider)
 uint64_t ReadTSC(x86emu_t* emu)
 {
     // Read the TimeStamp Counter as 64bits.
-    // this is supposed to be the number of instrunctions executed since last reset
+    // this is supposed to be the number of instructions executed since last reset
 #if defined(__i386__)
-  uint64_t ret;
-  __asm__ volatile("rdtsc" : "=A"(ret));
-  return ret;
+    uint64_t ret;
+    __asm__ volatile("rdtsc" : "=A"(ret));
+    return ret;
 #if 0
 #elif defined(__ARM_ARCH)
 #if (__ARM_ARCH >= 6)
@@ -462,15 +476,15 @@ uint64_t ReadTSC(x86emu_t* emu)
 #endif
 #endif
 #endif
-// fall back to gettime...
+    // fall back to gettime...
 #ifndef NOGETCLOCK
-  struct timespec ts;
-  clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
-  return (uint64_t)(ts.tv_sec) * 1000000000LL + ts.tv_nsec;
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
+    return (uint64_t)(ts.tv_sec) * 1000000000LL + ts.tv_nsec;
 #else
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return (uint64_t)(tv.tv_sec) * 1000000 + tv.tv_usec;
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (uint64_t)(tv.tv_sec) * 1000000 + tv.tv_usec;
 #endif
 }
 

src/emu/x86run_private.c

@@ -48,8 +48,6 @@ void EXPORT my___libc_init(x86emu_t* emu, void* raw_args __unused, void (*onexit
 #else
 int32_t EXPORT my___libc_start_main(x86emu_t* emu, int *(main) (int, char * *, char * *), int argc, char * * ubp_av, void (*init) (void), void (*fini) (void), void (*rtld_fini) (void), void (* stack_end))
 {
-    //TODO: register rtld_fini
-    //TODO: register fini
     // let's cheat and set all args...
     Push(emu, (uint32_t)my_context->envv);
     Push(emu, (uint32_t)my_context->argv);

src/librarian/librarian.c

@@ -566,7 +566,12 @@ const char* FindSymbolName(lib_t *maplib, void* p, void** start, uint32_t* sz, c
             *base = GetBaseAddress(h);
         return ret;
     }
-    // TODO: then search in the other libs...
+    // TODO: find if cyclic references exists (should also fix MapLibAddMapLib)
+    /* for (int i = 0; i < maplib->libsz; ++i) {
+        // if (maplib == maplib->libraries[i]->maplib) continue;
+        const char *nameInLib = FindSymbolName(maplib->libraries[i]->maplib, p, start, sz, libname, base);
+        if (nameInLib) return nameInLib;
+    } */
     return NULL;
 }
 

src/tools/box86stack.c

@@ -93,7 +93,7 @@ void SetupInitialStack(x86emu_t *emu)
 
     // push some AuxVector stuffs
     PushString(emu, "i686");
-    uintptr_t p_386 = R_ESP;
+    uintptr_t p_i686 = R_ESP;
     uintptr_t p_random = real_getauxval(25);
     if(!p_random) {
         for (int i=0; i<4; ++i)
@@ -106,28 +106,57 @@ void SetupInitialStack(x86emu_t *emu)
     R_ESP=tmp;
 
     // push the AuxVector themselves
-    Push(emu, 0); Push(emu, 0);         //AT_NULL(0)=0
-    Push(emu, p_386); Push(emu, 15);    //AT_PLATFORM(15)=p_386*
-    Push(emu, 0); Push(emu, 66);        //AT_HWCAP2(26)=0
+    /*
+    00: 00000000
+    03: 08048034
+    04: 00000020
+    05: 0000000b
+    06: 00001000
+    07: f7fc0000
+    08: 00000000
+    09: 08049060
+    11: 000003e8
+    12: 000003e8
+    13: 000003e8
+    14: 000003e8
+    15: ffd8aa5b/i686
+    16: bfebfbff
+    17: 00000064
+    23: 00000000
+    25: ffd8aa4b
+    26: 00000000
+    31: ffd8bfeb/./testAuxVec
+    32: f7fbfb40
+    33: f7fbf000
+    */
+    Push(emu, 0); Push(emu, 0);                         //AT_NULL(0)=0
+    //Push(emu, ); Push(emu, 3);                          //AT_PHDR(3)=address of the PH of the executable
+    //Push(emu, ); Push(emu, 4);                          //AT_PHENT(4)=size of PH entry
+    //Push(emu, ); Push(emu, 5);                          //AT_PHNUM(5)=number of elf headers
+    Push(emu, box86_pagesize); Push(emu, 6);            //AT_PAGESZ(6)
+    //Push(emu, real_getauxval(7)); Push(emu, 7);         //AT_BASE(7)=ld-2.27.so start (in memory)
+    Push(emu, 0); Push(emu, 8);                         //AT_FLAGS(8)=0
+    Push(emu, R_EIP); Push(emu, 9);                     //AT_ENTRY(9)=entrypoint
+    Push(emu, real_getauxval(11)); Push(emu, 11);       //AT_UID(11)
+    Push(emu, real_getauxval(12)); Push(emu, 12);       //AT_EUID(12)
+    Push(emu, real_getauxval(13)); Push(emu, 13);       //AT_GID(13)
+    Push(emu, real_getauxval(14)); Push(emu, 14);       //AT_EGID(14)
+    Push(emu, p_i686); Push(emu, 15);                   //AT_PLATFORM(15)=&"i686"
     // Push HWCAP:
-    //  FPU: 1<<0 ; VME: 1<<1 ; DE : 1<<2 ; PSE: 1<<3 ; TSC: 1<<4
-    //  MSR: 1<<5 : PAE: 1<<6 : MCE: 1<<7 ; CX8: 1<<8 : APIC:1<<9
-    //  SEP: 1<<11: MTRR:1<<12: PGE: 1<<13: MCA: 1<<14; CMOV:1<<15; FCMOV: 1<<16
-    //  MMX: 1<<23:OSFXR:1<<24: XMM: 1<<25:XMM2: 1<<26;AMD3D:1<<31
+    //  FPU: 1<<0 ; VME: 1<<1 ; DE : 1<<2 ; PSE: 1<<3 ; TSC: 1<<4 ; MSR: 1<<5 ; PAE: 1<<6 ; MCE: 1<<7
+    //  CX8: 1<<8 ; APIC:1<<9 ;             SEP: 1<<11; MTRR:1<<12; PGE: 1<<13; MCA: 1<<14; CMOV:1<<15
+    // FCMOV:1<<16;                                                                         MMX: 1<<23
+    // OSFXR:1<<24; XMM: 1<<25;XMM2: 1<<26;                                                AMD3D:1<<31
     Push(emu, (1<<0) | (1<<1) | (1<<2) | (1<<3) | (1<<4) | (1<<8)  | (1<<15) | (1<<16) | (1<<23) | (1<<25) | (1<<26));
-    Push(emu, 16);                      //AT_HWCAP(16)=...
-    Push(emu, p_arg0); Push(emu, 31);   //AT_EXECFN(31)=p_arg0
-    Push(emu, p_random); Push(emu, 25); //AT_RANDOM(25)=p_random
-    Push(emu, real_getauxval(23)); Push(emu, 23);        //AT_SECURE(23)=0
-    Push(emu, real_getauxval(14)); Push(emu, 14);     //AT_EGID(14)
-    Push(emu, real_getauxval(13)); Push(emu, 13);     //AT_GID(13)
-    Push(emu, real_getauxval(12)); Push(emu, 12);     //AT_EUID(12)
-    Push(emu, real_getauxval(11)); Push(emu, 11);     //AT_UID(11)
-    Push(emu, R_EIP); Push(emu, 9);     //AT_ENTRY(9)=entrypoint
-    Push(emu, 0/*emu->context->vsyscall*/); Push(emu, 32);      //AT_SYSINFO(32)=vsyscall
+    Push(emu, 16);                                      //AT_HWCAP(16)=...
+    //Push(emu, sysconf(_SC_CLK_TCK)); Push(emu, 17);     //AT_CLKTCK(17)=times() frequency
+    Push(emu, real_getauxval(23)); Push(emu, 23);       //AT_SECURE(23)
+    Push(emu, p_random); Push(emu, 25);                 //AT_RANDOM(25)=p_random
+    Push(emu, 0); Push(emu, 26);                        //AT_HWCAP2(26)=0
+    Push(emu, p_arg0); Push(emu, 31);                   //AT_EXECFN(31)=p_arg0
+    //Push(emu, ); Push(emu, 33);                         //AT_SYSINFO_EHDR(33)=address of vDSO
     if(!emu->context->auxval_start)       // store auxval start if needed
         emu->context->auxval_start = (uintptr_t*)R_ESP;
-    // TODO: continue
 
     // push nil / envs / nil / args / argc
     Push(emu, 0);
@@ -137,4 +166,4 @@ void SetupInitialStack(x86emu_t *emu)
     for (int i=emu->context->argc-1; i>=0; --i)
         Push(emu, p_argv[i]);
     Push(emu, emu->context->argc);
-}
+}

src/wrapped/generated/wrappedbz2types.h

@@ -0,0 +1,27 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedbz2TYPES_H_
+#define __wrappedbz2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef int32_t (*iFpii_t)(void*, int32_t, int32_t);
+typedef int32_t (*iFpiii_t)(void*, int32_t, int32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(BZ2_bzCompressEnd, iFp_t) \
+	GO(BZ2_bzDecompress, iFp_t) \
+	GO(BZ2_bzDecompressEnd, iFp_t) \
+	GO(BZ2_bzCompress, iFpi_t) \
+	GO(BZ2_bzDecompressInit, iFpii_t) \
+	GO(BZ2_bzCompressInit, iFpiii_t)
+
+#endif // __wrappedbz2TYPES_H_

src/wrapped/generated/wrappedcryptotypes.h

@@ -0,0 +1,37 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedcryptoTYPES_H_
+#define __wrappedcryptoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpiipp_t)(void*, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(CRYPTO_set_id_callback, vFp_t) \
+	GO(CRYPTO_set_locking_callback, vFp_t) \
+	GO(sk_new, pFp_t) \
+	GO(sk_pop_free, vFpp_t) \
+	GO(PEM_read_bio_DSAPrivateKey, pFpppp_t) \
+	GO(PEM_read_bio_DSA_PUBKEY, pFpppp_t) \
+	GO(PEM_read_bio_ECPrivateKey, pFpppp_t) \
+	GO(PEM_read_bio_EC_PUBKEY, pFpppp_t) \
+	GO(PEM_read_bio_RSAPrivateKey, pFpppp_t) \
+	GO(PEM_read_bio_RSA_PUBKEY, pFpppp_t) \
+	GO(ENGINE_ctrl, iFpiipp_t) \
+	GO(PEM_write_bio_DSAPrivateKey, iFppppipp_t) \
+	GO(PEM_write_bio_ECPrivateKey, iFppppipp_t) \
+	GO(PEM_write_bio_RSAPrivateKey, iFppppipp_t)
+
+#endif // __wrappedcryptoTYPES_H_

src/wrapped/generated/wrappedcurltypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedcurlTYPES_H_
+#define __wrappedcurlTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef uint32_t (*uFpup_t)(void*, uint32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(curl_easy_setopt, uFpup_t)
+
+#endif // __wrappedcurlTYPES_H_

src/wrapped/generated/wrappedd3dadapter9types.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedd3dadapter9TYPES_H_
+#define __wrappedd3dadapter9TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(D3DAdapter9GetProc, pFp_t)
+
+#endif // __wrappedd3dadapter9TYPES_H_

src/wrapped/generated/wrappeddbusglib1types.h

@@ -0,0 +1,28 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappeddbusglib1TYPES_H_
+#define __wrappeddbusglib1TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
+typedef void* (*pFpppppiV_t)(void*, void*, void*, void*, void*, int32_t, void*);
+typedef void* (*pFpppppiiV_t)(void*, void*, void*, void*, void*, int32_t, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(dbus_g_type_collection_value_iterate, vFppp_t) \
+	GO(dbus_g_type_map_value_iterate, vFppp_t) \
+	GO(dbus_g_proxy_disconnect_signal, vFpppp_t) \
+	GO(dbus_g_proxy_connect_signal, vFppppp_t) \
+	GO(dbus_g_proxy_begin_call, pFpppppiV_t) \
+	GO(dbus_g_proxy_begin_call_with_timeout, pFpppppiiV_t)
+
+#endif // __wrappeddbusglib1TYPES_H_

src/wrapped/generated/wrappeddbustypes.h

@@ -0,0 +1,40 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappeddbusTYPES_H_
+#define __wrappeddbusTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
+typedef int32_t (*iFppip_t)(void*, void*, int32_t, void*);
+typedef int32_t (*iFppiV_t)(void*, void*, int32_t, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(dbus_connection_remove_filter, vFppp_t) \
+	GO(dbus_timeout_set_data, vFppp_t) \
+	GO(dbus_watch_set_data, vFppp_t) \
+	GO(dbus_connection_set_dispatch_status_function, vFpppp_t) \
+	GO(dbus_connection_set_wakeup_main_function, vFpppp_t) \
+	GO(dbus_connection_set_data, iFpipp_t) \
+	GO(dbus_message_set_data, iFpipp_t) \
+	GO(dbus_pending_call_set_data, iFpipp_t) \
+	GO(dbus_message_get_args_valist, iFppip_t) \
+	GO(dbus_message_get_args, iFppiV_t) \
+	GO(dbus_connection_add_filter, iFpppp_t) \
+	GO(dbus_pending_call_set_notify, iFpppp_t) \
+	GO(dbus_connection_try_register_object_path, iFppppp_t) \
+	GO(dbus_connection_set_timeout_functions, iFpppppp_t) \
+	GO(dbus_connection_set_watch_functions, iFpppppp_t)
+
+#endif // __wrappeddbusTYPES_H_

src/wrapped/generated/wrappedfontconfigtypes.h

@@ -0,0 +1,20 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedfontconfigTYPES_H_
+#define __wrappedfontconfigTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFppiuui_t)(void*, void*, int32_t, uint32_t, uint32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(FcPatternAdd, iFppiuui_t) \
+	GO(FcPatternAddWeak, iFppiuui_t)
+
+#endif // __wrappedfontconfigTYPES_H_

src/wrapped/generated/wrappedfreetypetypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedfreetypeTYPES_H_
+#define __wrappedfreetypeTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpplp_t)(void*, void*, intptr_t, void*);
+typedef int32_t (*iFpuuLppp_t)(void*, uint32_t, uint32_t, uintptr_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(FT_Open_Face, iFpplp_t) \
+	GO(FTC_Manager_New, iFpuuLppp_t)
+
+#endif // __wrappedfreetypeTYPES_H_

src/wrapped/generated/wrappedgdk3types.h

@@ -0,0 +1,29 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgdk3TYPES_H_
+#define __wrappedgdk3TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int32_t (*iFiipp_t)(int32_t, int32_t, void*, void*);
+typedef int32_t (*iFiippp_t)(int32_t, int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gdk_init, vFpp_t) \
+	GO(gdk_init_check, iFpp_t) \
+	GO(gdk_event_handler_set, vFppp_t) \
+	GO(gdk_window_add_filter, vFppp_t) \
+	GO(gdk_window_remove_filter, vFppp_t) \
+	GO(gdk_input_add, iFiipp_t) \
+	GO(gdk_input_add_full, iFiippp_t)
+
+#endif // __wrappedgdk3TYPES_H_

src/wrapped/generated/wrappedgdkpixbuf2types.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgdkpixbuf2TYPES_H_
+#define __wrappedgdkpixbuf2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFpiiiiiipp_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gdk_pixbuf_new_from_data, pFpiiiiiipp_t)
+
+#endif // __wrappedgdkpixbuf2TYPES_H_

src/wrapped/generated/wrappedgdkx112types.h

@@ -0,0 +1,29 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgdkx112TYPES_H_
+#define __wrappedgdkx112TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int32_t (*iFiipp_t)(int32_t, int32_t, void*, void*);
+typedef int32_t (*iFiippp_t)(int32_t, int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gdk_init, vFpp_t) \
+	GO(gdk_init_check, iFpp_t) \
+	GO(gdk_event_handler_set, vFppp_t) \
+	GO(gdk_window_add_filter, vFppp_t) \
+	GO(gdk_window_remove_filter, vFppp_t) \
+	GO(gdk_input_add, iFiipp_t) \
+	GO(gdk_input_add_full, iFiippp_t)
+
+#endif // __wrappedgdkx112TYPES_H_

src/wrapped/generated/wrappedgio2types.h

@@ -0,0 +1,77 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgio2TYPES_H_
+#define __wrappedgio2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFippp_t)(int32_t, void*, void*, void*);
+typedef void (*vFppip_t)(void*, void*, int32_t, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef uint32_t (*uFpppp_t)(void*, void*, void*, void*);
+typedef uintptr_t (*LFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*);
+typedef void (*vFpipppp_t)(void*, int32_t, void*, void*, void*, void*);
+typedef void (*vFiippppV_t)(int32_t, int32_t, void*, void*, void*, void*, void*);
+typedef void (*vFiupippp_t)(int32_t, uint32_t, void*, int32_t, void*, void*, void*);
+typedef void (*vFippippp_t)(int32_t, void*, void*, int32_t, void*, void*, void*);
+typedef void (*vFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
+typedef void (*vFpppuipV_t)(void*, void*, void*, uint32_t, int32_t, void*, void*);
+typedef uint32_t (*uFipipppp_t)(int32_t, void*, int32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
+typedef void* (*pFpppuipV_t)(void*, void*, void*, uint32_t, int32_t, void*, void*);
+typedef void (*vFppiipppp_t)(void*, void*, int32_t, int32_t, void*, void*, void*, void*);
+typedef void (*vFpppiippp_t)(void*, void*, void*, int32_t, int32_t, void*, void*, void*);
+typedef uint32_t (*uFipippppp_t)(int32_t, void*, int32_t, void*, void*, void*, void*, void*);
+typedef void (*vFiippppppp_t)(int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFpippppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFpppiipppp_t)(void*, void*, void*, int32_t, int32_t, void*, void*, void*, void*);
+typedef void* (*pFiippppppp_t)(int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFppppppippp_t)(void*, void*, void*, void*, void*, void*, int32_t, void*, void*, void*);
+typedef void (*vFpppppppiippp_t)(void*, void*, void*, void*, void*, void*, void*, int32_t, int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(g_simple_async_result_set_op_res_gpointer, vFppp_t) \
+	GO(g_bus_get, vFippp_t) \
+	GO(g_simple_async_result_run_in_thread, vFppip_t) \
+	GO(g_dbus_connection_close, vFpppp_t) \
+	GO(g_dbus_connection_flush, vFpppp_t) \
+	GO(g_simple_async_report_gerror_in_idle, vFpppp_t) \
+	GO(g_simple_async_report_take_gerror_in_idle, vFpppp_t) \
+	GO(g_dbus_connection_add_filter, uFpppp_t) \
+	GO(g_cancellable_connect, LFpppp_t) \
+	GO(g_simple_async_result_new, pFpppp_t) \
+	GO(g_simple_async_result_new_from_error, pFpppp_t) \
+	GO(g_simple_async_result_new_take_error, pFpppp_t) \
+	GO(g_async_initable_init_async, vFpippp_t) \
+	GO(g_dbus_connection_new_for_address, vFpipppp_t) \
+	GO(g_async_initable_new_async, vFiippppV_t) \
+	GO(g_async_initable_newv_async, vFiupippp_t) \
+	GO(g_async_initable_new_valist_async, vFippippp_t) \
+	GO(g_dbus_connection_new, vFppipppp_t) \
+	GO(g_simple_async_report_error_in_idle, vFpppuipV_t) \
+	GO(g_bus_watch_name, uFipipppp_t) \
+	GO(g_bus_own_name_on_connection, uFppipppp_t) \
+	GO(g_bus_watch_name_on_connection, uFppipppp_t) \
+	GO(g_dbus_connection_register_object, uFppppppp_t) \
+	GO(g_simple_async_result_new_error, pFpppuipV_t) \
+	GO(g_dbus_connection_send_message_with_reply, vFppiipppp_t) \
+	GO(g_dbus_proxy_call, vFpppiippp_t) \
+	GO(g_bus_own_name, uFipippppp_t) \
+	GO(g_dbus_proxy_new_for_bus, vFiippppppp_t) \
+	GO(g_dbus_proxy_new, vFpippppppp_t) \
+	GO(g_dbus_proxy_call_with_unix_fd_list, vFpppiipppp_t) \
+	GO(g_dbus_object_manager_client_new_for_bus_sync, pFiippppppp_t) \
+	GO(g_dbus_connection_signal_subscribe, uFppppppippp_t) \
+	GO(g_dbus_connection_call, vFpppppppiippp_t)
+
+#endif // __wrappedgio2TYPES_H_

src/wrapped/generated/wrappedglib2types.h

@@ -0,0 +1,143 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedglib2TYPES_H_
+#define __wrappedglib2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFpV_t)(void*, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef int32_t (*iFpV_t)(void*, void*);
+typedef uint32_t (*uFpp_t)(void*, void*);
+typedef void* (*pFup_t)(uint32_t, void*);
+typedef void* (*pFpu_t)(void*, uint32_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void* (*pFpV_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFppV_t)(void*, void*, void*);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef int32_t (*iFppV_t)(void*, void*, void*);
+typedef uint32_t (*uFipp_t)(int32_t, void*, void*);
+typedef uint32_t (*uFupp_t)(uint32_t, void*, void*);
+typedef uint32_t (*uFppp_t)(void*, void*, void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef void* (*pFppV_t)(void*, void*, void*);
+typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
+typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, void*);
+typedef uint32_t (*uFippp_t)(int32_t, void*, void*, void*);
+typedef uint32_t (*uFpipp_t)(void*, int32_t, void*, void*);
+typedef void* (*pFpupp_t)(void*, uint32_t, void*, void*);
+typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFpiLpp_t)(void*, int32_t, uintptr_t, void*, void*);
+typedef void (*vFppipV_t)(void*, void*, int32_t, void*, void*);
+typedef uint32_t (*uFiippp_t)(int32_t, int32_t, void*, void*, void*);
+typedef uint32_t (*uFiuppp_t)(int32_t, uint32_t, void*, void*, void*);
+typedef int32_t (*iFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFpiippp_t)(void*, int32_t, int32_t, void*, void*, void*);
+typedef void* (*pFppuipp_t)(void*, void*, uint32_t, int32_t, void*, void*);
+typedef void* (*pFppLiiip_t)(void*, void*, uintptr_t, int32_t, int32_t, int32_t, void*);
+typedef int32_t (*iFpppipppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*);
+typedef int32_t (*iFpppipppppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(g_atexit, vFp_t) \
+	GO(g_completion_new, pFp_t) \
+	GO(g_main_context_get_poll_func, pFp_t) \
+	GO(g_private_new, pFp_t) \
+	GO(g_ptr_array_new_with_free_func, pFp_t) \
+	GO(g_set_print_handler, pFp_t) \
+	GO(g_set_printerr_handler, pFp_t) \
+	GO(g_array_set_clear_func, vFpp_t) \
+	GO(g_array_sort, vFpp_t) \
+	GO(g_completion_set_compare, vFpp_t) \
+	GO(g_list_free_full, vFpp_t) \
+	GO(g_main_context_set_poll_func, vFpp_t) \
+	GO(g_ptr_array_set_free_func, vFpp_t) \
+	GO(g_ptr_array_sort, vFpp_t) \
+	GO(g_source_set_funcs, vFpp_t) \
+	GO(g_thread_foreach, vFpp_t) \
+	GO(g_print, vFpV_t) \
+	GO(g_printerr, vFpV_t) \
+	GO(g_source_remove_by_funcs_user_data, iFpp_t) \
+	GO(g_vprintf, iFpp_t) \
+	GO(g_printf, iFpV_t) \
+	GO(g_idle_add, uFpp_t) \
+	GO(g_printf_string_upper_bound, uFpp_t) \
+	GO(g_ptr_array_new_full, pFup_t) \
+	GO(g_source_new, pFpu_t) \
+	GO(g_hash_table_new, pFpp_t) \
+	GO(g_list_sort, pFpp_t) \
+	GO(g_log_set_default_handler, pFpp_t) \
+	GO(g_markup_vprintf_escaped, pFpp_t) \
+	GO(g_slist_sort, pFpp_t) \
+	GO(g_strdup_vprintf, pFpp_t) \
+	GO(g_variant_new_parsed_va, pFpp_t) \
+	GO(g_build_filename, pFpV_t) \
+	GO(g_markup_printf_escaped, pFpV_t) \
+	GO(g_strdup_printf, pFpV_t) \
+	GO(g_variant_new, pFpV_t) \
+	GO(g_variant_new_parsed, pFpV_t) \
+	GO(g_array_sort_with_data, vFppp_t) \
+	GO(g_hash_table_foreach, vFppp_t) \
+	GO(g_ptr_array_foreach, vFppp_t) \
+	GO(g_ptr_array_sort_with_data, vFppp_t) \
+	GO(g_static_private_set, vFppp_t) \
+	GO(g_variant_get, vFppV_t) \
+	GO(g_vasprintf, iFppp_t) \
+	GO(g_vfprintf, iFppp_t) \
+	GO(g_vsprintf, iFppp_t) \
+	GO(g_fprintf, iFppV_t) \
+	GO(g_sprintf, iFppV_t) \
+	GO(g_child_watch_add, uFipp_t) \
+	GO(g_timeout_add, uFupp_t) \
+	GO(g_timeout_add_seconds, uFupp_t) \
+	GO(g_hash_table_foreach_remove, uFppp_t) \
+	GO(g_hash_table_foreach_steal, uFppp_t) \
+	GO(g_hash_table_find, pFppp_t) \
+	GO(g_list_find_custom, pFppp_t) \
+	GO(g_list_sort_with_data, pFppp_t) \
+	GO(g_queue_find_custom, pFppp_t) \
+	GO(g_slist_find_custom, pFppp_t) \
+	GO(g_slist_foreach, pFppp_t) \
+	GO(g_slist_insert_sorted, pFppp_t) \
+	GO(g_slist_sort_with_data, pFppp_t) \
+	GO(g_variant_new_va, pFppp_t) \
+	GO(g_build_path, pFppV_t) \
+	GO(g_datalist_id_set_data_full, vFpupp_t) \
+	GO(g_source_set_callback, vFpppp_t) \
+	GO(g_vsnprintf, iFpLpp_t) \
+	GO(g_snprintf, iFpLpV_t) \
+	GO(g_idle_add_full, uFippp_t) \
+	GO(g_io_add_watch, uFpipp_t) \
+	GO(g_log_set_handler, uFpipp_t) \
+	GO(g_datalist_id_dup_data, pFpupp_t) \
+	GO(g_thread_create, pFppip_t) \
+	GO(g_hash_table_new_full, pFpppp_t) \
+	GO(g_slist_insert_sorted_with_data, pFpppp_t) \
+	GO(g_qsort_with_data, vFpiLpp_t) \
+	GO(g_set_error, vFppipV_t) \
+	GO(g_child_watch_add_full, uFiippp_t) \
+	GO(g_timeout_add_full, uFiuppp_t) \
+	GO(g_timeout_add_seconds_full, uFiuppp_t) \
+	GO(g_datalist_id_replace_data, iFpupppp_t) \
+	GO(g_io_add_watch_full, uFpiippp_t) \
+	GO(g_variant_new_from_data, pFppuipp_t) \
+	GO(g_thread_create_full, pFppLiiip_t) \
+	GO(g_spawn_async, iFpppipppp_t) \
+	GO(g_spawn_sync, iFpppipppppp_t) \
+	GO(g_spawn_async_with_pipes, iFpppippppppp_t)
+
+#endif // __wrappedglib2TYPES_H_

src/wrapped/generated/wrappedgnutlstypes.h

@@ -0,0 +1,22 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgnutlsTYPES_H_
+#define __wrappedgnutlsTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gnutls_global_set_log_function, vFp_t) \
+	GO(gnutls_transport_set_pull_function, vFpp_t) \
+	GO(gnutls_transport_set_push_function, vFpp_t)
+
+#endif // __wrappedgnutlsTYPES_H_

src/wrapped/generated/wrappedgobject2types.h

@@ -0,0 +1,59 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgobject2TYPES_H_
+#define __wrappedgobject2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFiip_t)(int32_t, int32_t, void*);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef void* (*pFipV_t)(int32_t, void*, void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef void* (*pFppV_t)(void*, void*, void*);
+typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFippi_t)(int32_t, void*, void*, int32_t);
+typedef int32_t (*iFipppi_t)(int32_t, void*, void*, void*, int32_t);
+typedef uintptr_t (*LFupppp_t)(uint32_t, void*, void*, void*, void*);
+typedef uintptr_t (*LFpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
+typedef int32_t (*iFipupupi_t)(int32_t, void*, uint32_t, void*, uint32_t, void*, int32_t);
+typedef uint32_t (*uFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*);
+typedef uintptr_t (*LFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFpiiupppiuV_t)(void*, int32_t, int32_t, uint32_t, void*, void*, void*, int32_t, uint32_t, void*);
+typedef uint32_t (*uFpiippppiup_t)(void*, int32_t, int32_t, void*, void*, void*, void*, int32_t, uint32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(g_type_class_peek_parent, pFp_t) \
+	GO(g_param_type_register_static, iFpp_t) \
+	GO(g_value_array_sort, pFpp_t) \
+	GO(g_type_add_interface_static, vFiip_t) \
+	GO(g_value_register_transform_func, vFiip_t) \
+	GO(g_boxed_type_register_static, iFppp_t) \
+	GO(g_object_new, pFipV_t) \
+	GO(g_value_array_sort_with_data, pFppp_t) \
+	GO(g_object_connect, pFppV_t) \
+	GO(g_param_spec_set_qdata_full, vFpupp_t) \
+	GO(g_object_set_data_full, vFpppp_t) \
+	GO(g_type_register_static, iFippi_t) \
+	GO(g_type_register_fundamental, iFipppi_t) \
+	GO(g_signal_add_emission_hook, LFupppp_t) \
+	GO(g_signal_connect_data, LFpppppu_t) \
+	GO(g_type_register_static_simple, iFipupupi_t) \
+	GO(g_signal_handlers_block_matched, uFpiupppp_t) \
+	GO(g_signal_handlers_disconnect_matched, uFpiupppp_t) \
+	GO(g_signal_handlers_unblock_matched, uFpiupppp_t) \
+	GO(g_signal_handler_find, LFpiupppp_t) \
+	GO(g_signal_new, uFpiiupppiuV_t) \
+	GO(g_signal_new_valist, uFpiippppiup_t) \
+	GO(g_signal_newv, uFpiippppiup_t)
+
+#endif // __wrappedgobject2TYPES_H_

src/wrapped/generated/wrappedgthread2types.h

@@ -0,0 +1,20 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgthread2TYPES_H_
+#define __wrappedgthread2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(g_thread_init, vFp_t) \
+	GO(g_thread_init_with_errorcheck_mutexes, vFp_t)
+
+#endif // __wrappedgthread2TYPES_H_

src/wrapped/generated/wrappedgtk3types.h

@@ -0,0 +1,65 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgtk3TYPES_H_
+#define __wrappedgtk3TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFi_t)(int32_t);
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFppV_t)(void*, void*, void*);
+typedef uint32_t (*uFupp_t)(uint32_t, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*);
+typedef int32_t (*iFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
+typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef void (*vFpppppuu_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t);
+typedef void* (*pFppppppi_t)(void*, void*, void*, void*, void*, void*, int32_t);
+typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
+typedef uintptr_t (*LFppppppii_t)(void*, void*, void*, void*, void*, void*, int32_t, int32_t);
+typedef void* (*pFpppppppi_t)(void*, void*, void*, void*, void*, void*, void*, int32_t);
+typedef void* (*pFpippppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void* (*pFpipppppppi_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gtk_type_class, pFi_t) \
+	GO(gtk_init, vFpp_t) \
+	GO(gtk_init_check, iFpp_t) \
+	GO(gtk_type_unique, iFpp_t) \
+	GO(gtk_builder_connect_signals_full, vFppp_t) \
+	GO(gtk_container_forall, vFppp_t) \
+	GO(gtk_menu_attach_to_widget, vFppp_t) \
+	GO(gtk_dialog_add_buttons, vFppV_t) \
+	GO(gtk_message_dialog_format_secondary_markup, vFppV_t) \
+	GO(gtk_message_dialog_format_secondary_text, vFppV_t) \
+	GO(gtk_timeout_add, uFupp_t) \
+	GO(gtk_object_set_data_full, vFpppp_t) \
+	GO(gtk_stock_set_translate_func, vFpppp_t) \
+	GO(gtk_tree_sortable_set_default_sort_func, vFpppp_t) \
+	GO(gtk_tree_view_set_search_equal_func, vFpppp_t) \
+	GO(gtk_text_iter_backward_find_char, iFpppp_t) \
+	GO(gtk_text_iter_forward_find_char, iFpppp_t) \
+	GO(gtk_tree_sortable_set_sort_func, vFpippp_t) \
+	GO(gtk_clipboard_set_with_data, iFppuppp_t) \
+	GO(gtk_clipboard_set_with_owner, iFppuppp_t) \
+	GO(gtk_init_with_args, iFpppppp_t) \
+	GO(gtk_menu_popup, vFpppppuu_t) \
+	GO(gtk_toolbar_insert_stock, pFppppppi_t) \
+	GO(gtk_toolbar_append_item, pFppppppp_t) \
+	GO(gtk_toolbar_prepend_item, pFppppppp_t) \
+	GO(gtk_signal_connect_full, LFppppppii_t) \
+	GO(gtk_toolbar_insert_item, pFpppppppi_t) \
+	GO(gtk_toolbar_append_element, pFpippppppp_t) \
+	GO(gtk_toolbar_prepend_element, pFpippppppp_t) \
+	GO(gtk_toolbar_insert_element, pFpipppppppi_t)
+
+#endif // __wrappedgtk3TYPES_H_

src/wrapped/generated/wrappedgtkx112types.h

@@ -0,0 +1,84 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedgtkx112TYPES_H_
+#define __wrappedgtkx112TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef float (*fFp_t)(void*);
+typedef void* (*pFi_t)(int32_t);
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFppV_t)(void*, void*, void*);
+typedef uint32_t (*uFupp_t)(uint32_t, void*, void*);
+typedef void (*vFppup_t)(void*, void*, uint32_t, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef uintptr_t (*LFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*);
+typedef void (*vFppupp_t)(void*, void*, uint32_t, void*, void*);
+typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
+typedef void (*vFpuipuV_t)(void*, uint32_t, int32_t, void*, uint32_t, void*);
+typedef int32_t (*iFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
+typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef void (*vFpppppuu_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t);
+typedef void* (*pFppppppi_t)(void*, void*, void*, void*, void*, void*, int32_t);
+typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
+typedef uintptr_t (*LFppppppii_t)(void*, void*, void*, void*, void*, void*, int32_t, int32_t);
+typedef void* (*pFpppppppi_t)(void*, void*, void*, void*, void*, void*, void*, int32_t);
+typedef void* (*pFpippppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void* (*pFpipppppppi_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gtk_spin_button_get_value_as_float, fFp_t) \
+	GO(gtk_type_class, pFi_t) \
+	GO(gtk_builder_connect_signals, vFpp_t) \
+	GO(gtk_init, vFpp_t) \
+	GO(gtk_init_check, iFpp_t) \
+	GO(gtk_type_unique, iFpp_t) \
+	GO(gtk_type_check_object_cast, pFpi_t) \
+	GO(gtk_builder_connect_signals_full, vFppp_t) \
+	GO(gtk_clipboard_request_text, vFppp_t) \
+	GO(gtk_container_forall, vFppp_t) \
+	GO(gtk_container_foreach, vFppp_t) \
+	GO(gtk_menu_attach_to_widget, vFppp_t) \
+	GO(gtk_tree_model_foreach, vFppp_t) \
+	GO(gtk_dialog_add_buttons, vFppV_t) \
+	GO(gtk_message_dialog_format_secondary_markup, vFppV_t) \
+	GO(gtk_message_dialog_format_secondary_text, vFppV_t) \
+	GO(gtk_timeout_add, uFupp_t) \
+	GO(gtk_action_group_add_actions, vFppup_t) \
+	GO(gtk_clipboard_request_contents, vFpppp_t) \
+	GO(gtk_object_set_data_full, vFpppp_t) \
+	GO(gtk_stock_set_translate_func, vFpppp_t) \
+	GO(gtk_tree_sortable_set_default_sort_func, vFpppp_t) \
+	GO(gtk_tree_view_set_search_equal_func, vFpppp_t) \
+	GO(gtk_text_iter_backward_find_char, iFpppp_t) \
+	GO(gtk_text_iter_forward_find_char, iFpppp_t) \
+	GO(gtk_signal_connect, LFpppp_t) \
+	GO(gtk_tree_sortable_set_sort_func, vFpippp_t) \
+	GO(gtk_action_group_add_actions_full, vFppupp_t) \
+	GO(gtk_cell_layout_set_cell_data_func, vFppppp_t) \
+	GO(gtk_binding_entry_add_signal, vFpuipuV_t) \
+	GO(gtk_clipboard_set_with_data, iFppuppp_t) \
+	GO(gtk_clipboard_set_with_owner, iFppuppp_t) \
+	GO(gtk_init_with_args, iFpppppp_t) \
+	GO(gtk_menu_popup, vFpppppuu_t) \
+	GO(gtk_toolbar_insert_stock, pFppppppi_t) \
+	GO(gtk_toolbar_append_item, pFppppppp_t) \
+	GO(gtk_toolbar_prepend_item, pFppppppp_t) \
+	GO(gtk_signal_connect_full, LFppppppii_t) \
+	GO(gtk_toolbar_insert_item, pFpppppppi_t) \
+	GO(gtk_toolbar_append_element, pFpippppppp_t) \
+	GO(gtk_toolbar_prepend_element, pFpippppppp_t) \
+	GO(gtk_toolbar_insert_element, pFpipppppppi_t)
+
+#endif // __wrappedgtkx112TYPES_H_

src/wrapped/generated/wrappedkrb5types.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedkrb5TYPES_H_
+#define __wrappedkrb5TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFppppppipp_t)(void*, void*, void*, void*, void*, void*, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(krb5_get_init_creds_password, iFppppppipp_t)
+
+#endif // __wrappedkrb5TYPES_H_

src/wrapped/generated/wrappedlcms2types.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlcms2TYPES_H_
+#define __wrappedlcms2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(cmsSetLogErrorHandler, vFp_t)
+
+#endif // __wrappedlcms2TYPES_H_

src/wrapped/generated/wrappedldaprtypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedldaprTYPES_H_
+#define __wrappedldaprTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpppppupp_t)(void*, void*, void*, void*, void*, uint32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(ldap_sasl_interactive_bind_s, iFpppppupp_t)
+
+#endif // __wrappedldaprTYPES_H_

src/wrapped/generated/wrappedldlinuxtypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedldlinuxTYPES_H_
+#define __wrappedldlinuxTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFv_t)(void);
+typedef void* (*pFp_t)(void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(___tls_get_addr, pFv_t) \
+	GO(__tls_get_addr, pFp_t)
+
+#endif // __wrappedldlinuxTYPES_H_

src/wrapped/generated/wrappedlibasoundtypes.h

@@ -0,0 +1,28 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibasoundTYPES_H_
+#define __wrappedlibasoundTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpipL_t)(void*, int32_t, void*, uintptr_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(snd_dlclose, iFp_t) \
+	GO(snd_lib_error_set_handler, iFp_t) \
+	GO(snd_dlsym, pFppp_t) \
+	GO(snd_async_add_handler, iFpipp_t) \
+	GO(snd_async_add_pcm_handler, iFpppp_t) \
+	GO(snd_dlopen, pFpipL_t)
+
+#endif // __wrappedlibasoundTYPES_H_

src/wrapped/generated/wrappedlibctypes.h

@@ -0,0 +1,31 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibcTYPES_H_
+#define __wrappedlibcTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef int32_t (*iFpV_t)(void*, void*);
+typedef int32_t (*iFSp_t)(void*, void*);
+typedef void (*vFpup_t)(void*, uint32_t, void*);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(__vwprintf_chk, iFpp_t) \
+	GO(execl, iFpV_t) \
+	GO(execle, iFpV_t) \
+	GO(execlp, iFpV_t) \
+	GO(_IO_file_stat, iFSp_t) \
+	GO(_ITM_addUserCommitAction, vFpup_t) \
+	GO(__vfwprintf_chk, iFppp_t) \
+	GO(__libc_init, vFpppp_t)
+
+#endif // __wrappedlibcTYPES_H_

src/wrapped/generated/wrappedlibdltypes.h

@@ -0,0 +1,33 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibdlTYPES_H_
+#define __wrappedlibdlTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef int32_t (*iFpip_t)(void*, int32_t, void*);
+typedef void* (*pFppi_t)(void*, void*, int32_t);
+typedef void* (*pFppp_t)(void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(dlclose, iFp_t) \
+	GO(dlerror, pFv_t) \
+	GO(dladdr, iFpp_t) \
+	GO(dlopen, pFpi_t) \
+	GO(dlsym, pFpp_t) \
+	GO(dlinfo, iFpip_t) \
+	GO(dlmopen, pFppi_t) \
+	GO(dlvsym, pFppp_t)
+
+#endif // __wrappedlibdlTYPES_H_

src/wrapped/generated/wrappedlibgltypes.h

@@ -0,0 +1,23 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibglTYPES_H_
+#define __wrappedlibglTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(glXGetProcAddress, pFp_t) \
+	GO(glXGetProcAddressARB, pFp_t) \
+	GO(glDebugMessageCallback, vFpp_t) \
+	GO(glDebugMessageCallbackARB, vFpp_t)
+
+#endif // __wrappedlibglTYPES_H_

src/wrapped/generated/wrappedlibglutypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibgluTYPES_H_
+#define __wrappedlibgluTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpip_t)(void*, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gluNurbsCallback, vFpip_t) \
+	GO(gluQuadricCallback, vFpip_t) \
+	GO(gluTessCallback, vFpip_t)
+
+#endif // __wrappedlibgluTYPES_H_

src/wrapped/generated/wrappedlibjpeg62types.h

@@ -0,0 +1,46 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibjpeg62TYPES_H_
+#define __wrappedlibjpeg62TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpi_t)(void*, int32_t);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef void (*vFpii_t)(void*, int32_t, int32_t);
+typedef void (*vFpiL_t)(void*, int32_t, uintptr_t);
+typedef void (*vFpip_t)(void*, int32_t, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef uint32_t (*uFppu_t)(void*, void*, uint32_t);
+typedef void (*vFpipu_t)(void*, int32_t, void*, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(jpeg_destroy_compress, vFp_t) \
+	GO(jpeg_destroy_decompress, vFp_t) \
+	GO(jpeg_finish_compress, vFp_t) \
+	GO(jpeg_set_defaults, vFp_t) \
+	GO(jpeg_finish_decompress, iFp_t) \
+	GO(jpeg_start_decompress, iFp_t) \
+	GO(jpeg_std_error, pFp_t) \
+	GO(jpeg_start_compress, vFpi_t) \
+	GO(jpeg_read_header, iFpi_t) \
+	GO(jpeg_resync_to_restart, iFpi_t) \
+	GO(jpeg_set_quality, vFpii_t) \
+	GO(jpeg_CreateCompress, vFpiL_t) \
+	GO(jpeg_CreateDecompress, vFpiL_t) \
+	GO(jpeg_set_marker_processor, vFpip_t) \
+	GO(jpeg_mem_dest, vFppp_t) \
+	GO(jpeg_read_scanlines, uFppu_t) \
+	GO(jpeg_write_scanlines, uFppu_t) \
+	GO(jpeg_write_marker, vFpipu_t)
+
+#endif // __wrappedlibjpeg62TYPES_H_

src/wrapped/generated/wrappedlibjpegtypes.h

@@ -0,0 +1,30 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibjpegTYPES_H_
+#define __wrappedlibjpegTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef void (*vFpiL_t)(void*, int32_t, uintptr_t);
+typedef void (*vFpip_t)(void*, int32_t, void*);
+typedef uint32_t (*uFppu_t)(void*, void*, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(jpeg_finish_decompress, iFp_t) \
+	GO(jpeg_start_decompress, iFp_t) \
+	GO(jpeg_std_error, pFp_t) \
+	GO(jpeg_read_header, iFpi_t) \
+	GO(jpeg_CreateDecompress, vFpiL_t) \
+	GO(jpeg_set_marker_processor, vFpip_t) \
+	GO(jpeg_read_scanlines, uFppu_t)
+
+#endif // __wrappedlibjpegTYPES_H_

src/wrapped/generated/wrappedlibncurses6types.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibncurses6TYPES_H_
+#define __wrappedlibncurses6TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpV_t)(void*, void*);
+typedef int32_t (*iFpiipV_t)(void*, int32_t, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(printw, iFpV_t) \
+	GO(mvwprintw, iFpiipV_t)
+
+#endif // __wrappedlibncurses6TYPES_H_

src/wrapped/generated/wrappedlibncursestypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibncursesTYPES_H_
+#define __wrappedlibncursesTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpV_t)(void*, void*);
+typedef int32_t (*iFpiipV_t)(void*, int32_t, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(printw, iFpV_t) \
+	GO(mvwprintw, iFpiipV_t)
+
+#endif // __wrappedlibncursesTYPES_H_

src/wrapped/generated/wrappedlibncurseswtypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibncurseswTYPES_H_
+#define __wrappedlibncurseswTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpV_t)(void*, void*);
+typedef int32_t (*iFpiipV_t)(void*, int32_t, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(printw, iFpV_t) \
+	GO(mvwprintw, iFpiipV_t)
+
+#endif // __wrappedlibncurseswTYPES_H_

src/wrapped/generated/wrappedlibpthreadtypes.h

@@ -0,0 +1,61 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibpthreadTYPES_H_
+#define __wrappedlibpthreadTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef void (*vFpi_t)(void*, int32_t);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int32_t (*iFLup_t)(uintptr_t, uint32_t, void*);
+typedef int32_t (*iFpup_t)(void*, uint32_t, void*);
+typedef int32_t (*iFppu_t)(void*, void*, uint32_t);
+typedef int32_t (*iFppL_t)(void*, void*, uintptr_t);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(__pthread_register_cancel, vFp_t) \
+	GO(__pthread_unregister_cancel, vFp_t) \
+	GO(__pthread_unwind_next, vFp_t) \
+	GO(pthread_attr_destroy, iFp_t) \
+	GO(pthread_cond_broadcast, iFp_t) \
+	GO(pthread_cond_destroy, iFp_t) \
+	GO(pthread_cond_signal, iFp_t) \
+	GO(_pthread_cleanup_pop, vFpi_t) \
+	GO(_pthread_cleanup_pop_restore, vFpi_t) \
+	GO(pthread_attr_setscope, iFpi_t) \
+	GO(pthread_kill, iFpi_t) \
+	GO(pthread_mutexattr_setkind_np, iFpi_t) \
+	GO(__pthread_key_create, iFpp_t) \
+	GO(__pthread_once, iFpp_t) \
+	GO(pthread_attr_setschedparam, iFpp_t) \
+	GO(pthread_cond_init, iFpp_t) \
+	GO(pthread_cond_wait, iFpp_t) \
+	GO(pthread_key_create, iFpp_t) \
+	GO(pthread_once, iFpp_t) \
+	GO(pthread_setname_np, iFpp_t) \
+	GO(_pthread_cleanup_push, vFppp_t) \
+	GO(_pthread_cleanup_push_defer, vFppp_t) \
+	GO(pthread_setaffinity_np, iFLup_t) \
+	GO(pthread_attr_setaffinity_np, iFpup_t) \
+	GO(pthread_getaffinity_np, iFpup_t) \
+	GO(pthread_getname_np, iFppu_t) \
+	GO(pthread_attr_setstack, iFppL_t) \
+	GO(__pthread_atfork, iFppp_t) \
+	GO(pthread_atfork, iFppp_t) \
+	GO(pthread_attr_getstack, iFppp_t) \
+	GO(pthread_cond_timedwait, iFppp_t) \
+	GO(pthread_create, iFpppp_t)
+
+#endif // __wrappedlibpthreadTYPES_H_

src/wrapped/generated/wrappedlibrttypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibrtTYPES_H_
+#define __wrappedlibrtTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFupp_t)(uint32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(timer_create, iFupp_t)
+
+#endif // __wrappedlibrtTYPES_H_

src/wrapped/generated/wrappedlibsmtypes.h

@@ -0,0 +1,23 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibsmTYPES_H_
+#define __wrappedlibsmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
+typedef void* (*pFppiiLpppip_t)(void*, void*, int32_t, int32_t, uintptr_t, void*, void*, void*, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SmcRequestSaveYourselfPhase2, iFppp_t) \
+	GO(SmcInteractRequest, iFpipp_t) \
+	GO(SmcOpenConnection, pFppiiLpppip_t)
+
+#endif // __wrappedlibsmTYPES_H_

src/wrapped/generated/wrappedlibsndfiletypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibsndfileTYPES_H_
+#define __wrappedlibsndfileTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFpipp_t)(void*, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(sf_close, iFp_t) \
+	GO(sf_open_virtual, pFpipp_t)
+
+#endif // __wrappedlibsndfileTYPES_H_

src/wrapped/generated/wrappedlibssltypes.h

@@ -0,0 +1,30 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibsslTYPES_H_
+#define __wrappedlibsslTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFpip_t)(void*, int32_t, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef intptr_t (*lFpip_t)(void*, int32_t, void*);
+typedef int32_t (*iFlpppp_t)(intptr_t, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SSL_CTX_set_default_passwd_cb, vFpp_t) \
+	GO(SSL_set_psk_client_callback, vFpp_t) \
+	GO(SSL_CTX_set_verify, vFpip_t) \
+	GO(SSL_set_verify, vFpip_t) \
+	GO(SSL_CTX_set_next_proto_select_cb, vFppp_t) \
+	GO(SSL_CTX_callback_ctrl, lFpip_t) \
+	GO(SSL_callback_ctrl, lFpip_t) \
+	GO(SSL_get_ex_new_index, iFlpppp_t)
+
+#endif // __wrappedlibsslTYPES_H_

src/wrapped/generated/wrappedlibtinfo6types.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibtinfo6TYPES_H_
+#define __wrappedlibtinfo6TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpip_t)(void*, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(tputs, iFpip_t)
+
+#endif // __wrappedlibtinfo6TYPES_H_

src/wrapped/generated/wrappedlibtinfotypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibtinfoTYPES_H_
+#define __wrappedlibtinfoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpip_t)(void*, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(tputs, iFpip_t)
+
+#endif // __wrappedlibtinfoTYPES_H_

src/wrapped/generated/wrappedlibusb1types.h

@@ -0,0 +1,24 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibusb1TYPES_H_
+#define __wrappedlibusb1TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFi_t)(int32_t);
+typedef int32_t (*iFpiiiiippp_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(libusb_cancel_transfer, iFp_t) \
+	GO(libusb_submit_transfer, iFp_t) \
+	GO(libusb_alloc_transfer, pFi_t) \
+	GO(libusb_hotplug_register_callback, iFpiiiiippp_t)
+
+#endif // __wrappedlibusb1TYPES_H_

src/wrapped/generated/wrappedlibvorbistypes.h

@@ -0,0 +1,42 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibvorbisTYPES_H_
+#define __wrappedlibvorbisTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(vorbis_dsp_clear, vFp_t) \
+	GO(vorbis_bitrate_addblock, iFp_t) \
+	GO(vorbis_block_clear, iFp_t) \
+	GO(vorbis_synthesis_restart, iFp_t) \
+	GO(vorbis_analysis_wrote, iFpi_t) \
+	GO(vorbis_synthesis_read, iFpi_t) \
+	GO(vorbis_analysis, iFpp_t) \
+	GO(vorbis_analysis_blockout, iFpp_t) \
+	GO(vorbis_analysis_init, iFpp_t) \
+	GO(vorbis_bitrate_flushpacket, iFpp_t) \
+	GO(vorbis_block_init, iFpp_t) \
+	GO(vorbis_synthesis, iFpp_t) \
+	GO(vorbis_synthesis_blockin, iFpp_t) \
+	GO(vorbis_synthesis_init, iFpp_t) \
+	GO(vorbis_synthesis_lapout, iFpp_t) \
+	GO(vorbis_synthesis_pcmout, iFpp_t) \
+	GO(vorbis_analysis_buffer, pFpi_t) \
+	GO(vorbis_window, pFpi_t) \
+	GO(vorbis_analysis_headerout, iFppppp_t)
+
+#endif // __wrappedlibvorbisTYPES_H_

src/wrapped/generated/wrappedlibx11types.h

@@ -0,0 +1,62 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibx11TYPES_H_
+#define __wrappedlibx11TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef int32_t (*iFppu_t)(void*, void*, uint32_t);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef void* (*pFpip_t)(void*, int32_t, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFppup_t)(void*, void*, uint32_t, void*);
+typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef void* (*pFppiiuuui_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t);
+typedef int32_t (*iFppppiiiiuu_t)(void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
+typedef void* (*pFppuiipuuii_t)(void*, void*, uint32_t, int32_t, int32_t, void*, uint32_t, uint32_t, int32_t, int32_t);
+typedef void* (*pFppiiuuuipii_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t, void*, int32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XCloseDisplay, iFp_t) \
+	GO(XDestroyImage, iFp_t) \
+	GO(XInitImage, iFp_t) \
+	GO(XOpenDisplay, pFp_t) \
+	GO(XSetErrorHandler, pFp_t) \
+	GO(XSetIOErrorHandler, pFp_t) \
+	GO(_XDeqAsyncHandler, vFpp_t) \
+	GO(XSynchronize, iFpi_t) \
+	GO(XLoadQueryFont, pFpp_t) \
+	GO(XSetAfterFunction, pFpp_t) \
+	GO(XSetBackground, iFppu_t) \
+	GO(XSetForeground, iFppu_t) \
+	GO(XAddConnectionWatch, iFppp_t) \
+	GO(XRemoveConnectionWatch, iFppp_t) \
+	GO(XESetCloseDisplay, pFpip_t) \
+	GO(XESetError, pFpip_t) \
+	GO(XESetEventToWire, pFpip_t) \
+	GO(XESetWireToEvent, pFpip_t) \
+	GO(XCheckIfEvent, iFpppp_t) \
+	GO(XIfEvent, iFpppp_t) \
+	GO(XPeekIfEvent, iFpppp_t) \
+	GO(XCreateGC, pFppup_t) \
+	GO(XQueryExtension, iFppppp_t) \
+	GO(XRegisterIMInstantiateCallback, iFpppppp_t) \
+	GO(XUnregisterIMInstantiateCallback, iFpppppp_t) \
+	GO(XGetImage, pFppiiuuui_t) \
+	GO(XPutImage, iFppppiiiiuu_t) \
+	GO(XCreateImage, pFppuiipuuii_t) \
+	GO(XGetSubImage, pFppiiuuuipii_t)
+
+#endif // __wrappedlibx11TYPES_H_

src/wrapped/generated/wrappedlibxcbdri2types.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbdri2TYPES_H_
+#define __wrappedlibxcbdri2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpuu_t)(void*, uint32_t, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_dri2_authenticate, XFpuu_t) \
+	GO(xcb_dri2_connect, XFpuu_t) \
+	GO(xcb_dri2_query_version, XFpuu_t)
+
+#endif // __wrappedlibxcbdri2TYPES_H_

src/wrapped/generated/wrappedlibxcbdri3types.h

@@ -0,0 +1,22 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbdri3TYPES_H_
+#define __wrappedlibxcbdri3TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpuu_t)(void*, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFpuuuWWWCCi_t)(void*, uint32_t, uint32_t, uint32_t, uint16_t, uint16_t, uint16_t, uint8_t, uint8_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_dri3_open, XFpuu_t) \
+	GO(xcb_dri3_query_version, XFpuu_t) \
+	GO(xcb_dri3_pixmap_from_buffer_checked, XFpuuuWWWCCi_t)
+
+#endif // __wrappedlibxcbdri3TYPES_H_

src/wrapped/generated/wrappedlibxcbimagetypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbimageTYPES_H_
+#define __wrappedlibxcbimageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpuupwwC_t)(void*, uint32_t, uint32_t, void*, int16_t, int16_t, uint8_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_image_put, XFpuupwwC_t)
+
+#endif // __wrappedlibxcbimageTYPES_H_

src/wrapped/generated/wrappedlibxcbpresenttypes.h

@@ -0,0 +1,26 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbpresentTYPES_H_
+#define __wrappedlibxcbpresentTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpuu_t)(void*, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFpuuUUU_t)(void*, uint32_t, uint32_t, uint64_t, uint64_t, uint64_t);
+typedef my_xcb_cookie_t (*XFpuuuuuwwuuuuUUUup_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, int16_t, int16_t, uint32_t, uint32_t, uint32_t, uint32_t, uint64_t, uint64_t, uint64_t, uint32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_present_query_version, XFpuu_t) \
+	GO(xcb_present_select_input_checked, XFpuuu_t) \
+	GO(xcb_present_notify_msc, XFpuuUUU_t) \
+	GO(xcb_present_pixmap, XFpuuuuuwwuuuuUUUup_t) \
+	GO(xcb_present_pixmap_checked, XFpuuuuuwwuuuuUUUup_t)
+
+#endif // __wrappedlibxcbpresentTYPES_H_

src/wrapped/generated/wrappedlibxcbrandrtypes.h

@@ -0,0 +1,37 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbrandrTYPES_H_
+#define __wrappedlibxcbrandrTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_iterator_t (*TFp_t)(void*);
+typedef my_xcb_cookie_t (*XFpu_t)(void*, uint32_t);
+typedef my_xcb_cookie_t (*XFpuW_t)(void*, uint32_t, uint16_t);
+typedef my_xcb_cookie_t (*XFpuu_t)(void*, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFppu_t)(void*, void*, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_randr_get_screen_resources_current_outputs_end, TFp_t) \
+	GO(xcb_randr_get_output_primary, XFpu_t) \
+	GO(xcb_randr_get_output_primary_unchecked, XFpu_t) \
+	GO(xcb_randr_get_screen_resources, XFpu_t) \
+	GO(xcb_randr_get_screen_resources_current, XFpu_t) \
+	GO(xcb_randr_get_screen_resources_outputs, XFpu_t) \
+	GO(xcb_randr_get_screen_resources_unchecked, XFpu_t) \
+	GO(xcb_randr_select_input, XFpuW_t) \
+	GO(xcb_randr_select_input_checked, XFpuW_t) \
+	GO(xcb_randr_query_version, XFpuu_t) \
+	GO(xcb_randr_query_version_unchecked, XFpuu_t) \
+	GO(xcb_randr_get_crtc_info, XFppu_t) \
+	GO(xcb_randr_get_crtc_info_unchecked, XFppu_t) \
+	GO(xcb_randr_get_output_info, XFppu_t) \
+	GO(xcb_randr_get_output_info_unchecked, XFppu_t)
+
+#endif // __wrappedlibxcbrandrTYPES_H_

src/wrapped/generated/wrappedlibxcbshapetypes.h

@@ -0,0 +1,20 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbshapeTYPES_H_
+#define __wrappedlibxcbshapeTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpuuuwwu_t)(void*, uint32_t, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_shape_mask, XFpuuuwwu_t) \
+	GO(xcb_shape_mask_checked, XFpuuuwwu_t)
+
+#endif // __wrappedlibxcbshapeTYPES_H_

src/wrapped/generated/wrappedlibxcbshmtypes.h

@@ -0,0 +1,41 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbshmTYPES_H_
+#define __wrappedlibxcbshmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFp_t)(void*);
+typedef my_xcb_iterator_t (*TFT_t)(my_xcb_iterator_t);
+typedef my_xcb_cookie_t (*XFpu_t)(void*, uint32_t);
+typedef my_xcb_cookie_t (*XFpuuC_t)(void*, uint32_t, uint32_t, uint8_t);
+typedef my_xcb_cookie_t (*XFpuuWWCuu_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uint8_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFpuwwWWuCuu_t)(void*, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint32_t, uint8_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFpuuWWWWWWwwCCCuu_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, int16_t, int16_t, uint8_t, uint8_t, uint8_t, uint32_t, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_shm_query_version, XFp_t) \
+	GO(xcb_shm_query_version_unchecked, XFp_t) \
+	GO(xcb_shm_seg_end, TFT_t) \
+	GO(xcb_shm_detach, XFpu_t) \
+	GO(xcb_shm_detach_checked, XFpu_t) \
+	GO(xcb_shm_attach, XFpuuC_t) \
+	GO(xcb_shm_attach_checked, XFpuuC_t) \
+	GO(xcb_shm_attach_fd, XFpuuC_t) \
+	GO(xcb_shm_attach_fd_checked, XFpuuC_t) \
+	GO(xcb_shm_create_segment, XFpuuC_t) \
+	GO(xcb_shm_create_segment_unchecked, XFpuuC_t) \
+	GO(xcb_shm_create_pixmap, XFpuuWWCuu_t) \
+	GO(xcb_shm_create_pixmap_checked, XFpuuWWCuu_t) \
+	GO(xcb_shm_get_image, XFpuwwWWuCuu_t) \
+	GO(xcb_shm_get_image_unchecked, XFpuwwWWuCuu_t) \
+	GO(xcb_shm_put_image, XFpuuWWWWWWwwCCCuu_t) \
+	GO(xcb_shm_put_image_checked, XFpuuWWWWWWwwCCCuu_t)
+
+#endif // __wrappedlibxcbshmTYPES_H_

src/wrapped/generated/wrappedlibxcbtypes.h

@@ -0,0 +1,145 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbTYPES_H_
+#define __wrappedlibxcbTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*xFp_t)(void*);
+typedef my_xcb_XXX_iterator_t (*XFp_t)(void*);
+typedef my_xcb_cookie_t (*xFpC_t)(void*, uint8_t);
+typedef my_xcb_cookie_t (*xFpu_t)(void*, uint32_t);
+typedef my_xcb_cookie_t (*xFpp_t)(void*, void*);
+typedef my_xcb_cookie_t (*xFpCC_t)(void*, uint8_t, uint8_t);
+typedef my_xcb_cookie_t (*xFpup_t)(void*, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFppp_t)(void*, void*, void*);
+typedef my_xcb_cookie_t (*xFpCWp_t)(void*, uint8_t, uint16_t, void*);
+typedef my_xcb_cookie_t (*xFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpCuu_t)(void*, uint8_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*xFpuWp_t)(void*, uint32_t, uint16_t, void*);
+typedef my_xcb_cookie_t (*xFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*xFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFpCuup_t)(void*, uint8_t, uint32_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFpCppp_t)(void*, uint8_t, void*, void*, void*);
+typedef my_xcb_cookie_t (*xFpuWWW_t)(void*, uint32_t, uint16_t, uint16_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpuuWW_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFpCuuCC_t)(void*, uint8_t, uint32_t, uint32_t, uint8_t, uint8_t);
+typedef my_xcb_cookie_t (*xFpCuuWW_t)(void*, uint8_t, uint32_t, uint32_t, uint16_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpCuuup_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFpuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*xFpCuwwWW_t)(void*, uint8_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpCuWCCC_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, uint8_t, uint8_t);
+typedef my_xcb_cookie_t (*xFpCuuwwp_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, void*);
+typedef my_xcb_cookie_t (*xFpCuuuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*xFpCuwwWWu_t)(void*, uint8_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint32_t);
+typedef my_xcb_cookie_t (*xFpCuuuCup_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFpCuWCCuuu_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, uint8_t, uint32_t, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*xFpuuwwWWww_t)(void*, uint32_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, int16_t, int16_t);
+typedef my_xcb_cookie_t (*xFpCuWCCuuCW_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, uint8_t, uint32_t, uint32_t, uint8_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpuuuwwwwWW_t)(void*, uint32_t, uint32_t, uint32_t, int16_t, int16_t, int16_t, int16_t, uint16_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpCuuWWwwCCup_t)(void*, uint8_t, uint32_t, uint32_t, uint16_t, uint16_t, int16_t, int16_t, uint8_t, uint8_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*xFpuuuWWWWWWWW_t)(void*, uint32_t, uint32_t, uint32_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t);
+typedef my_xcb_cookie_t (*xFpCuuwwWWWWuup_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_get_input_focus, xFp_t) \
+	GO(xcb_get_modifier_mapping, xFp_t) \
+	GO(xcb_grab_server, xFp_t) \
+	GO(xcb_ungrab_server, xFp_t) \
+	GO(xcb_depth_visuals_iterator, XFp_t) \
+	GO(xcb_screen_allowed_depths_iterator, XFp_t) \
+	GO(xcb_setup_pixmap_formats_iterator, XFp_t) \
+	GO(xcb_setup_roots_iterator, XFp_t) \
+	GO(xcb_bell, xFpC_t) \
+	GO(xcb_close_font, xFpu_t) \
+	GO(xcb_close_font_checked, xFpu_t) \
+	GO(xcb_destroy_window, xFpu_t) \
+	GO(xcb_free_colormap, xFpu_t) \
+	GO(xcb_free_colormap_checked, xFpu_t) \
+	GO(xcb_free_gc, xFpu_t) \
+	GO(xcb_free_pixmap, xFpu_t) \
+	GO(xcb_get_atom_name, xFpu_t) \
+	GO(xcb_get_geometry, xFpu_t) \
+	GO(xcb_get_geometry_unchecked, xFpu_t) \
+	GO(xcb_get_selection_owner, xFpu_t) \
+	GO(xcb_get_selection_owner_unchecked, xFpu_t) \
+	GO(xcb_get_window_attributes, xFpu_t) \
+	GO(xcb_get_window_attributes_unchecked, xFpu_t) \
+	GO(xcb_map_subwindows, xFpu_t) \
+	GO(xcb_map_window, xFpu_t) \
+	GO(xcb_map_window_checked, xFpu_t) \
+	GO(xcb_query_pointer, xFpu_t) \
+	GO(xcb_query_tree, xFpu_t) \
+	GO(xcb_query_tree_unchecked, xFpu_t) \
+	GO(xcb_ungrab_keyboard, xFpu_t) \
+	GO(xcb_ungrab_keyboard_checked, xFpu_t) \
+	GO(xcb_ungrab_pointer, xFpu_t) \
+	GO(xcb_unmap_window, xFpu_t) \
+	GO(xcb_free_cursor, xFpp_t) \
+	GO(xcb_get_keyboard_mapping, xFpCC_t) \
+	GO(xcb_change_keyboard_control, xFpup_t) \
+	GO(xcb_delete_property, xFppp_t) \
+	GO(xcb_intern_atom, xFpCWp_t) \
+	GO(xcb_intern_atom_unchecked, xFpCWp_t) \
+	GO(xcb_ungrab_button, xFpCuW_t) \
+	GO(xcb_ungrab_button_checked, xFpCuW_t) \
+	GO(xcb_ungrab_key, xFpCuW_t) \
+	GO(xcb_ungrab_key_checked, xFpCuW_t) \
+	GO(xcb_set_input_focus, xFpCuu_t) \
+	GO(xcb_configure_window, xFpuWp_t) \
+	GO(xcb_open_font, xFpuWp_t) \
+	GO(xcb_open_font_checked, xFpuWp_t) \
+	GO(xcb_set_selection_owner, xFpuuu_t) \
+	GO(xcb_change_gc, xFpuup_t) \
+	GO(xcb_change_gc_checked, xFpuup_t) \
+	GO(xcb_change_window_attributes, xFpuup_t) \
+	GO(xcb_change_window_attributes_checked, xFpuup_t) \
+	GO(xcb_query_text_extents, xFpuup_t) \
+	GO(xcb_send_event, xFpCuup_t) \
+	GO(xcb_create_colormap, xFpCppp_t) \
+	GO(xcb_alloc_color, xFpuWWW_t) \
+	GO(xcb_reparent_window, xFpuuWW_t) \
+	GO(xcb_translate_coordinates, xFpuuWW_t) \
+	GO(xcb_translate_coordinates_unchecked, xFpuuWW_t) \
+	GO(xcb_create_gc, xFpuuup_t) \
+	GO(xcb_create_gc_checked, xFpuuup_t) \
+	GO(xcb_poly_arc, xFpuuup_t) \
+	GO(xcb_poly_fill_rectangle, xFpuuup_t) \
+	GO(xcb_poly_rectangle, xFpuuup_t) \
+	GO(xcb_poly_segment, xFpuuup_t) \
+	GO(xcb_grab_keyboard, xFpCuuCC_t) \
+	GO(xcb_create_pixmap, xFpCuuWW_t) \
+	GO(xcb_poly_line, xFpCuuup_t) \
+	GO(xcb_poly_line_checked, xFpCuuup_t) \
+	GO(xcb_poly_point, xFpCuuup_t) \
+	GO(xcb_convert_selection, xFpuuuuu_t) \
+	GO(xcb_clear_area, xFpCuwwWW_t) \
+	GO(xcb_grab_key, xFpCuWCCC_t) \
+	GO(xcb_grab_key_checked, xFpCuWCCC_t) \
+	GO(xcb_image_text_8, xFpCuuwwp_t) \
+	GO(xcb_image_text_8_checked, xFpCuuwwp_t) \
+	GO(xcb_get_property, xFpCuuuuu_t) \
+	GO(xcb_get_property_unchecked, xFpCuuuuu_t) \
+	GO(xcb_get_image, xFpCuwwWWu_t) \
+	GO(xcb_get_image_unchecked, xFpCuwwWWu_t) \
+	GO(xcb_change_property, xFpCuuuCup_t) \
+	GO(xcb_change_property_checked, xFpCuuuCup_t) \
+	GO(xcb_grab_pointer, xFpCuWCCuuu_t) \
+	GO(xcb_warp_pointer, xFpuuwwWWww_t) \
+	GO(xcb_grab_button, xFpCuWCCuuCW_t) \
+	GO(xcb_grab_button_checked, xFpCuWCCuuCW_t) \
+	GO(xcb_copy_area, xFpuuuwwwwWW_t) \
+	GO(xcb_put_image, xFpCuuWWwwCCup_t) \
+	GO(xcb_create_cursor, xFpuuuWWWWWWWW_t) \
+	GO(xcb_create_glyph_cursor, xFpuuuWWWWWWWW_t) \
+	GO(xcb_create_window, xFpCuuwwWWWWuup_t) \
+	GO(xcb_create_window_checked, xFpCuuwwWWWWuup_t)
+
+#endif // __wrappedlibxcbTYPES_H_

src/wrapped/generated/wrappedlibxcbxfixestypes.h

@@ -0,0 +1,26 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbxfixesTYPES_H_
+#define __wrappedlibxcbxfixesTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpu_t)(void*, uint32_t);
+typedef my_xcb_cookie_t (*XFpuu_t)(void*, uint32_t, uint32_t);
+typedef my_xcb_cookie_t (*XFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef my_xcb_cookie_t (*XFpuuwwu_t)(void*, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_xfixes_destroy_region, XFpu_t) \
+	GO(xcb_xfixes_query_version_unchecked, XFpuu_t) \
+	GO(xcb_xfixes_create_region, XFpuup_t) \
+	GO(xcb_xfixes_set_window_shape_region, XFpuuwwu_t) \
+	GO(xcb_xfixes_set_window_shape_region_checked, XFpuuwwu_t)
+
+#endif // __wrappedlibxcbxfixesTYPES_H_

src/wrapped/generated/wrappedlibxcbxtesttypes.h

@@ -0,0 +1,20 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxcbxtestTYPES_H_
+#define __wrappedlibxcbxtestTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef my_xcb_cookie_t (*XFpCCuuwwC_t)(void*, uint8_t, uint8_t, uint32_t, uint32_t, int16_t, int16_t, uint8_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xcb_test_fake_input, XFpCCuuwwC_t) \
+	GO(xcb_test_fake_input_checked, XFpCCuuwwC_t)
+
+#endif // __wrappedlibxcbxtestTYPES_H_

src/wrapped/generated/wrappedlibxexttypes.h

@@ -0,0 +1,27 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxextTYPES_H_
+#define __wrappedlibxextTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef int32_t (*iFpppiiu_t)(void*, void*, void*, int32_t, int32_t, uint32_t);
+typedef void* (*pFppppip_t)(void*, void*, void*, void*, int32_t, void*);
+typedef void* (*pFppuippuu_t)(void*, void*, uint32_t, int32_t, void*, void*, uint32_t, uint32_t);
+typedef int32_t (*iFppppiiiiuui_t)(void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XSetExtensionErrorHandler, pFp_t) \
+	GO(XShmGetImage, iFpppiiu_t) \
+	GO(XextAddDisplay, pFppppip_t) \
+	GO(XShmCreateImage, pFppuippuu_t) \
+	GO(XShmPutImage, iFppppiiiiuui_t)
+
+#endif // __wrappedlibxextTYPES_H_

src/wrapped/generated/wrappedlibxtsttypes.h

@@ -0,0 +1,20 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxtstTYPES_H_
+#define __wrappedlibxtstTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XRecordEnableContext, iFpppp_t) \
+	GO(XRecordEnableContextAsync, iFpppp_t)
+
+#endif // __wrappedlibxtstTYPES_H_

src/wrapped/generated/wrappedlibxttypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibxtTYPES_H_
+#define __wrappedlibxtTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XtAddEventHandler, vFpuipp_t)
+
+#endif // __wrappedlibxtTYPES_H_

src/wrapped/generated/wrappedlibztypes.h

@@ -0,0 +1,28 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedlibzTYPES_H_
+#define __wrappedlibzTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef int32_t (*iFppi_t)(void*, void*, int32_t);
+typedef int32_t (*iFpipi_t)(void*, int32_t, void*, int32_t);
+typedef int32_t (*iFpiiiiipi_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(deflateEnd, iFp_t) \
+	GO(inflateEnd, iFp_t) \
+	GO(inflateInit, iFp_t) \
+	GO(inflateInit_, iFppi_t) \
+	GO(deflateInit_, iFpipi_t) \
+	GO(inflateInit2_, iFpipi_t) \
+	GO(deflateInit2_, iFpiiiiipi_t)
+
+#endif // __wrappedlibzTYPES_H_

src/wrapped/generated/wrappedmpg123types.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedmpg123TYPES_H_
+#define __wrappedmpg123TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(mpg123_replace_reader_handle, iFpppp_t) \
+	GO(mpg123_replace_reader_handle_32, iFpppp_t) \
+	GO(mpg123_replace_reader_handle_64, iFpppp_t)
+
+#endif // __wrappedmpg123TYPES_H_

src/wrapped/generated/wrappedopenaltypes.h

@@ -0,0 +1,25 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedopenalTYPES_H_
+#define __wrappedopenalTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFv_t)(void);
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFiiipp_t)(int32_t, int32_t, int32_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(alRequestFoldbackStop, vFv_t) \
+	GO(alGetProcAddress, pFp_t) \
+	GO(alcGetProcAddress, pFpp_t) \
+	GO(alRequestFoldbackStart, vFiiipp_t)
+
+#endif // __wrappedopenalTYPES_H_

src/wrapped/generated/wrappedpangotypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedpangoTYPES_H_
+#define __wrappedpangoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(pango_attribute_init, vFpp_t)
+
+#endif // __wrappedpangoTYPES_H_

src/wrapped/generated/wrappedpng12types.h

@@ -0,0 +1,29 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedpng12TYPES_H_
+#define __wrappedpng12TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
+typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(png_set_read_fn, vFppp_t) \
+	GO(png_set_error_fn, vFpppp_t) \
+	GO(png_set_write_fn, vFpppp_t) \
+	GO(png_create_read_struct, pFpppp_t) \
+	GO(png_set_progressive_read_fn, vFppppp_t) \
+	GO(png_create_read_struct_2, pFppppppp_t) \
+	GO(png_create_write_struct_2, pFppppppp_t)
+
+#endif // __wrappedpng12TYPES_H_

src/wrapped/generated/wrappedpng16types.h

@@ -0,0 +1,31 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedpng16TYPES_H_
+#define __wrappedpng16TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
+typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(png_set_read_user_transform_fn, vFpp_t) \
+	GO(png_set_read_fn, vFppp_t) \
+	GO(png_set_error_fn, vFpppp_t) \
+	GO(png_set_write_fn, vFpppp_t) \
+	GO(png_create_read_struct, pFpppp_t) \
+	GO(png_set_progressive_read_fn, vFppppp_t) \
+	GO(png_create_read_struct_2, pFppppppp_t) \
+	GO(png_create_write_struct_2, pFppppppp_t)
+
+#endif // __wrappedpng16TYPES_H_

src/wrapped/generated/wrappedpulsetypes.h

@@ -0,0 +1,102 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedpulseTYPES_H_
+#define __wrappedpulseTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void* (*pFipp_t)(int32_t, void*, void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef int32_t (*iFppip_t)(void*, void*, int32_t, void*);
+typedef int32_t (*iFpppV_t)(void*, void*, void*, void*);
+typedef void* (*pFpipp_t)(void*, int32_t, void*, void*);
+typedef void* (*pFpupp_t)(void*, uint32_t, void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
+typedef void* (*pFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
+typedef void* (*pFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
+typedef void* (*pFpuppp_t)(void*, uint32_t, void*, void*, void*);
+typedef void* (*pFppppp_t)(void*, void*, void*, void*, void*);
+typedef int32_t (*iFppupIi_t)(void*, void*, uint32_t, void*, int64_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(pa_mainloop_free, vFp_t) \
+	GO(pa_threaded_mainloop_free, vFp_t) \
+	GO(pa_signal_init, iFp_t) \
+	GO(pa_mainloop_get_api, pFp_t) \
+	GO(pa_threaded_mainloop_get_api, pFp_t) \
+	GO(pa_signal_set_destroy, vFpp_t) \
+	GO(pa_context_new, pFpp_t) \
+	GO(pa_context_set_event_callback, vFppp_t) \
+	GO(pa_context_set_state_callback, vFppp_t) \
+	GO(pa_context_set_subscribe_callback, vFppp_t) \
+	GO(pa_mainloop_set_poll_func, vFppp_t) \
+	GO(pa_stream_set_buffer_attr_callback, vFppp_t) \
+	GO(pa_stream_set_event_callback, vFppp_t) \
+	GO(pa_stream_set_latency_update_callback, vFppp_t) \
+	GO(pa_stream_set_moved_callback, vFppp_t) \
+	GO(pa_stream_set_overflow_callback, vFppp_t) \
+	GO(pa_stream_set_read_callback, vFppp_t) \
+	GO(pa_stream_set_started_callback, vFppp_t) \
+	GO(pa_stream_set_state_callback, vFppp_t) \
+	GO(pa_stream_set_suspended_callback, vFppp_t) \
+	GO(pa_stream_set_underflow_callback, vFppp_t) \
+	GO(pa_stream_set_write_callback, vFppp_t) \
+	GO(pa_signal_new, pFipp_t) \
+	GO(pa_context_drain, pFppp_t) \
+	GO(pa_context_exit_daemon, pFppp_t) \
+	GO(pa_context_get_client_info_list, pFppp_t) \
+	GO(pa_context_get_module_info_list, pFppp_t) \
+	GO(pa_context_get_server_info, pFppp_t) \
+	GO(pa_context_get_sink_info_list, pFppp_t) \
+	GO(pa_context_get_sink_input_info_list, pFppp_t) \
+	GO(pa_context_get_source_info_list, pFppp_t) \
+	GO(pa_context_new_with_proplist, pFppp_t) \
+	GO(pa_stream_drain, pFppp_t) \
+	GO(pa_stream_flush, pFppp_t) \
+	GO(pa_stream_prebuf, pFppp_t) \
+	GO(pa_stream_trigger, pFppp_t) \
+	GO(pa_stream_update_timing_info, pFppp_t) \
+	GO(pa_context_connect, iFppip_t) \
+	GO(pa_proplist_setf, iFpppV_t) \
+	GO(pa_stream_cork, pFpipp_t) \
+	GO(pa_context_get_sink_info_by_index, pFpupp_t) \
+	GO(pa_context_get_sink_input_info, pFpupp_t) \
+	GO(pa_context_get_source_info_by_index, pFpupp_t) \
+	GO(pa_context_subscribe, pFpupp_t) \
+	GO(pa_context_unload_module, pFpupp_t) \
+	GO(pa_stream_update_sample_rate, pFpupp_t) \
+	GO(pa_context_get_sink_info_by_name, pFpppp_t) \
+	GO(pa_context_get_source_info_by_name, pFpppp_t) \
+	GO(pa_context_proplist_remove, pFpppp_t) \
+	GO(pa_context_set_default_sink, pFpppp_t) \
+	GO(pa_context_set_default_source, pFpppp_t) \
+	GO(pa_context_set_name, pFpppp_t) \
+	GO(pa_stream_proplist_remove, pFpppp_t) \
+	GO(pa_stream_set_buffer_attr, pFpppp_t) \
+	GO(pa_stream_set_name, pFpppp_t) \
+	GO(pa_context_proplist_update, pFpippp_t) \
+	GO(pa_stream_proplist_update, pFpippp_t) \
+	GO(pa_context_set_sink_input_mute, pFpuipp_t) \
+	GO(pa_context_set_source_mute_by_index, pFpuipp_t) \
+	GO(pa_context_move_sink_input_by_index, pFpuupp_t) \
+	GO(pa_context_set_sink_input_volume, pFpuppp_t) \
+	GO(pa_context_set_sink_volume_by_index, pFpuppp_t) \
+	GO(pa_context_set_source_volume_by_index, pFpuppp_t) \
+	GO(pa_context_load_module, pFppppp_t) \
+	GO(pa_context_set_source_volume_by_name, pFppppp_t) \
+	GO(pa_stream_write, iFppupIi_t)
+
+#endif // __wrappedpulseTYPES_H_

src/wrapped/generated/wrappedsdl1imagetypes.h

@@ -0,0 +1,37 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl1imageTYPES_H_
+#define __wrappedsdl1imageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void* (*pFpip_t)(void*, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(IMG_LoadBMP_RW, pFp_t) \
+	GO(IMG_LoadCUR_RW, pFp_t) \
+	GO(IMG_LoadGIF_RW, pFp_t) \
+	GO(IMG_LoadICO_RW, pFp_t) \
+	GO(IMG_LoadJPG_RW, pFp_t) \
+	GO(IMG_LoadLBM_RW, pFp_t) \
+	GO(IMG_LoadPCX_RW, pFp_t) \
+	GO(IMG_LoadPNG_RW, pFp_t) \
+	GO(IMG_LoadPNM_RW, pFp_t) \
+	GO(IMG_LoadTGA_RW, pFp_t) \
+	GO(IMG_LoadTIF_RW, pFp_t) \
+	GO(IMG_LoadWEBP_RW, pFp_t) \
+	GO(IMG_LoadXCF_RW, pFp_t) \
+	GO(IMG_LoadXPM_RW, pFp_t) \
+	GO(IMG_LoadXV_RW, pFp_t) \
+	GO(IMG_Load_RW, pFpi_t) \
+	GO(IMG_LoadTyped_RW, pFpip_t)
+
+#endif // __wrappedsdl1imageTYPES_H_

src/wrapped/generated/wrappedsdl1mixertypes.h

@@ -0,0 +1,33 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl1mixerTYPES_H_
+#define __wrappedsdl1mixerTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFip_t)(int32_t, void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void* (*pFpii_t)(void*, int32_t, int32_t);
+typedef int32_t (*iFippp_t)(int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(Mix_ChannelFinished, vFp_t) \
+	GO(Mix_HookMusicFinished, vFp_t) \
+	GO(Mix_LoadMUS_RW, pFp_t) \
+	GO(Mix_HookMusic, vFpp_t) \
+	GO(Mix_SetPostMix, vFpp_t) \
+	GO(Mix_UnregisterEffect, iFip_t) \
+	GO(Mix_LoadWAV_RW, pFpi_t) \
+	GO(Mix_LoadMUSType_RW, pFpii_t) \
+	GO(Mix_RegisterEffect, iFippp_t)
+
+#endif // __wrappedsdl1mixerTYPES_H_

src/wrapped/generated/wrappedsdl1ttftypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl1ttfTYPES_H_
+#define __wrappedsdl1ttfTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFpii_t)(void*, int32_t, int32_t);
+typedef void* (*pFpiii_t)(void*, int32_t, int32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(TTF_OpenFontRW, pFpii_t) \
+	GO(TTF_OpenFontIndexRW, pFpiii_t)
+
+#endif // __wrappedsdl1ttfTYPES_H_

src/wrapped/generated/wrappedsdl1types.h

@@ -0,0 +1,65 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl1TYPES_H_
+#define __wrappedsdl1TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef uint32_t (*uFp_t)(void*);
+typedef uint64_t (*UFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef void* (*pFp_t)(void*);
+typedef int32_t (*iFup_t)(uint32_t, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef uint32_t (*uFpW_t)(void*, uint16_t);
+typedef uint32_t (*uFpu_t)(void*, uint32_t);
+typedef uint32_t (*uFpU_t)(void*, uint64_t);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef int32_t (*iFppi_t)(void*, void*, int32_t);
+typedef void* (*pFupp_t)(uint32_t, void*, void*);
+typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SDL_KillThread, vFp_t) \
+	GO(SDL_SetEventFilter, vFp_t) \
+	GO(SDL_UnloadObject, vFp_t) \
+	GO(SDL_GetWMInfo, iFp_t) \
+	GO(SDL_RemoveTimer, iFp_t) \
+	GO(SDL_ReadBE16, uFp_t) \
+	GO(SDL_ReadBE32, uFp_t) \
+	GO(SDL_ReadLE16, uFp_t) \
+	GO(SDL_ReadLE32, uFp_t) \
+	GO(SDL_ReadBE64, UFp_t) \
+	GO(SDL_ReadLE64, UFp_t) \
+	GO(SDL_GetEventFilter, pFv_t) \
+	GO(SDL_GL_GetProcAddress, pFp_t) \
+	GO(SDL_LoadObject, pFp_t) \
+	GO(SDL_SetTimer, iFup_t) \
+	GO(SDL_OpenAudio, iFpp_t) \
+	GO(SDL_WriteBE16, uFpW_t) \
+	GO(SDL_WriteLE16, uFpW_t) \
+	GO(SDL_WriteBE32, uFpu_t) \
+	GO(SDL_WriteLE32, uFpu_t) \
+	GO(SDL_WriteBE64, uFpU_t) \
+	GO(SDL_WriteLE64, uFpU_t) \
+	GO(SDL_LoadBMP_RW, pFpi_t) \
+	GO(SDL_RWFromConstMem, pFpi_t) \
+	GO(SDL_RWFromFP, pFpi_t) \
+	GO(SDL_RWFromMem, pFpi_t) \
+	GO(SDL_CreateThread, pFpp_t) \
+	GO(SDL_LoadFunction, pFpp_t) \
+	GO(SDL_RWFromFile, pFpp_t) \
+	GO(SDL_SaveBMP_RW, iFppi_t) \
+	GO(SDL_AddTimer, pFupp_t) \
+	GO(SDL_LoadWAV_RW, pFpippp_t)
+
+#endif // __wrappedsdl1TYPES_H_

src/wrapped/generated/wrappedsdl2imagetypes.h

@@ -0,0 +1,43 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl2imageTYPES_H_
+#define __wrappedsdl2imageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef int32_t (*iFppi_t)(void*, void*, int32_t);
+typedef void* (*pFpip_t)(void*, int32_t, void*);
+typedef void* (*pFppi_t)(void*, void*, int32_t);
+typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(IMG_LoadBMP_RW, pFp_t) \
+	GO(IMG_LoadCUR_RW, pFp_t) \
+	GO(IMG_LoadGIF_RW, pFp_t) \
+	GO(IMG_LoadICO_RW, pFp_t) \
+	GO(IMG_LoadJPG_RW, pFp_t) \
+	GO(IMG_LoadLBM_RW, pFp_t) \
+	GO(IMG_LoadPCX_RW, pFp_t) \
+	GO(IMG_LoadPNG_RW, pFp_t) \
+	GO(IMG_LoadPNM_RW, pFp_t) \
+	GO(IMG_LoadTGA_RW, pFp_t) \
+	GO(IMG_LoadTIF_RW, pFp_t) \
+	GO(IMG_LoadWEBP_RW, pFp_t) \
+	GO(IMG_LoadXCF_RW, pFp_t) \
+	GO(IMG_LoadXPM_RW, pFp_t) \
+	GO(IMG_LoadXV_RW, pFp_t) \
+	GO(IMG_Load_RW, pFpi_t) \
+	GO(IMG_SavePNG_RW, iFppi_t) \
+	GO(IMG_LoadTyped_RW, pFpip_t) \
+	GO(IMG_LoadTexture_RW, pFppi_t) \
+	GO(IMG_LoadTextureTyped_RW, pFppip_t)
+
+#endif // __wrappedsdl2imageTYPES_H_

src/wrapped/generated/wrappedsdl2mixertypes.h

@@ -0,0 +1,34 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl2mixerTYPES_H_
+#define __wrappedsdl2mixerTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFiw_t)(int32_t, int16_t);
+typedef int32_t (*iFip_t)(int32_t, void*);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void* (*pFpii_t)(void*, int32_t, int32_t);
+typedef int32_t (*iFippp_t)(int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(Mix_ChannelFinished, vFp_t) \
+	GO(Mix_HookMusicFinished, vFp_t) \
+	GO(Mix_HookMusic, vFpp_t) \
+	GO(Mix_SetPostMix, vFpp_t) \
+	GO(MinorityMix_SetPosition, iFiw_t) \
+	GO(Mix_UnregisterEffect, iFip_t) \
+	GO(Mix_LoadMUS_RW, pFpi_t) \
+	GO(Mix_LoadWAV_RW, pFpi_t) \
+	GO(Mix_LoadMUSType_RW, pFpii_t) \
+	GO(Mix_RegisterEffect, iFippp_t)
+
+#endif // __wrappedsdl2mixerTYPES_H_

src/wrapped/generated/wrappedsdl2ttftypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl2ttfTYPES_H_
+#define __wrappedsdl2ttfTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFpii_t)(void*, int32_t, int32_t);
+typedef void* (*pFpiii_t)(void*, int32_t, int32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(TTF_OpenFontRW, pFpii_t) \
+	GO(TTF_OpenFontIndexRW, pFpiii_t)
+
+#endif // __wrappedsdl2ttfTYPES_H_

src/wrapped/generated/wrappedsdl2types.h

@@ -0,0 +1,125 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsdl2TYPES_H_
+#define __wrappedsdl2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef int32_t (*iFJ_t)(SDL_JoystickGUID);
+typedef int64_t (*IFp_t)(void*);
+typedef uint32_t (*uFp_t)(void*);
+typedef uint64_t (*UFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFJ_t)(SDL_JoystickGUID);
+typedef SDL_JoystickGUID (*JFi_t)(int32_t);
+typedef SDL_JoystickGUID (*JFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFpV_t)(void*, void*);
+typedef int32_t (*iFip_t)(int32_t, void*);
+typedef int32_t (*iFWW_t)(uint16_t, uint16_t);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef uint32_t (*uFpW_t)(void*, uint16_t);
+typedef uint32_t (*uFpu_t)(void*, uint32_t);
+typedef uint32_t (*uFpU_t)(void*, uint64_t);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef SDL_GameControllerButtonBind (*gFpi_t)(void*, int32_t);
+typedef void (*vFipV_t)(int32_t, void*, void*);
+typedef int32_t (*iFupp_t)(uint32_t, void*, void*);
+typedef int32_t (*iFppi_t)(void*, void*, int32_t);
+typedef int64_t (*IFpIi_t)(void*, int64_t, int32_t);
+typedef void* (*pFupp_t)(uint32_t, void*, void*);
+typedef void* (*pFppi_t)(void*, void*, int32_t);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef void (*vFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef void (*vFJppp_t)(SDL_JoystickGUID, void*, void*, void*);
+typedef uint32_t (*uFppuu_t)(void*, void*, uint32_t, uint32_t);
+typedef int32_t (*iFpippi_t)(void*, int32_t, void*, void*, int32_t);
+typedef int32_t (*iFpupVV_t)(void*, uint32_t, void*, void*, void*);
+typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SDL_UnloadObject, vFp_t) \
+	GO(SDL_RWclose, iFp_t) \
+	GO(SDL_RemoveTimer, iFp_t) \
+	GO(SDL_SaveAllDollarTemplates, iFp_t) \
+	GO(SDL_IsJoystickHIDAPI, iFJ_t) \
+	GO(SDL_IsJoystickXInput, iFJ_t) \
+	GO(SDL_RWtell, IFp_t) \
+	GO(SDL_ReadBE16, uFp_t) \
+	GO(SDL_ReadBE32, uFp_t) \
+	GO(SDL_ReadLE16, uFp_t) \
+	GO(SDL_ReadLE32, uFp_t) \
+	GO(SDL_ReadU8, uFp_t) \
+	GO(SDL_ReadBE64, UFp_t) \
+	GO(SDL_ReadLE64, UFp_t) \
+	GO(SDL_GetBasePath, pFv_t) \
+	GO(SDL_Vulkan_GetVkGetInstanceProcAddr, pFv_t) \
+	GO(SDL_GL_GetProcAddress, pFp_t) \
+	GO(SDL_LoadObject, pFp_t) \
+	GO(SDL_GameControllerMappingForGUID, pFJ_t) \
+	GO(SDL_JoystickGetDeviceGUID, JFi_t) \
+	GO(SDL_JoystickGetGUID, JFp_t) \
+	GO(SDL_JoystickGetGUIDFromString, JFp_t) \
+	GO(SDL_AddEventWatch, vFpp_t) \
+	GO(SDL_DelEventWatch, vFpp_t) \
+	GO(SDL_LogGetOutputFunction, vFpp_t) \
+	GO(SDL_LogSetOutputFunction, vFpp_t) \
+	GO(SDL_SetEventFilter, vFpp_t) \
+	GO(SDL_Log, vFpV_t) \
+	GO(SDL_SaveDollarTemplate, iFip_t) \
+	GO(SDL_IsJoystickNintendoSwitchPro, iFWW_t) \
+	GO(SDL_IsJoystickPS4, iFWW_t) \
+	GO(SDL_IsJoystickSteamController, iFWW_t) \
+	GO(SDL_IsJoystickXbox360, iFWW_t) \
+	GO(SDL_IsJoystickXboxOne, iFWW_t) \
+	GO(SDL_GameControllerAddMappingsFromRW, iFpi_t) \
+	GO(SDL_GetEventFilter, iFpp_t) \
+	GO(SDL_OpenAudio, iFpp_t) \
+	GO(SDL_WriteBE16, uFpW_t) \
+	GO(SDL_WriteLE16, uFpW_t) \
+	GO(SDL_WriteBE32, uFpu_t) \
+	GO(SDL_WriteLE32, uFpu_t) \
+	GO(SDL_WriteU8, uFpu_t) \
+	GO(SDL_WriteBE64, uFpU_t) \
+	GO(SDL_WriteLE64, uFpU_t) \
+	GO(SDL_LoadBMP_RW, pFpi_t) \
+	GO(SDL_RWFromConstMem, pFpi_t) \
+	GO(SDL_RWFromFP, pFpi_t) \
+	GO(SDL_RWFromMem, pFpi_t) \
+	GO(SDL_LoadFunction, pFpp_t) \
+	GO(SDL_RWFromFile, pFpp_t) \
+	GO(SDL_GameControllerGetBindForAxis, gFpi_t) \
+	GO(SDL_GameControllerGetBindForButton, gFpi_t) \
+	GO(SDL_LogCritical, vFipV_t) \
+	GO(SDL_LogDebug, vFipV_t) \
+	GO(SDL_LogError, vFipV_t) \
+	GO(SDL_LogInfo, vFipV_t) \
+	GO(SDL_LogVerbose, vFipV_t) \
+	GO(SDL_LogWarn, vFipV_t) \
+	GO(SDL_TLSSet, iFupp_t) \
+	GO(SDL_SaveBMP_RW, iFppi_t) \
+	GO(SDL_RWseek, IFpIi_t) \
+	GO(SDL_AddTimer, pFupp_t) \
+	GO(SDL_LoadFile_RW, pFppi_t) \
+	GO(SDL_CreateThread, pFppp_t) \
+	GO(SDL_qsort, vFpuup_t) \
+	GO(SDL_GetJoystickGUIDInfo, vFJppp_t) \
+	GO(SDL_RWread, uFppuu_t) \
+	GO(SDL_RWwrite, uFppuu_t) \
+	GO(SDL_OpenAudioDevice, iFpippi_t) \
+	GO(SDL_snprintf, iFpupVV_t) \
+	GO(SDL_vsnprintf, iFpupVV_t) \
+	GO(SDL_LoadWAV_RW, pFpippp_t)
+
+#endif // __wrappedsdl2TYPES_H_

src/wrapped/generated/wrappedsmpeg2types.h

@@ -0,0 +1,29 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsmpeg2TYPES_H_
+#define __wrappedsmpeg2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFipi_t)(int32_t, void*, int32_t);
+typedef void* (*pFppi_t)(void*, void*, int32_t);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpipi_t)(void*, int32_t, void*, int32_t);
+typedef void* (*pFppii_t)(void*, void*, int32_t, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SMPEG_getinfo, vFpp_t) \
+	GO(SMPEG_new_descr, pFipi_t) \
+	GO(SMPEG_new, pFppi_t) \
+	GO(SMPEG_setdisplay, vFpppp_t) \
+	GO(SMPEG_new_data, pFpipi_t) \
+	GO(SMPEG_new_rwops, pFppii_t)
+
+#endif // __wrappedsmpeg2TYPES_H_

src/wrapped/generated/wrappedsmpegtypes.h

@@ -0,0 +1,28 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedsmpegTYPES_H_
+#define __wrappedsmpegTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFipi_t)(int32_t, void*, int32_t);
+typedef void* (*pFppi_t)(void*, void*, int32_t);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpipi_t)(void*, int32_t, void*, int32_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SMPEG_getinfo, vFpp_t) \
+	GO(SMPEG_new_descr, pFipi_t) \
+	GO(SMPEG_new, pFppi_t) \
+	GO(SMPEG_new_rwops, pFppi_t) \
+	GO(SMPEG_setdisplay, vFpppp_t) \
+	GO(SMPEG_new_data, pFpipi_t)
+
+#endif // __wrappedsmpegTYPES_H_

src/wrapped/generated/wrappedtcmallocminimaltypes.h

@@ -0,0 +1,23 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedtcmallocminimalTYPES_H_
+#define __wrappedtcmallocminimalTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpL_t)(void*, uintptr_t);
+typedef void* (*pFpLiiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t, int32_t);
+typedef void* (*pFpLiiiI_t)(void*, uintptr_t, int32_t, int32_t, int32_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(munmap, iFpL_t) \
+	GO(mmap, pFpLiiii_t) \
+	GO(mmap64, pFpLiiiI_t)
+
+#endif // __wrappedtcmallocminimalTYPES_H_

src/wrapped/generated/wrappedutiltypes.h

@@ -0,0 +1,19 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedutilTYPES_H_
+#define __wrappedutilTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(forkpty, iFpppp_t)
+
+#endif // __wrappedutilTYPES_H_

src/wrapped/generated/wrappedvorbisfiletypes.h

@@ -0,0 +1,66 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedvorbisfileTYPES_H_
+#define __wrappedvorbisfileTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int32_t (*iFp_t)(void*);
+typedef int64_t (*IFp_t)(void*);
+typedef double (*dFp_t)(void*);
+typedef int32_t (*iFpi_t)(void*, int32_t);
+typedef int32_t (*iFpI_t)(void*, int64_t);
+typedef int32_t (*iFpd_t)(void*, double);
+typedef int32_t (*iFpp_t)(void*, void*);
+typedef int64_t (*IFpi_t)(void*, int32_t);
+typedef double (*dFpi_t)(void*, int32_t);
+typedef void* (*pFpi_t)(void*, int32_t);
+typedef int32_t (*iFppip_t)(void*, void*, int32_t, void*);
+typedef int32_t (*iFpppi_t)(void*, void*, void*, int32_t);
+typedef int32_t (*iFppiiiip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, void*);
+typedef int32_t (*iFpppipppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(ov_bitrate_instant, iFp_t) \
+	GO(ov_clear, iFp_t) \
+	GO(ov_halfrate_p, iFp_t) \
+	GO(ov_seekable, iFp_t) \
+	GO(ov_streams, iFp_t) \
+	GO(ov_test_open, iFp_t) \
+	GO(ov_pcm_tell, IFp_t) \
+	GO(ov_raw_tell, IFp_t) \
+	GO(ov_time_tell, dFp_t) \
+	GO(ov_bitrate, iFpi_t) \
+	GO(ov_halfrate, iFpi_t) \
+	GO(ov_raw_seek, iFpi_t) \
+	GO(ov_raw_seek_lap, iFpi_t) \
+	GO(ov_serialnumber, iFpi_t) \
+	GO(ov_pcm_seek, iFpI_t) \
+	GO(ov_pcm_seek_lap, iFpI_t) \
+	GO(ov_pcm_seek_page, iFpI_t) \
+	GO(ov_pcm_seek_page_lap, iFpI_t) \
+	GO(ov_time_seek, iFpd_t) \
+	GO(ov_time_seek_lap, iFpd_t) \
+	GO(ov_time_seek_page, iFpd_t) \
+	GO(ov_time_seek_page_lap, iFpd_t) \
+	GO(ov_crosslap, iFpp_t) \
+	GO(ov_fopen, iFpp_t) \
+	GO(ov_pcm_total, IFpi_t) \
+	GO(ov_raw_total, IFpi_t) \
+	GO(ov_time_total, dFpi_t) \
+	GO(ov_comment, pFpi_t) \
+	GO(ov_info, pFpi_t) \
+	GO(ov_read_float, iFppip_t) \
+	GO(ov_open, iFpppi_t) \
+	GO(ov_test, iFpppi_t) \
+	GO(ov_read, iFppiiiip_t) \
+	GO(ov_open_callbacks, iFpppipppp_t) \
+	GO(ov_open_callbacks, iFpppipppp_t)
+
+#endif // __wrappedvorbisfileTYPES_H_

src/wrapped/generated/wrappedvulkantypes.h

@@ -0,0 +1,103 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedvulkanTYPES_H_
+#define __wrappedvulkanTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFpUp_t)(void*, uint64_t, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int32_t (*iFpUp_t)(void*, uint64_t, void*);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef int32_t (*iFPpp_t)(void*, void*, void*);
+typedef int32_t (*iFpUup_t)(void*, uint64_t, uint32_t, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpPpp_t)(void*, void*, void*, void*);
+typedef void (*vFpupup_t)(void*, uint32_t, void*, uint32_t, void*);
+typedef int32_t (*iFpuppp_t)(void*, uint32_t, void*, void*, void*);
+typedef int32_t (*iFpUPpp_t)(void*, uint64_t, void*, void*, void*);
+typedef int32_t (*iFpUuppp_t)(void*, uint64_t, uint32_t, void*, void*, void*);
+typedef void (*vFpiiiiipp_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*);
+typedef void (*vFpiiiupupup_t)(void*, int32_t, int32_t, int32_t, uint32_t, void*, uint32_t, void*, uint32_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(vkDestroyDevice, vFpp_t) \
+	GO(vkDestroyInstance, vFpp_t) \
+	GO(vkGetPhysicalDeviceMemoryProperties, vFpp_t) \
+	GO(vkGetPhysicalDeviceProperties, vFpp_t) \
+	GO(vkGetDeviceProcAddr, pFpp_t) \
+	GO(vkGetInstanceProcAddr, pFpp_t) \
+	GO(vkDestroyBuffer, vFpUp_t) \
+	GO(vkDestroyBufferView, vFpUp_t) \
+	GO(vkDestroyCommandPool, vFpUp_t) \
+	GO(vkDestroyDescriptorPool, vFpUp_t) \
+	GO(vkDestroyDescriptorSetLayout, vFpUp_t) \
+	GO(vkDestroyDescriptorUpdateTemplate, vFpUp_t) \
+	GO(vkDestroyDescriptorUpdateTemplateKHR, vFpUp_t) \
+	GO(vkDestroyEvent, vFpUp_t) \
+	GO(vkDestroyFence, vFpUp_t) \
+	GO(vkDestroyFramebuffer, vFpUp_t) \
+	GO(vkDestroyImage, vFpUp_t) \
+	GO(vkDestroyImageView, vFpUp_t) \
+	GO(vkDestroyPipeline, vFpUp_t) \
+	GO(vkDestroyPipelineCache, vFpUp_t) \
+	GO(vkDestroyPipelineLayout, vFpUp_t) \
+	GO(vkDestroyQueryPool, vFpUp_t) \
+	GO(vkDestroyRenderPass, vFpUp_t) \
+	GO(vkDestroySampler, vFpUp_t) \
+	GO(vkDestroySamplerYcbcrConversionKHR, vFpUp_t) \
+	GO(vkDestroySemaphore, vFpUp_t) \
+	GO(vkDestroyShaderModule, vFpUp_t) \
+	GO(vkDestroySurfaceKHR, vFpUp_t) \
+	GO(vkDestroySwapchainKHR, vFpUp_t) \
+	GO(vkDestroyDebugUtilsMessengerEXT, vFppp_t) \
+	GO(vkFreeMemory, iFpUp_t) \
+	GO(vkGetPhysicalDeviceDisplayPropertiesKHR, iFppp_t) \
+	GO(vkCreateInstance, iFPpp_t) \
+	GO(vkGetDisplayPlaneCapabilitiesKHR, iFpUup_t) \
+	GO(vkCreateDebugUtilsMessengerEXT, iFpppp_t) \
+	GO(vkCreateWaylandSurfaceKHR, iFpppp_t) \
+	GO(vkAllocateMemory, iFpPpp_t) \
+	GO(vkCreateBuffer, iFpPpp_t) \
+	GO(vkCreateBufferView, iFpPpp_t) \
+	GO(vkCreateCommandPool, iFpPpp_t) \
+	GO(vkCreateDescriptorPool, iFpPpp_t) \
+	GO(vkCreateDescriptorSetLayout, iFpPpp_t) \
+	GO(vkCreateDescriptorUpdateTemplate, iFpPpp_t) \
+	GO(vkCreateDescriptorUpdateTemplateKHR, iFpPpp_t) \
+	GO(vkCreateDevice, iFpPpp_t) \
+	GO(vkCreateDisplayPlaneSurfaceKHR, iFpPpp_t) \
+	GO(vkCreateEvent, iFpPpp_t) \
+	GO(vkCreateFence, iFpPpp_t) \
+	GO(vkCreateFramebuffer, iFpPpp_t) \
+	GO(vkCreateImage, iFpPpp_t) \
+	GO(vkCreateImageView, iFpPpp_t) \
+	GO(vkCreatePipelineCache, iFpPpp_t) \
+	GO(vkCreatePipelineLayout, iFpPpp_t) \
+	GO(vkCreateQueryPool, iFpPpp_t) \
+	GO(vkCreateRenderPass, iFpPpp_t) \
+	GO(vkCreateSampler, iFpPpp_t) \
+	GO(vkCreateSamplerYcbcrConversion, iFpPpp_t) \
+	GO(vkCreateSamplerYcbcrConversionKHR, iFpPpp_t) \
+	GO(vkCreateSemaphore, iFpPpp_t) \
+	GO(vkCreateShaderModule, iFpPpp_t) \
+	GO(vkCreateSwapchainKHR, iFpPpp_t) \
+	GO(vkCreateXcbSurfaceKHR, iFpPpp_t) \
+	GO(vkCreateXlibSurfaceKHR, iFpPpp_t) \
+	GO(vkUpdateDescriptorSets, vFpupup_t) \
+	GO(vkCreateSharedSwapchainsKHR, iFpuppp_t) \
+	GO(vkCreateDisplayModeKHR, iFpUPpp_t) \
+	GO(vkCreateComputePipelines, iFpUuppp_t) \
+	GO(vkCreateGraphicsPipelines, iFpUuppp_t) \
+	GO(vkGetPhysicalDeviceSparseImageFormatProperties, vFpiiiiipp_t) \
+	GO(vkCmdPipelineBarrier, vFpiiiupupup_t)
+
+#endif // __wrappedvulkanTYPES_H_

src/wrapped/generated/wrappedxml2types.h

@@ -0,0 +1,58 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedxml2TYPES_H_
+#define __wrappedxml2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpppi_t)(void*, void*, void*, int32_t);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef void* (*pFppppi_t)(void*, void*, void*, void*, int32_t);
+typedef void (*vFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xmlSetExternalEntityLoader, vFp_t) \
+	GO(xmlParseDocument, iFp_t) \
+	GO(xmlGetExternalEntityLoader, pFv_t) \
+	GO(xmlHashFree, vFpp_t) \
+	GO(xmlHashCopy, pFpp_t) \
+	GO(xmlHashScan, vFppp_t) \
+	GO(xmlHashScanFull, vFppp_t) \
+	GO(xmlSchemaSetParserStructuredErrors, vFppp_t) \
+	GO(xmlSchemaSetValidStructuredErrors, vFppp_t) \
+	GO(xmlHashRemoveEntry, iFppp_t) \
+	GO(xmlXPathRegisterFunc, iFppp_t) \
+	GO(xmlNewCharEncodingHandler, pFppp_t) \
+	GO(xmlSchemaSetParserErrors, vFpppp_t) \
+	GO(xmlSchemaSetValidErrors, vFpppp_t) \
+	GO(xmlHashRemoveEntry2, iFpppp_t) \
+	GO(xmlHashUpdateEntry, iFpppp_t) \
+	GO(xmlRegisterInputCallbacks, iFpppp_t) \
+	GO(xmlParserInputBufferCreateIO, pFpppi_t) \
+	GO(xmlOutputBufferCreateIO, pFpppp_t) \
+	GO(xmlHashRemoveEntry3, iFppppp_t) \
+	GO(xmlHashUpdateEntry2, iFppppp_t) \
+	GO(xmlSaveToIO, pFppppi_t) \
+	GO(xmlHashScan3, vFpppppp_t) \
+	GO(xmlHashScanFull3, vFpppppp_t) \
+	GO(xmlHashUpdateEntry3, iFpppppp_t)
+
+#endif // __wrappedxml2TYPES_H_

src/wrapped/generated/wrappedxslttypes.h

@@ -0,0 +1,21 @@
+/*****************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
+ *****************************************************************/
+#ifndef __wrappedxsltTYPES_H_
+#define __wrappedxsltTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int32_t (*iFppp_t)(void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(xsltSetLoaderFunc, vFp_t) \
+	GO(xsltRegisterExtModuleFunction, iFppp_t)
+
+#endif // __wrappedxsltTYPES_H_

src/wrapped/generated/wrapper.c

@@ -69,6 +69,7 @@ void VulkanTox86(void* src, void* save);
 #define ST0val ST0.d
 
 int of_convert(int);
+
 typedef void (*vFE_t)(x86emu_t*);
 typedef void (*vFv_t)(void);
 typedef void (*vFi_t)(int32_t);
@@ -3901,6 +3902,7 @@ void vFppippKKC(x86emu_t *emu, uintptr_t fcn) { vFppippKKC_t fn = (vFppippKKC_t)
 
 void vFEv(x86emu_t *emu, uintptr_t fcn) { vFE_t fn = (vFE_t)fcn; fn(emu); }
 void iFEv(x86emu_t *emu, uintptr_t fcn) { iFE_t fn = (iFE_t)fcn; R_EAX=fn(emu); }
+void uFEv(x86emu_t *emu, uintptr_t fcn) { uFE_t fn = (uFE_t)fcn; R_EAX=(uint32_t)fn(emu); }
 void pFEv(x86emu_t *emu, uintptr_t fcn) { pFE_t fn = (pFE_t)fcn; R_EAX=(uintptr_t)fn(emu); }
 void iFEvpp(x86emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_EAX=fn(emu, *(void**)(R_ESP + 8), *(void**)(R_ESP + 12)); }
 void UFVvvV(x86emu_t *emu, uintptr_t fcn) { UFVV_t fn = (UFVV_t)fcn; ui64_t r; r.u=(uint64_t)fn((void*)(R_ESP + 4), (void*)(R_ESP + 12)); R_EAX=r.d[0]; R_EDX=r.d[1]; }

src/wrapped/generated/wrapper.h

@@ -1947,6 +1947,7 @@ void vFppippKKC(x86emu_t *emu, uintptr_t fnc);
 
 void vFEv(x86emu_t *emu, uintptr_t fnc);
 void iFEv(x86emu_t *emu, uintptr_t fnc);
+void uFEv(x86emu_t *emu, uintptr_t fnc);
 void pFEv(x86emu_t *emu, uintptr_t fnc);
 void iFEvpp(x86emu_t *emu, uintptr_t fnc);
 void UFVvvV(x86emu_t *emu, uintptr_t fnc);
@@ -1960,4 +1961,4 @@ void pFpVvvvvV(x86emu_t *emu, uintptr_t fnc);
 void iFEpuvvppp(x86emu_t *emu, uintptr_t fnc);
 void iFEpLvvpVV(x86emu_t *emu, uintptr_t fnc);
 
-#endif //__WRAPPER_H_
+#endif // __WRAPPER_H_

src/wrapped/wrappedlibc_private.h

@@ -6,7 +6,7 @@
 GO(abort, vFv)
 GO(abs, iFi)
 GOW(accept, iFipp)
-GOM(accept4, iFEippi)   // glibc 2.10+
+GOM(accept4, iFEippi)   //%% glibc 2.10+
 GOW(access, iFpi)
 // acct
 GOW(addmntent, iFpp)
@@ -64,9 +64,9 @@ GOW(argz_next, pFpLp)
 GOW(argz_stringify, vFpLi)
 GO(asctime, pFp)
 GOW(asctime_r, pFpp)
-GOM(asprintf, iFEppVV) // Weak
-GOM(__asprintf, iFEppVV)
-GOM(__asprintf_chk, iFEpipVV)
+GOM(asprintf, iFEppVV)        //%% Weak
+GOM(__asprintf, iFEppVV)      //%%
+GOM(__asprintf_chk, iFEpipVV) //%%
 // __assert
 GO(__assert_fail, vFppup)
 GO(__assert_perror_fail, vFipup)
@@ -98,7 +98,7 @@ GOW(bind_textdomain_codeset, pFpp)
 GOW(brk, iFp)
 // __bsd_getpgrp
 // bsd_signal   // Weak
-GOM(bsearch, pFEppLLp)
+GOM(bsearch, pFEppLLp) //%%
 GOW(btowc, iFi)
 GOW(bzero, vFpL)
 GO(__bzero, vFpL)
@@ -171,11 +171,11 @@ DATAM(__ctype_toupper, 4)
 GO(__ctype_toupper_loc, pFv)
 // __curbrk // type B
 GO(cuserid, pFp)
-GOM(__cxa_atexit, iFEppp)
-GOM(atexit, iFEp)           // just in case
-GOM(__cxa_finalize, vFEp)
+GOM(__cxa_atexit, iFEppp) //%%
+GOM(atexit, iFEp)           //%% just in case
+GOM(__cxa_finalize, vFEp) //%%
 DATAM(__cpu_model, 16)
-GOM(__cxa_thread_atexit_impl, iFEppp)
+GOM(__cxa_thread_atexit_impl, iFEppp) //%%
 // __cyg_profile_func_enter
 // __cyg_profile_func_exit
 // daemon
@@ -196,9 +196,9 @@ GO(__dgettext, pFpp)
 GO(difftime, dFuu)
 GO(dirfd, iFp)
 GO(dirname, pFp)
-GOS(div, pFpii)
+GOS(div, pFpii) //%%
 // _dl_addr
-GOM(dl_iterate_phdr, iFEpp)
+GOM(dl_iterate_phdr, iFEpp) //%%
 // _dl_mcount_wrapper
 // _dl_mcount_wrapper_check
 // _dl_open_hook    // type B
@@ -254,11 +254,11 @@ GO(epoll_ctl, iFiiip)
 // epoll_pwait
 GO(epoll_wait, iFipii)
 #else
-GOM(epoll_create, iFEi)      // not needed, but used in syscall
-GOM(epoll_create1, iFEO)
-GOM(epoll_ctl, iFEiiip)     // align epool_event structure
+GOM(epoll_create, iFEi)     //%% not needed, but used in syscall
+GOM(epoll_create1, iFEO)    //%%
+GOM(epoll_ctl, iFEiiip)     //%% align epool_event structure
 // epoll_pwait
-GOM(epoll_wait, iFEipii)    // need realign of epoll_event structure
+GOM(epoll_wait, iFEipii)    //%% need realign of epoll_event structure
 #endif
 // erand48
 // erand48_r    // Weak
@@ -283,15 +283,15 @@ GO(eventfd, iFui)
 GO(eventfd_read, iFip)
 GO(eventfd_write, iFiU)
 GO2(execl, iFEpV, my_execv)
-GO2(execle, iFEpV, my_execve)  //Nope! This one needs wrapping, because if char*, char*, ..., char*[]
+GO2(execle, iFEpV, my_execve)  // Nope! This one needs wrapping, because is char*, char*, ..., char*[]
 GO2(execlp, iFEpV, execvp)
-GOM(execv, iFEpp)    // is Weak
-GOM(execve, iFEppp)   // and this one too...
+GOM(execv, iFEpp)     //%% Weak
+GOM(execve, iFEppp)   //%% and this one too...
 GOW(execvp, iFpp)
 GO(exit, vFi)
 GO(_exit, vFi)
 GOW(_Exit, vFi)
-GOM(__explicit_bzero_chk, vFEpuu)    // not always defined
+GOM(__explicit_bzero_chk, vFEpuu)    //%% not always defined
 GO(faccessat, iFipii)
 // fattach
 GO(__fbufsize, uFp)
@@ -303,9 +303,9 @@ GOW(fchown, iFiuu)
 GO(fchownat, iFipuii)
 GO(fclose, iFp)
 GOW(fcloseall, iFv)
-GOM(fcntl, iFEiiN)  // this also use a vararg for 3rd argument
-GOM(__fcntl, iFEiiN)
-GOM(fcntl64, iFEiiN)
+GOM(fcntl, iFEiiN)   //%% this also use a vararg for 3rd argument
+GOM(__fcntl, iFEiiN) //%%
+GOM(fcntl64, iFEiiN) //%%
 GO(fcvt, pFdipp)
 GO(fcvt_r, iFdipppL)
 GO(fdatasync, iFi)
@@ -360,16 +360,16 @@ GOW(_flushlbf, vFv)
 GO(fmemopen, pFpup)
 // fmtmsg
 GO(fnmatch, iFppi)
-GOM(fopen, pFEpp)
-GOM(fopen64, pFEpp)  // Weak
-GOM(fopencookie, pFEpppppp)   // last 4p are a struct with 4 callbacks...
-GOM(fork, iFEv) // Weak
-GOM(__fork, iFEv)
+GOM(fopen, pFEpp)           //%%
+GOM(fopen64, pFEpp)         //%% Weak
+GOM(fopencookie, pFEpppppp) //%% last 4p are a struct with 4 callbacks...
+GOM(fork, iFEv)             //%% Weak
+GOM(__fork, iFEv)           //%%
 // __fortify_fail
 GOW(fpathconf, iFii)
 GO(__fpending, uFp)
-GOM(fprintf, iFEppVV)
-GOM(__fprintf_chk, iFEpvpVV)
+GOM(fprintf, iFEppVV) //%%
+GOM(__fprintf_chk, iFEpvpVV) //%%
 //GO2(fprintf, iFppV, vfprintf)
 //GO2(__fprintf_chk, iFpvpV, vfprintf)
 // __fpu_control    // type B
@@ -409,7 +409,7 @@ GO(fsetpos, iFpp)
 GO(fsetpos64, iFpp)
 GO(fsetxattr, iFippui)
 GOW(fstatfs, iFip)
-GOM(fstatfs64, iFip)    // weak
+GOM(fstatfs64, iFip)    //%% weak
 GO(fstatvfs, iFip)
 GOW(fstatvfs64, iFip)   // alignment?
 GOW(fsync, iFi)
@@ -421,29 +421,29 @@ GO(ftok, iFpi)
 GOW(ftruncate, iFiu)
 GOW(ftruncate64, iFiI)
 GOW(ftrylockfile, iFp)
-GOM(fts_children, pFEpi)
-GOM(fts_close, iFEp)
-GOM(fts_open, pFEpip)
-GOM(fts_read, pFEp)
+GOM(fts_children, pFEpi) //%%
+GOM(fts_close, iFEp)     //%%
+GOM(fts_open, pFEpip)    //%%
+GOM(fts_read, pFEp)      //%%
 // fts_set
-GOM(ftw, iFEppi)
-GOM(ftw64, iFEppi)
+GOM(ftw, iFEppi)         //%%
+GOM(ftw64, iFEppi)       //%%
 GOW(funlockfile, vFp)
 GO(futimens, iFip)
 GOW(futimes, iFip) //int futimes(int fd, const struct timeval tv[2])
 GO(futimesat, iFippp)
 // fwide
-GOM(fwprintf, iFEppVV) // Weak
-GOM(__fwprintf_chk, iFEpvpVV)
+GOM(fwprintf, iFEppVV) //%% Weak
+GOM(__fwprintf_chk, iFEpvpVV) //%%
 GO(__fwritable, iFp)
 GOW(fwrite, LFpLLp)
 GO(fwrite_unlocked, uFpuup)
 GO(__fwriting, iFp)
 // fwscanf
-GOM(__fxstat, iFEiip)
-GOM(__fxstat64, iFEiip) // need reaalign of struct stat64
-GOM(__fxstatat, iFEiippi)
-GOM(__fxstatat64, iFEiippi) // struct stat64 again
+GOM(__fxstat, iFEiip)       //%%
+GOM(__fxstat64, iFEiip)     //%% need reaalign of struct stat64
+GOM(__fxstatat, iFEiippi)   //%%
+GOM(__fxstatat64, iFEiippi) //%% struct stat64 again
 // __gai_sigqueue
 GO(gai_strerror, pFi)
 // __gconv_get_alias_db
@@ -459,7 +459,7 @@ GO(getaddrinfo, iFpppp)
 GOW(getc, iFp)
 GOW(getchar, iFv)
 GO(getchar_unlocked, iFv)
-GOM(getcontext, iFEp)
+GOM(getcontext, iFEp)         //%%
 GOW(getc_unlocked, iFp)
 GO(get_current_dir_name, pFv)
 GOW(getcwd, pFpL)
@@ -543,7 +543,7 @@ GO(__getpid, uFv)
 // getpmsg
 GOW(getppid, uFv)
 GO(getpriority, iFii)
-GOM(getrandom, iFEpuu)
+GOM(getrandom, iFEpuu)          //%%
 GO(getprotobyname, pFp)
 GO(getprotobyname_r, iFpppup)
 GO(getprotobynumber, pFi)
@@ -615,8 +615,8 @@ GOW(getwc_unlocked, iFp)
 GO(getwd, pFp)
 // __getwd_chk
 GO(getxattr, iFpppu)
-GOM(glob, iFEpipp)
-GOM(glob64, iFEpipp)
+GOM(glob, iFEpipp)             //%%
+GOM(glob64, iFEpipp)           //%%
 GO(globfree, vFp)
 GO(globfree64, vFp)
 // glob_pattern_p   // Weak
@@ -823,8 +823,8 @@ GO(_IO_switch_to_get_mode, iFp)
 GO(_IO_un_link, vFp)
 GO(_IO_unsave_markers, vFp)
 // _IO_unsave_wmarkers
-GOM(_IO_vfprintf, iFEpppp)
-GOM(_IO_vfscanf, iFEppp)
+GOM(_IO_vfprintf, iFEpppp) //%%
+GOM(_IO_vfscanf, iFEppp)   //%%
 // _IO_vsprintf
 // _IO_wdefault_doallocate
 // _IO_wdefault_finish
@@ -885,15 +885,15 @@ GO(__isnanf, iFf)
 // isnanl   // Weak
 // __isnanl
 #ifdef POWERPCLE
-GOM(__isoc99_fscanf, iFppV)
+GOM(__isoc99_fscanf, iFppV)  //%%
 // __isoc99_fwscanf
 // __isoc99_scanf
-GOM(__isoc99_sscanf, iFppV)
+GOM(__isoc99_sscanf, iFppV)  //%%
 // __isoc99_swscanf
-GOM(__isoc99_vfscanf, iFppp)
+GOM(__isoc99_vfscanf, iFppp) //%%
 // __isoc99_vfwscanf
 // __isoc99_vscanf
-GOM(__isoc99_vsscanf, iFppp) // TODO: check if ok
+GOM(__isoc99_vsscanf, iFppp) //%% TODO: check if ok
 // __isoc99_vswscanf
 // __isoc99_vwscanf
 // __isoc99_wscanf
@@ -903,7 +903,7 @@ GO2(__isoc99_fscanf, iFppV, __isoc99_vfscanf)
 // __isoc99_scanf
 GO2(__isoc99_sscanf, iFppV, __isoc99_vsscanf)
 // __isoc99_swscanf
-GOM(__isoc99_vfscanf, iFppp)
+GOM(__isoc99_vfscanf, iFppp) //%%
 // __isoc99_vfwscanf
 // __isoc99_vscanf
 GO(__isoc99_vsscanf, iFppp)
@@ -995,10 +995,10 @@ GOW(lchown, iFpuu)
 // ldexp    // Weak
 // ldexpf   // Weak
 // ldexpl   // Weak
-GOS(ldiv, pFEpii)     // return a struct, so address of stuct is on the stack, as a shadow 1st element
-GOM(lfind, pFEpppLp)
+GOS(ldiv, pFEpii)               //%% return a struct, so address of stuct is on the stack, as a shadow 1st element
+GOM(lfind, pFEpppLp)            //%%
 GO(lgetxattr, iFpppu)
-GOM(__libc_alloca_cutoff, iFEL)
+GOM(__libc_alloca_cutoff, iFEL) //%%
 // __libc_allocate_rtsig
 // __libc_allocate_rtsig_private
 GO(__libc_calloc, pFLL)
@@ -1007,15 +1007,15 @@ GO(__libc_current_sigrtmax, iFv)
 // __libc_current_sigrtmax_private
 GO(__libc_current_sigrtmin, iFv)
 // __libc_current_sigrtmin_private
-GOM(__libc_dlclose, iFEp)
+GOM(__libc_dlclose, iFEp)       //%%
 // __libc_dl_error_tsd
-GOM(__libc_dlopen_mode, pFEpi)
-GOM(__libc_dlsym, pFEpp)
+GOM(__libc_dlopen_mode, pFEpi)  //%%
+GOM(__libc_dlsym, pFEpp)        //%%
 // __libc_fatal
 // __libc_fork
 GO(__libc_free, vFp)
 // __libc_freeres
-GOM(__libc_init_first, vFEipV)
+GOM(__libc_init_first, vFEipV)  //%%
 // _libc_intl_domainname    // type R
 // __libc_longjmp
 // __libc_mallinfo
@@ -1028,7 +1028,7 @@ GO(__libc_pvalloc, pFL)
 GO(__libc_realloc, pFpL)
 // __libc_sa_len
 // __libc_siglongjmp
-GOM(__libc_start_main, iFEpippppp)
+GOM(__libc_start_main, iFEpippppp) //%%
 // __libc_system
 // __libc_thread_freeres
 GO(__libc_valloc, pFL)
@@ -1048,27 +1048,27 @@ GOW(localtime_r, pFpp)
 GO(lockf, iFiiu)
 GO(lockf64, iFiiI)
 // locs // type B
-GOM(longjmp, vFEpi)
-GOM(_longjmp, vFEpi)
-GOM(__longjmp_chk, vFEpi)
+GOM(longjmp, vFEpi)         //%%
+GOM(_longjmp, vFEpi)        //%%
+GOM(__longjmp_chk, vFEpi)   //%%
 GO(lrand48, iFv)
 // lrand48_r
 GO(lremovexattr, iFpp)
-GOM(lsearch, pFEpppLp)
+GOM(lsearch, pFEpppLp)      //%%
 GOW(lseek, iFiii)
 // __lseek  // Weak
 GOW(lseek64, IFiIi)
 GO(lsetxattr, iFpppui)
 GO(lutimes, iFpp)
-GOM(__lxstat, iFEipp)
-GOM(__lxstat64, iFEipp)
+GOM(__lxstat, iFEipp)       //%%
+GOM(__lxstat64, iFEipp)     //%%
 GO(madvise, iFpLi)
-GOM(makecontext, iFEppiV)
+GOM(makecontext, iFEppiV)   //%%
 GOW(mallinfo, pFv)
 #ifdef NOALIGN
 GO(malloc, pFL)
 #else
-GOM(malloc, pFL)
+GOM(malloc, pFL)            //%%
 #endif
 // malloc_get_state // Weak
 DATAV(__malloc_hook, 4)
@@ -1096,7 +1096,7 @@ GO(mbtowc, iFppL)
 // mcheck_check_all
 // mcheck_pedantic
 // _mcleanup
-GOM(mcount, vFpp)   // Weak
+GOM(mcount, vFpp)   //%% Weak
 // _mcount
 GOW(memalign, pFuu)
 DATAV(__memalign_hook, 4)
@@ -1130,8 +1130,8 @@ GO(mktemp, pFp)
 GO(mktime, LFp)
 GO(mlock, iFpL)
 GO(mlockall, iFi)
-GOM(mmap, pFEpLiiii)
-GOM(mmap64, pFEpLiiiI)
+GOM(mmap, pFEpLiiii)    //%%
+GOM(mmap64, pFEpLiiiI)  //%%
 // modf // Weak
 // modff    // Weak
 // modfl    // Weak
@@ -1141,10 +1141,10 @@ GOM(mmap64, pFEpLiiiI)
 DATA(__morecore, 4)
 GOW(mount, iFpppup)
 // mprobe
-GOM(mprotect, iFEpLi)
+GOM(mprotect, iFEpLi)   //%%
 // mrand48
 // mrand48_r
-GOM(mremap, pFEpLLiN)	// Weak, 5th hidden paramerer "void* new_addr" if flags is MREMAP_FIXED
+GOM(mremap, pFEpLLiN)	//%% Weak, 5th hidden paramerer "void* new_addr" if flags is MREMAP_FIXED
 GO(msgctl, iFiip)
 GOW(msgget, iFpi)
 GOW(msgrcv, lFipLli)
@@ -1153,21 +1153,21 @@ GOW(msync, iFpLi)
 // mtrace
 GO(munlock, iFpL)
 GO(munlockall, iFv)
-GOM(munmap, iFEpL)
+GOM(munmap, iFEpL)       //%%
 // muntrace
-GOM(nanosleep, iFpp)	// weak
+GOM(nanosleep, iFpp)	 //%% weak
 // __nanosleep  // Weak
 // netname2host
 // netname2user
 GOW(newlocale, pFipp)
 GO(__newlocale, pFipp)
 // nfsservctl
-GOM(nftw, iFEppii)
-GOM(nftw64, iFEppii)
+GOM(nftw, iFEppii)       //%%
+GOM(nftw64, iFEppii)     //%%
 GOW(ngettext, pFppu)
 GO(nice, iFi)
-// _nl_default_dirname  // type R
-// _nl_domain_bindings  // type B
+// _nl_default_dirname   // type R
+// _nl_domain_bindings   // type B
 GO(nl_langinfo, pFu)
 GO(__nl_langinfo_l, pFup)
 GOW(nl_langinfo_l, pFup)
@@ -1198,22 +1198,22 @@ GOW(ntohs, uFu)
 // _null_auth   // type B
 // _obstack_allocated_p
 DATAM(obstack_alloc_failed_handler, 4)
-GOM(_obstack_begin, iFpLLpp)
+GOM(_obstack_begin, iFpLLpp) //%%
 // _obstack_begin_1
 DATA(obstack_exit_failure, 4)
-GOM(_obstack_free, vFpp)
-GOM(obstack_free, vFpp)
+GOM(_obstack_free, vFpp)     //%%
+GOM(obstack_free, vFpp)      //%%
 // _obstack_memory_used
-GOM(_obstack_newchunk, vFpi)
+GOM(_obstack_newchunk, vFpi) //%%
 // obstack_printf   // Weak
 // __obstack_printf_chk
-GOM(obstack_vprintf, iFEpppp)  // Weak
+GOM(obstack_vprintf, iFEpppp)  //%% Weak
 // __obstack_vprintf_chk
 // on_exit  // Weak
-GOM(open, iFEpOu)    //Weak
-GOM(__open, iFEpOu) //Weak
+GOM(open, iFEpOu)    //%% Weak
+GOM(__open, iFEpOu)  //%% Weak
 GO(__open_2, iFpO)
-GOM(open64, iFEpOu) //Weak
+GOM(open64, iFEpOu)  //%% Weak
 // __open64 // Weak
 GO(__open64_2, iFpO)
 GOW(openat, iFipOu)
@@ -1279,17 +1279,17 @@ GO(posix_spawn_file_actions_adddup2, iFpii)
 GO(posix_spawn_file_actions_addopen, iFpipii)
 GO(posix_spawn_file_actions_destroy, iFp)
 GO(posix_spawn_file_actions_init, iFp)
-GOM(posix_spawnp, iFEpppppp)
+GOM(posix_spawnp, iFEpppppp) //%%
 GO(ppoll, iFpupp)
 GOW(prctl, iFiLLLL)
 GOW(pread, lFipLl)
 GOW(pread64, lFipLI)
 // __pread64    // Weak
 // __pread64_chk
-GOM(preadv64, lFEipiI)  // not always present
+GOM(preadv64, lFEipiI)  //%% not always present
 // __pread_chk
-GOM(printf, iFEpVV)
-GOM(__printf_chk, iFEvpVV)
+GOM(printf, iFEpVV) //%%
+GOM(__printf_chk, iFEvpVV) //%%
 GO(__printf_fp, iFppp)  // does this needs aligment?
 // printf_size
 // printf_size_info
@@ -1327,7 +1327,7 @@ GO(putwc_unlocked, iFip)
 // pwrite   // Weak
 GOW(pwrite64, lFipLI)
 // __pwrite64   // Weak
-GOM(pwritev64, lFEipiI)  // not always present
+GOM(pwritev64, lFEipiI)  //%% not always present
 // qecvt
 #ifdef HAVE_LD80BITS
 GO(qecvt_r, iFDipppL)
@@ -1341,11 +1341,11 @@ GO(qfcvt_r, iFDipppL)
 GO(qfcvt_r, iFKipppL)
 #endif
 // qgcvt
-GOM(qsort, vFEpLLp)
-GOM(qsort_r, vFEpLLpp)
+GOM(qsort, vFEpLLp) //%%
+GOM(qsort_r, vFEpLLpp) //%%
 // query_module // Weak
 GO(quotactl, iFipip)
-GO(raise, iFi)  // will need a GOM version once signal are implemented probably
+GO(raise, iFi)
 GO(rand, iFv)
 GOW(random, iFv)
 GOW(random_r, iFpp)
@@ -1355,22 +1355,22 @@ GO(__rawmemchr, pFpi)
 // rcmd
 // rcmd_af
 // __rcmd_errstr    // type B
-GOM(read, lFipL)
+GOM(read, lFipL) //%%
 GOW(__read, lFipL)
 // readahead    // Weak
 GO(__read_chk, lFipLL)
-GOM(readdir, pFEp)  // should also be weak
+GOM(readdir, pFEp)  //%% should also be weak
 GO(readdir64, pFp)  // check if alignement is correct
 // readdir64_r
-GOM(readdir_r, iFEppp)  // should also be weak
-GOM(readlink, iFEppL)
+GOM(readdir_r, iFEppp)  //%% should also be weak
+GOM(readlink, iFEppL) //%%
 GO(readlinkat, iFippL)
 // __readlinkat_chk
 // __readlink_chk
 GO(readv, lFipi)
 GO(realloc, pFpL)
 DATAV(__realloc_hook, 4)
-GOM(realpath, pFEpp)
+GOM(realpath, pFEpp) //%%
 GO(__realpath_chk, pFppu)
 // reboot
 // re_comp  // Weak
@@ -1380,14 +1380,14 @@ GO(recv, lFipLi)
 GO(__recv_chk, iFipuui)
 GOW(recvfrom, lFipLipp)
 // __recvfrom_chk
-GOM(recvmmsg, iFEipuup)    // actual recvmmsg is glibc 2.12+. The syscall is Linux 2.6.33+, so use syscall...
+GOM(recvmmsg, iFEipuup)    //%% actual recvmmsg is glibc 2.12+. The syscall is Linux 2.6.33+, so use syscall...
 GOW(recvmsg, lFipi)
 // re_exec  // Weak
 GOW(regcomp, iFppi)
 GOW(regerror, uFippu)
 GO(regexec, iFppupi)
 GOW(regfree, vFp)
-GOM(__register_atfork, iFEpppp)
+GOM(__register_atfork, iFEpppp) //%%
 // register_printf_function // Weak
 // registerrpc
 // remap_file_pages // Weak
@@ -1399,7 +1399,7 @@ GO(removexattr, iFpp)
 GO(rename, iFpp)
 GO(renameat, iFipip)
 #ifdef PANDORA
-GOM(renameat2, iFipipu)
+GOM(renameat2, iFipipu) //%%
 #else
 GO(renameat2, iFipipu)
 #endif
@@ -1445,8 +1445,8 @@ GO(__sbrk, pFl)
 // scalbn   // Weak
 // scalbnf  // Weak
 // scalbnl  // Weak
-GOM(scandir, iFEpppp)
-GOM(scandir64, iFEpppp)
+GOM(scandir, iFEpppp) //%%
+GOM(scandir64, iFEpppp) //%%
 GO2(scanf, iFpp, vscanf)
 GO(__sched_cpualloc, pFu)   //TODO: check, return cpu_set_t* : should this be aligned/changed?
 GO(__sched_cpucount, iFup)
@@ -1476,7 +1476,7 @@ GO(seekdir, vFpi)
 GOW(select, iFipppp)
 GO(__select, iFipppp)
 #ifdef POWERPCLE
-GOM(semctl, iFEiiiN)  // use vararg after the 3 i
+GOM(semctl, iFEiiiN)  //%% use vararg after the 3 i
 #else
 GO(semctl, iFiiiN)
 #endif
@@ -1488,12 +1488,12 @@ GOW(send, lFipLi)
 GO(sendfile, lFiipL)
 GO(sendfile64, lFiipL)
 GOW(sendmsg, lFipi)
-GOM(__sendmmsg, iFEipuu)    // actual __sendmmsg is glibc 2.14+. The syscall is Linux 3.0+, so use syscall...
+GOM(__sendmmsg, iFEipuu)    //%% actual __sendmmsg is glibc 2.14+. The syscall is Linux 3.0+, so use syscall...
 GOW(sendto, lFipLipu)
 // setaliasent
 GOW(setbuf, vFpp)
 GOW(setbuffer, vFppL)
-GOM(setcontext, iFEp)
+GOM(setcontext, iFEp) //%%
 // setdomainname
 GO(setegid, iFu)
 GOW(setenv, iFppi)
@@ -1510,8 +1510,8 @@ GO(sethostent, vFi)
 GO(sethostname, iFpu)
 // setipv4sourcefilter
 GOW(setitimer, iFipp)
-GOM(setjmp, iFEp)
-GOM(_setjmp, iFEp)
+GOM(setjmp, iFEp) //%%
+GOM(_setjmp, iFEp) //%%
 GO(setlinebuf, vFp)
 GO(setlocale, pFip)
 // setlogin
@@ -1555,11 +1555,11 @@ GOW(shmctl, iFiip)
 GOW(shmdt, iFp)
 GOW(shmget, iFuui)
 GOW(shutdown, iFii)
-GOM(sigaction, iFEipp)    // Weak
-GOM(__sigaction, iFEipp)  // Weak
+GOM(sigaction, iFEipp)    //%% Weak
+GOM(__sigaction, iFEipp)  //%% Weak
 GO(sigaddset, iFpi)
 // __sigaddset
-GOM(sigaltstack, iFEpp) // Weak
+GOM(sigaltstack, iFEpp)   //%% Weak
 // sigandset
 GOW(sigblock, iFi)
 GO(sigdelset, iFpi)
@@ -1573,8 +1573,8 @@ GO(siginterrupt, iFii)  // no need to wrap this one?
 // sigisemptyset
 GO(sigismember, iFpi)
 // __sigismember
-GOM(siglongjmp, pFEip)
-GOM(signal, pFEip)   // Weak
+GOM(siglongjmp, pFEip) //%%
+GOM(signal, pFEip)     //%% Weak
 // signalfd
 GO(__signbit, iFd)
 GO(__signbitf, iFf)
@@ -1586,8 +1586,8 @@ GOW(sigprocmask, iFipp)
 // sigqueue // Weak
 // sigrelse
 // sigreturn    // Weak
-GOM(sigset, pFEip)
-GOM(__sigsetjmp, iFEp)
+GOM(sigset, pFEip) //%%
+GOM(__sigsetjmp, iFEp) //%%
 GOW(sigsetmask, iFi)
 // sigstack
 GOW(sigsuspend, iFp)
@@ -1597,15 +1597,15 @@ GOW(sigvec, iFipp)
 GOW(sigwait, iFpp)
 GOW(sigwaitinfo, iFpp)
 GOW(sleep, uFu)
-GOM(snprintf, iFEpLpVV)
-GOM(__snprintf_chk, iFEpLvvpVV)
-GOM(__snprintf, iFEpLpVV)
+GOM(snprintf, iFEpLpVV) //%%
+GOM(__snprintf_chk, iFEpLvvpVV) //%%
+GOM(__snprintf, iFEpLpVV) //%%
 // sockatmark
 GOW(socket, iFiii)
 GOW(socketpair, iFiiip)
 GO(splice, iFipipuu)
-GOM(sprintf, iFEppVV)
-GOM(__sprintf_chk, iFEpvvpVV)
+GOM(sprintf, iFEppVV) //%%
+GOM(__sprintf_chk, iFEpvvpVV) //%%
 // sprofil  // Weak
 GOW(srand, vFu)
 GO(srand48, vFi)
@@ -1613,16 +1613,16 @@ GO(srand48, vFi)
 GOW(srandom, vFu)
 GOW(srandom_r, iFup)
 #ifdef POWERPCLE
-GOM(sscanf, iFppV)
+GOM(sscanf, iFppV) //%%
 #else
 GO2(sscanf, iFppV, vsscanf)     // sscanf va_list is only pointer, no realign to do
 #endif
 // ssignal  // Weak
 // sstk
-GOM(__stack_chk_fail, vFEv)
+GOM(__stack_chk_fail, vFEv) //%%
 GOW(statfs, iFpp)
 // __statfs
-GOM(statfs64, iFpp)     //is weak
+GOM(statfs64, iFpp)     //%% Weak
 GO(statvfs, iFpp)
 GOW(statvfs64, iFpp)    // is alignment ok?
 DATA(stderr, 4)
@@ -1778,18 +1778,18 @@ GO(strxfrm_l, uFppup)
 // svcunixfd_create
 // svc_unregister
 GO(swab, vFppi)
-GOM(swapcontext, iFEpp)
+GOM(swapcontext, iFEpp) //%%
 // swapoff  // Weak
 // swapon   // Weak
-GOM(swprintf, iFEpupV)
-GOM(__swprintf_chk, iFEpuiupV)
+GOM(swprintf, iFEpupV) //%%
+GOM(__swprintf_chk, iFEpuiupV) //%%
 GO2(swscanf, iFppV, vswscanf)     // swscanf va_list is only pointer, no realign to do
 GOW(symlink, iFpp)
 GO(symlinkat, iFpip)
 GO(sync, vFv)
 GO(syncfs, iFi)
 // sync_file_range
-GOM(syscall, uFE)
+GOM(syscall, uFEv) //%%
 GOW(sysconf, lFi)
 GO(__sysconf, lFi)
 // sysctl   // Weak
@@ -1804,9 +1804,9 @@ DATA(sys_nerr, 4) // type R
 DATA(sys_sigabbrev, 4)
 DATA(_sys_siglist, 4)
 DATA(sys_siglist, 4)
-GOW(system, iFp)    // Need to wrap to use box86 if needed?
-GOM(__sysv_signal, pFEip)
-GOM(sysv_signal, pFEip)  // Weak
+GOW(system, iFp)          // Need to wrap to use box86 if needed?
+GOM(__sysv_signal, pFEip) //%%
+GOM(sysv_signal, pFEip)   //%% Weak
 GOW(tcdrain, iFi)
 GO(tcflow, iFii)
 GO(tcflush, iFii)
@@ -1875,7 +1875,7 @@ GO(__uflow, iFp)
 GOW(umask, uFu)
 GOW(umount, iFp)
 GOW(umount2, iFpi)
-GOM(uname, iFp) //Weak
+GOM(uname, iFp) //%% Weak
 GO(__underflow, iFp)
 GOW(ungetc, iFip)
 GO(ungetwc, iFip)
@@ -1898,53 +1898,53 @@ GOW(utimes, iFpp)   //TODO: check, signature is int utimes(const char *filename,
 GOW(utmpname, iFp)
 // utmpxname
 GOW(valloc, pFu)
-GOM(vasprintf, iFEpppp)
-GOM(__vasprintf_chk, iFEpippp)
+GOM(vasprintf, iFEpppp) //%%
+GOM(__vasprintf_chk, iFEpippp) //%%
 // vdprintf // Weak
 // __vdprintf_chk
-GOM(verr, vFEpV)
+GOM(verr, vFEpV) //%%
 // verrx
 GO(versionsort, iFpp)
 // versionsort64
-GOM(vfork, iFEv) // Weak
+GOM(vfork, iFEv) //%% Weak
 // __vfork
-GOM(vfprintf, iFEppp)
-GOM(__vfprintf_chk, iFEpvpp)
+GOM(vfprintf, iFEppp) //%%
+GOM(__vfprintf_chk, iFEpvpp) //%%
 #ifdef POWERPCLE
-GOM(vfscanf, iFEppp)  // Weak
+GOM(vfscanf, iFEppp)  //%% Weak
 #else
 GOW(vfscanf, iFppp)  // Weak
 #endif
 // __vfscanf
-GOM(vfwprintf, iFEppp)    // Weak
+GOM(vfwprintf, iFEppp)    //%% Weak
 GO2(__vfwprintf_chk, iFEpvpp, my_vfwprintf)
 GOW(vfwscanf, iFppp)
 // vhangup
 // vlimit
 // vmsplice
-GOM(vprintf, iFEppp)
-GOM(__vprintf_chk, iFEvppp)
+GOM(vprintf, iFEppp)             //%%
+GOM(__vprintf_chk, iFEvppp)      //%%
 // vscanf   // Weak
-GOM(vsnprintf, iFEpLppp)    // Weak
-GOM(__vsnprintf, iFEpuppp)  // Weak
-GOM(__vsnprintf_chk, iFEpuvvppp)
-GOM(vsprintf, iFEpppp) // Weak
-GOM(__vsprintf_chk, iFEpvvppp)   // ignoring flag and slen, just use vsprintf in fact
+GOM(vsnprintf, iFEpLppp)         //%% Weak
+GOM(__vsnprintf, iFEpuppp)       //%% Weak
+GOM(__vsnprintf_chk, iFEpuvvppp) //%%
+GOM(vsprintf, iFEpppp)           //%% Weak
+GOM(__vsprintf_chk, iFEpvvppp)   //%% ignoring flag and slen, just use vsprintf in fact
 #ifdef POWERPCLE
-GOM(vsscanf, iFEppp)
+GOM(vsscanf, iFEppp) //%%
 #else
 GO(vsscanf, iFppp)
 #endif
 // __vsscanf    // Weak
-GOM(vswprintf, iFEpuppp)    // Weak
-GOM(__vswprintf_chk, iFEpuvvppp)    // Weak
+GOM(vswprintf, iFEpuppp)         //%% Weak
+GOM(__vswprintf_chk, iFEpuvvppp) //%% Weak
 GO(vswscanf, iFppp)
 GO(vsyslog, vFipp)
 GO(__vsyslog_chk, vFiipp)
 // vtimes
-GOM(vwarn, vFEppp)
+GOM(vwarn, vFEppp) //%%
 // vwarnx
-GOM(vwprintf, iFEpp)
+GOM(vwprintf, iFEpp) //%%
 GO2(__vwprintf_chk, iFEvpp, my_vwprintf)
 GO(vwscanf, iFpp)
 GOW(wait, iFp)
@@ -2061,8 +2061,8 @@ GO(wmemset, pFpuL)
 GO(wordexp, iFppi)
 GO(wordfree, vFp)
 // __woverflow
-GOM(wprintf, iFEpVV)
-GOM(__wprintf_chk, iFEipVV)
+GOM(wprintf, iFEpVV) //%%
+GOM(__wprintf_chk, iFEipVV) //%%
 GOW(write, lFipL)
 GOW(__write, lFipL)
 GOW(writev, lFipi)
@@ -2147,52 +2147,52 @@ GO(__xpg_basename, pFp)
 GO(__xpg_strerror_r, pFipu)
 // xprt_register
 // xprt_unregister
-GOM(__xstat, iFEipp)
-GOM(__xstat64, iFEipp)
+GOM(__xstat, iFEipp) //%%
+GOM(__xstat64, iFEipp) //%%
 
 // forcing a custom __gmon_start__ that does nothing
-GOM(__gmon_start__, vFv)
+GOM(__gmon_start__, vFv) //%%
 
-GOM(_Jv_RegisterClasses, vFv)   // dummy
+GOM(_Jv_RegisterClasses, vFv)   //%% dummy
 
-GOM(__fdelt_chk, iFi)
+GOM(__fdelt_chk, iFi) //%%
 
-GOM(getauxval, uFEu)  // implemented since glibc 2.16
+GOM(getauxval, uFEu)  //%% implemented since glibc 2.16
 
-GOM(prlimit64, lFpupp)
-GOM(reallocarray, pFpLL)
-GOM(__open_nocancel, iFEpOV)
+GOM(prlimit64, lFpupp)       //%%
+GOM(reallocarray, pFpLL)     //%%
+GOM(__open_nocancel, iFEpOV) //%%
 GO2(__read_nocancel, lFipL, read)
 GO2(__close_nocancel, iFi, close)
 
-GOM(mkstemps64, iFEpi)   // not always implemented
-GOM(getentropy, iFEpL)  // starting from glibc 2.25
+GOM(mkstemps64, iFEpi)   //%% not always implemented
+GOM(getentropy, iFEpL)   //%% starting from glibc 2.25
 
 // not found (libitm???), but it seems OK to declare dummies:
 
-GOM(_ITM_RU1, uFp)
-GOM(_ITM_RU4, uFp)
+GOM(_ITM_RU1, uFp)          //%%
+GOM(_ITM_RU4, uFp)          //%%
 //GOM(_ITM_RU8, UFp)
-GOM(_ITM_memcpyRtWn, vFppu) // register(2)
-GOM(_ITM_memcpyRnWt, vFppu) // register(2)
+GOM(_ITM_memcpyRtWn, vFppu) //%% register(2)
+GOM(_ITM_memcpyRnWt, vFppu) //%% register(2)
 GOM(_ITM_addUserCommitAction, vFEpup)
-GOM(_ITM_registerTMCloneTable, vFEpu)
-GOM(_ITM_deregisterTMCloneTable, vFEp)
+GOM(_ITM_registerTMCloneTable, vFEpu)  //%%
+GOM(_ITM_deregisterTMCloneTable, vFEp) //%%
 
-GOM(__umoddi3, UFUU)
-GOM(__udivdi3, UFUU)
-GOM(__divdi3, IFII)
-GOM(__poll_chk, iFpuii)
+GOM(__umoddi3, UFUU)        //%%
+GOM(__udivdi3, UFUU)        //%%
+GOM(__divdi3, IFII)         //%%
+GOM(__poll_chk, iFpuii)     //%%
 
-GOM(fallocate64, iFiiII)
+GOM(fallocate64, iFiiII) //%%
 
 DATAM(__libc_stack_end, 4)
 
 DATAM(___brk_addr, 4)
 DATA(__libc_enable_secure, 4)
 
-GOM(__register_frame_info, vFpp)    // faked function
-GOM(__deregister_frame_info, pFp)
+GOM(__register_frame_info, vFpp)  //%% faked function
+GOM(__deregister_frame_info, pFp) //%%
 
 GO(name_to_handle_at, iFipppi) // only glibc 2.14+, so may not be present...
 

src/wrapped/wrappedlibxcb_private.h

@@ -2,7 +2,10 @@
 #error meh!
 #endif
 
-GOS(xcb_alloc_color, pFEppuWWW)
+//%S x my_xcb_cookie_t
+//%S X my_xcb_XXX_iterator_t
+
+GOS(xcb_alloc_color, pFEppuWWW) //%x
 //GO(xcb_alloc_color_cells, 
 //GO(xcb_alloc_color_cells_masks, 
 //GO(xcb_alloc_color_cells_masks_end, 
@@ -32,7 +35,7 @@ GO(xcb_alloc_color_reply, pFpup)
 //GO(xcb_arc_next, 
 //GO(xcb_atom_end, 
 //GO(xcb_atom_next, 
-GOS(xcb_bell, pFEppC)
+GOS(xcb_bell, pFEppC) //%x
 //GO(xcb_bell_checked, 
 //GO(xcb_big_requests_enable, 
 //GO(xcb_big_requests_enable_reply, 
@@ -44,10 +47,10 @@ DATA(xcb_big_requests_id, 4)
 //GO(xcb_button_next, 
 //GO(xcb_change_active_pointer_grab, 
 //GO(xcb_change_active_pointer_grab_checked, 
-GOS(xcb_change_gc, pFEppuup)
+GOS(xcb_change_gc, pFEppuup) //%x
 //GO(xcb_change_gc_aux, 
 //GO(xcb_change_gc_aux_checked, 
-GOS(xcb_change_gc_checked, pFEppuup)
+GOS(xcb_change_gc_checked, pFEppuup) //%x
 //GO(xcb_change_gc_sizeof, 
 //GO(xcb_change_gc_value_list, 
 //GO(xcb_change_gc_value_list_serialize, 
@@ -59,7 +62,7 @@ GOS(xcb_change_gc_checked, pFEppuup)
 //GO(xcb_change_hosts_address_length, 
 //GO(xcb_change_hosts_checked, 
 //GO(xcb_change_hosts_sizeof, 
-GOS(xcb_change_keyboard_control, pFEppup)
+GOS(xcb_change_keyboard_control, pFEppup) //%x
 //GO(xcb_change_keyboard_control_aux, 
 //GO(xcb_change_keyboard_control_aux_checked, 
 //GO(xcb_change_keyboard_control_checked, 
@@ -76,18 +79,18 @@ GOS(xcb_change_keyboard_control, pFEppup)
 //GO(xcb_change_keyboard_mapping_sizeof, 
 //GO(xcb_change_pointer_control, 
 //GO(xcb_change_pointer_control_checked, 
-GOS(xcb_change_property, pFEppCuuuCup)
-GOS(xcb_change_property_checked, pFEppCuuuCup)
+GOS(xcb_change_property, pFEppCuuuCup) //%x
+GOS(xcb_change_property_checked, pFEppCuuuCup) //%x
 //GO(xcb_change_property_data, 
 //GO(xcb_change_property_data_end, 
 //GO(xcb_change_property_data_length, 
 //GO(xcb_change_property_sizeof, 
 //GO(xcb_change_save_set, 
 //GO(xcb_change_save_set_checked, 
-GOS(xcb_change_window_attributes, pFEppuup)
+GOS(xcb_change_window_attributes, pFEppuup) //%x
 //GO(xcb_change_window_attributes_aux, 
 //GO(xcb_change_window_attributes_aux_checked, 
-GOS(xcb_change_window_attributes_checked, pFEppuup)
+GOS(xcb_change_window_attributes_checked, pFEppuup) //%x
 //GO(xcb_change_window_attributes_sizeof, 
 //GO(xcb_change_window_attributes_value_list, 
 //GO(xcb_change_window_attributes_value_list_serialize, 
@@ -99,17 +102,17 @@ GOS(xcb_change_window_attributes_checked, pFEppuup)
 //GO(xcb_charinfo_next, 
 //GO(xcb_circulate_window, 
 //GO(xcb_circulate_window_checked, 
-GOS(xcb_clear_area, pFEppCuwwWW)
+GOS(xcb_clear_area, pFEppCuwwWW) //%x
 //GO(xcb_clear_area_checked, 
 //GO(xcb_client_message_data_end, 
 //GO(xcb_client_message_data_next, 
-GOS(xcb_close_font, pFEppu)
-GOS(xcb_close_font_checked, pFEppu)
+GOS(xcb_close_font, pFEppu) //%x
+GOS(xcb_close_font_checked, pFEppu) //%x
 //GO(xcb_coloritem_end, 
 //GO(xcb_coloritem_next, 
 //GO(xcb_colormap_end, 
 //GO(xcb_colormap_next, 
-GOS(xcb_configure_window, pFEppuWp)
+GOS(xcb_configure_window, pFEppuWp) //%x
 //GO(xcb_configure_window_aux, 
 //GO(xcb_configure_window_aux_checked, 
 //GO(xcb_configure_window_checked, 
@@ -122,9 +125,9 @@ GO(xcb_connect, pFpp)
 GO(xcb_connection_has_error, iFp)
 //GO(xcb_connect_to_display_with_auth_info, 
 //GO(xcb_connect_to_fd, 
-GOS(xcb_convert_selection, pFEppuuuuu)
+GOS(xcb_convert_selection, pFEppuuuuu) //%x
 //GO(xcb_convert_selection_checked, 
-GOS(xcb_copy_area, pFEppuuuwwwwWW)
+GOS(xcb_copy_area, pFEppuuuwwwwWW) //%x
 //GO(xcb_copy_area_checked, 
 //GO(xcb_copy_colormap_and_free, 
 //GO(xcb_copy_colormap_and_free_checked, 
@@ -132,27 +135,27 @@ GOS(xcb_copy_area, pFEppuuuwwwwWW)
 //GO(xcb_copy_gc_checked, 
 //GO(xcb_copy_plane, 
 //GO(xcb_copy_plane_checked, 
-GOS(xcb_create_colormap, pFEppCppp)
+GOS(xcb_create_colormap, pFEppCppp) //%x
 //GO(xcb_create_colormap_checked, 
-GOS(xcb_create_cursor, pFEppuuuWWWWWWWW)
+GOS(xcb_create_cursor, pFEppuuuWWWWWWWW) //%x
 //GO(xcb_create_cursor_checked, 
-GOS(xcb_create_gc, pFEppuuup)
+GOS(xcb_create_gc, pFEppuuup) //%x
 //GO(xcb_create_gc_aux, 
 //GO(xcb_create_gc_aux_checked, 
-GOS(xcb_create_gc_checked, pFEppuuup)
+GOS(xcb_create_gc_checked, pFEppuuup) //%x
 //GO(xcb_create_gc_sizeof, 
 //GO(xcb_create_gc_value_list, 
 //GO(xcb_create_gc_value_list_serialize, 
 //GO(xcb_create_gc_value_list_sizeof, 
 //GO(xcb_create_gc_value_list_unpack, 
-GOS(xcb_create_glyph_cursor, pFEppuuuWWWWWWWW)
+GOS(xcb_create_glyph_cursor, pFEppuuuWWWWWWWW) //%x
 //GO(xcb_create_glyph_cursor_checked, 
-GOS(xcb_create_pixmap, pFEppCuuWW)
+GOS(xcb_create_pixmap, pFEppCuuWW) //%x
 //GO(xcb_create_pixmap_checked, 
-GOS(xcb_create_window, pFEppCuuwwWWWWuup)
+GOS(xcb_create_window, pFEppCuuwwWWWWuup) //%x
 //GO(xcb_create_window_aux, 
 //GO(xcb_create_window_aux_checked, 
-GOS(xcb_create_window_checked, pFEppCuuwwWWWWuup)
+GOS(xcb_create_window_checked, pFEppCuuwwWWWWuup) //%x
 //GO(xcb_create_window_sizeof, 
 //GO(xcb_create_window_value_list, 
 //GO(xcb_create_window_value_list_serialize, 
@@ -160,17 +163,17 @@ GOS(xcb_create_window_checked, pFEppCuuwwWWWWuup)
 //GO(xcb_create_window_value_list_unpack, 
 //GO(xcb_cursor_end, 
 //GO(xcb_cursor_next, 
-GOS(xcb_delete_property, pFEpppp)
+GOS(xcb_delete_property, pFEpppp) //%x
 //GO(xcb_delete_property_checked, 
 //GO(xcb_depth_end, 
 GO(xcb_depth_next, vFp)
 GO(xcb_depth_sizeof, iFp)
 GO(xcb_depth_visuals, pFp)
-GOS(xcb_depth_visuals_iterator, pFEpp)  //xcb_visualtype_iterator_t is a structure
+GOS(xcb_depth_visuals_iterator, pFEpp)  //%X xcb_visualtype_iterator_t is a structure
 //GO(xcb_depth_visuals_length, 
 //GO(xcb_destroy_subwindows, 
 //GO(xcb_destroy_subwindows_checked, 
-GOS(xcb_destroy_window, pFEppu)
+GOS(xcb_destroy_window, pFEppu) //%x
 //GO(xcb_destroy_window_checked, 
 //GO(xcb_discard_reply, 
 //GO(xcb_discard_reply64, 
@@ -194,24 +197,24 @@ GO(xcb_flush, iFp)
 //GO(xcb_force_screen_saver_checked, 
 //GO(xcb_format_end, 
 GO(xcb_format_next, vFp)
-GOS(xcb_free_colormap, pFEppu)
-GOS(xcb_free_colormap_checked, pFEppu)
+GOS(xcb_free_colormap, pFEppu) //%x
+GOS(xcb_free_colormap_checked, pFEppu) //%x
 //GO(xcb_free_colors, 
 //GO(xcb_free_colors_checked, 
 //GO(xcb_free_colors_pixels, 
 //GO(xcb_free_colors_pixels_end, 
 //GO(xcb_free_colors_pixels_length, 
 //GO(xcb_free_colors_sizeof, 
-GOS(xcb_free_cursor, pFEppp)
+GOS(xcb_free_cursor, pFEppp) //%x
 //GO(xcb_free_cursor_checked, 
-GOS(xcb_free_gc, pFEppu)
+GOS(xcb_free_gc, pFEppu) //%x
 //GO(xcb_free_gc_checked, 
-GOS(xcb_free_pixmap, pFEppu)
+GOS(xcb_free_pixmap, pFEppu) //%x
 //GO(xcb_free_pixmap_checked, 
 //GO(xcb_gcontext_end, 
 //GO(xcb_gcontext_next, 
 GO(xcb_generate_id, uFp)
-GOS(xcb_get_atom_name, pFEppu)
+GOS(xcb_get_atom_name, pFEppu) //%x
 GO(xcb_get_atom_name_name, pFp)
 //GO(xcb_get_atom_name_name_end, 
 GO(xcb_get_atom_name_name_length, iFp)
@@ -226,23 +229,23 @@ GO(xcb_get_file_descriptor, iFp)
 //GO(xcb_get_font_path_reply, 
 //GO(xcb_get_font_path_sizeof, 
 //GO(xcb_get_font_path_unchecked, 
-GOS(xcb_get_geometry, pFEppu)
+GOS(xcb_get_geometry, pFEppu) //%x
 GO(xcb_get_geometry_reply, pFpup)
-GOS(xcb_get_geometry_unchecked, pFEppu)
-GOS(xcb_get_image, pFEppCuwwWWu)
+GOS(xcb_get_geometry_unchecked, pFEppu) //%x
+GOS(xcb_get_image, pFEppCuwwWWu) //%x
 GO(xcb_get_image_data, pFp)
 //GO(xcb_get_image_data_end, 
 GO(xcb_get_image_data_length, iFp)
 GO(xcb_get_image_reply, pFpup)
 //GO(xcb_get_image_sizeof, 
-GOS(xcb_get_image_unchecked, pFEppCuwwWWu)
-GOS(xcb_get_input_focus, pFEpp)
+GOS(xcb_get_image_unchecked, pFEppCuwwWWu) //%x
+GOS(xcb_get_input_focus, pFEpp) //%x
 GO(xcb_get_input_focus_reply, pFpup)
 //GO(xcb_get_input_focus_unchecked, 
 //GO(xcb_get_keyboard_control, 
 //GO(xcb_get_keyboard_control_reply, 
 //GO(xcb_get_keyboard_control_unchecked, 
-GOS(xcb_get_keyboard_mapping, pFEppCC)
+GOS(xcb_get_keyboard_mapping, pFEppCC) //%x
 GO(xcb_get_keyboard_mapping_keysyms, pFp)
 //GO(xcb_get_keyboard_mapping_keysyms_end, 
 GO(xcb_get_keyboard_mapping_keysyms_length, iFp)
@@ -250,12 +253,12 @@ GO(xcb_get_keyboard_mapping_reply, pFpup)
 //GO(xcb_get_keyboard_mapping_sizeof, 
 //GO(xcb_get_keyboard_mapping_unchecked, 
 GO(xcb_get_maximum_request_length, uFp)
-GOS(xcb_get_modifier_mapping, pFEpp)
+GOS(xcb_get_modifier_mapping, pFEpp) //%x
 GO(xcb_get_modifier_mapping_keycodes, pFp)
 //GO(xcb_get_modifier_mapping_keycodes_end, 
 GO(xcb_get_modifier_mapping_keycodes_length, iFp)
 GO(xcb_get_modifier_mapping_reply, pFpup)
-//GOS(xcb_get_modifier_mapping_sizeof, pFEpp)
+//GOS(xcb_get_modifier_mapping_sizeof, pFEpp) //%x
 //GO(xcb_get_modifier_mapping_unchecked, 
 //GO(xcb_get_motion_events, 
 //GO(xcb_get_motion_events_events, 
@@ -274,10 +277,10 @@ GO(xcb_get_modifier_mapping_reply, pFpup)
 //GO(xcb_get_pointer_mapping_reply, 
 //GO(xcb_get_pointer_mapping_sizeof, 
 //GO(xcb_get_pointer_mapping_unchecked, 
-GOS(xcb_get_property, pFEppCuuuuu)
+GOS(xcb_get_property, pFEppCuuuuu) //%x
 GO(xcb_get_property_reply, pFpup)
 //GO(xcb_get_property_sizeof, 
-GOS(xcb_get_property_unchecked, pFEppCuuuuu)
+GOS(xcb_get_property_unchecked, pFEppCuuuuu) //%x
 GO(xcb_get_property_value, pFp)
 //GO(xcb_get_property_value_end, 
 GO(xcb_get_property_value_length, iFp)
@@ -285,24 +288,24 @@ GO(xcb_get_reply_fds, pFppu)
 //GO(xcb_get_screen_saver, 
 //GO(xcb_get_screen_saver_reply, 
 //GO(xcb_get_screen_saver_unchecked, 
-GOS(xcb_get_selection_owner, pFEppu)
+GOS(xcb_get_selection_owner, pFEppu) //%x
 GO(xcb_get_selection_owner_reply, pFpup)
-GOS(xcb_get_selection_owner_unchecked, pFEppu)
+GOS(xcb_get_selection_owner_unchecked, pFEppu) //%x
 GO(xcb_get_setup, pFp)
-GOS(xcb_get_window_attributes, pFEppu)
+GOS(xcb_get_window_attributes, pFEppu) //%x
 GO(xcb_get_window_attributes_reply, pFpup)
-GOS(xcb_get_window_attributes_unchecked, pFEppu)
-GOS(xcb_grab_button, pFEppCuWCCuuCW)
-GOS(xcb_grab_button_checked, pFEppCuWCCuuCW)
-GOS(xcb_grab_key, pFEppCuWCCC)
-GOS(xcb_grab_keyboard, pFEppCuuCC)
+GOS(xcb_get_window_attributes_unchecked, pFEppu) //%x
+GOS(xcb_grab_button, pFEppCuWCCuuCW) //%x
+GOS(xcb_grab_button_checked, pFEppCuWCCuuCW) //%x
+GOS(xcb_grab_key, pFEppCuWCCC) //%x
+GOS(xcb_grab_keyboard, pFEppCuuCC) //%x
 GO(xcb_grab_keyboard_reply, pFpup)
 //GO(xcb_grab_keyboard_unchecked, 
-GOS(xcb_grab_key_checked, pFEppCuWCCC)
-GOS(xcb_grab_pointer, pFEppCuWCCuuu)
+GOS(xcb_grab_key_checked, pFEppCuWCCC) //%x
+GOS(xcb_grab_pointer, pFEppCuWCCuuu) //%x
 GO(xcb_grab_pointer_reply, pFpup)
 //GO(xcb_grab_pointer_unchecked, 
-GOS(xcb_grab_server, pFEpp)
+GOS(xcb_grab_server, pFEpp) //%x
 //GO(xcb_grab_server_checked, 
 //GO(xcb_host_address, 
 //GO(xcb_host_address_end, 
@@ -316,18 +319,18 @@ GOS(xcb_grab_server, pFEpp)
 //GO(xcb_image_text_16_string, 
 //GO(xcb_image_text_16_string_iterator, 
 //GO(xcb_image_text_16_string_length, 
-GOS(xcb_image_text_8, pFEppCuuwwp)
-GOS(xcb_image_text_8_checked, pFEppCuuwwp)
+GOS(xcb_image_text_8, pFEppCuuwwp) //%x
+GOS(xcb_image_text_8_checked, pFEppCuuwwp) //%x
 //GO(xcb_image_text_8_sizeof, 
 //GO(xcb_image_text_8_string, 
 //GO(xcb_image_text_8_string_end, 
 //GO(xcb_image_text_8_string_length, 
 //GO(xcb_install_colormap, 
 //GO(xcb_install_colormap_checked, 
-GOS(xcb_intern_atom, pFEppCWp)
+GOS(xcb_intern_atom, pFEppCWp) //%x
 GO(xcb_intern_atom_reply, pFpup)
 //GO(xcb_intern_atom_sizeof, 
-GOS(xcb_intern_atom_unchecked, pFEppCWp)
+GOS(xcb_intern_atom_unchecked, pFEppCWp) //%x
 //GO(xcb_keycode32_end, 
 //GO(xcb_keycode32_next, 
 //GO(xcb_keycode_end, 
@@ -382,14 +385,14 @@ GOS(xcb_intern_atom_unchecked, pFEppCWp)
 //GO(xcb_lookup_color_reply, 
 //GO(xcb_lookup_color_sizeof, 
 //GO(xcb_lookup_color_unchecked, 
-GOS(xcb_map_subwindows, pFEppu)
+GOS(xcb_map_subwindows, pFEppu) //%x
 //GO(xcb_map_subwindows_checked, 
-GOS(xcb_map_window, pFEppu)
-GOS(xcb_map_window_checked, pFEppu)
+GOS(xcb_map_window, pFEppu) //%x
+GOS(xcb_map_window_checked, pFEppu) //%x
 //GO(xcb_no_operation, 
 //GO(xcb_no_operation_checked, 
-GOS(xcb_open_font, pFEppuWp)
-GOS(xcb_open_font_checked, pFEppuWp)
+GOS(xcb_open_font, pFEppuWp) //%x
+GOS(xcb_open_font_checked, pFEppuWp) //%x
 //GO(xcb_open_font_name, 
 //GO(xcb_open_font_name_end, 
 //GO(xcb_open_font_name_length, 
@@ -404,7 +407,7 @@ GO(xcb_poll_for_queued_event, pFp)
 //GO(xcb_poll_for_reply, 
 //GO(xcb_poll_for_reply64, 
 GO(xcb_poll_for_special_event, pFpp)
-GOS(xcb_poly_arc, pFEppuuup)
+GOS(xcb_poly_arc, pFEppuuup) //%x
 //GO(xcb_poly_arc_arcs, 
 //GO(xcb_poly_arc_arcs_iterator, 
 //GO(xcb_poly_arc_arcs_length, 
@@ -416,31 +419,31 @@ GOS(xcb_poly_arc, pFEppuuup)
 //GO(xcb_poly_fill_arc_arcs_length, 
 //GO(xcb_poly_fill_arc_checked, 
 //GO(xcb_poly_fill_arc_sizeof, 
-GOS(xcb_poly_fill_rectangle, pFEppuuup)
+GOS(xcb_poly_fill_rectangle, pFEppuuup) //%x
 //GO(xcb_poly_fill_rectangle_checked, 
 //GO(xcb_poly_fill_rectangle_rectangles, 
 //GO(xcb_poly_fill_rectangle_rectangles_iterator, 
 //GO(xcb_poly_fill_rectangle_rectangles_length, 
 //GO(xcb_poly_fill_rectangle_sizeof, 
-GOS(xcb_poly_line, pFEppCuuup)
-GOS(xcb_poly_line_checked, pFEppCuuup)
+GOS(xcb_poly_line, pFEppCuuup) //%x
+GOS(xcb_poly_line_checked, pFEppCuuup) //%x
 //GO(xcb_poly_line_points, 
 //GO(xcb_poly_line_points_iterator, 
 //GO(xcb_poly_line_points_length, 
 //GO(xcb_poly_line_sizeof, 
-GOS(xcb_poly_point, pFEppCuuup)
+GOS(xcb_poly_point, pFEppCuuup) //%x
 //GO(xcb_poly_point_checked, 
 //GO(xcb_poly_point_points, 
 //GO(xcb_poly_point_points_iterator, 
 //GO(xcb_poly_point_points_length, 
 //GO(xcb_poly_point_sizeof, 
-GOS(xcb_poly_rectangle, pFEppuuup)
+GOS(xcb_poly_rectangle, pFEppuuup) //%x
 //GO(xcb_poly_rectangle_checked, 
 //GO(xcb_poly_rectangle_rectangles, 
 //GO(xcb_poly_rectangle_rectangles_iterator, 
 //GO(xcb_poly_rectangle_rectangles_length, 
 //GO(xcb_poly_rectangle_sizeof, 
-GOS(xcb_poly_segment, pFEppuuup)
+GOS(xcb_poly_segment, pFEppuuup) //%x
 //GO(xcb_poly_segment_checked, 
 //GO(xcb_poly_segment_segments, 
 //GO(xcb_poly_segment_segments_iterator, 
@@ -461,7 +464,7 @@ GOS(xcb_poly_segment, pFEppuuup)
 GO(xcb_popcount, iFu)
 GO(xcb_prefetch_extension_data, vFpp)
 //GO(xcb_prefetch_maximum_request_length, 
-GOS(xcb_put_image, pFEppCuuWWwwCCup)
+GOS(xcb_put_image, pFEppCuuWWwwCCup) //%x
 //GO(xcb_put_image_checked, 
 //GO(xcb_put_image_data, 
 //GO(xcb_put_image_data_end, 
@@ -494,26 +497,26 @@ GOS(xcb_put_image, pFEppCuuWWwwCCup)
 //GO(xcb_query_keymap, 
 //GO(xcb_query_keymap_reply, 
 //GO(xcb_query_keymap_unchecked, 
-GOS(xcb_query_pointer, pFEppu)
+GOS(xcb_query_pointer, pFEppu) //%x
 GO(xcb_query_pointer_reply, pFpup)
 //GO(xcb_query_pointer_unchecked, 
-GOS(xcb_query_text_extents, pFEppuup)
+GOS(xcb_query_text_extents, pFEppuup) //%x
 GO(xcb_query_text_extents_reply, pFpup)
 //GO(xcb_query_text_extents_sizeof, 
 //GO(xcb_query_text_extents_unchecked, 
-GOS(xcb_query_tree, pFEppu)
+GOS(xcb_query_tree, pFEppu) //%x
 GO(xcb_query_tree_children, pFp)
 //GO(xcb_query_tree_children_end, 
 GO(xcb_query_tree_children_length, iFp)
 GO(xcb_query_tree_reply, pFpup)
 //GO(xcb_query_tree_sizeof, 
-GOS(xcb_query_tree_unchecked, pFEppu)
+GOS(xcb_query_tree_unchecked, pFEppu) //%x
 //GO(xcb_recolor_cursor, 
 //GO(xcb_recolor_cursor_checked, 
 //GO(xcb_rectangle_end, 
 //GO(xcb_rectangle_next, 
 GO(xcb_register_for_special_xge, pFppup)
-GOS(xcb_reparent_window, pFEppuuWW)
+GOS(xcb_reparent_window, pFEppuuWW) //%x
 //GO(xcb_reparent_window_checked, 
 GO(xcb_request_check, pFpu)
 //GO(xcb_rgb_end, 
@@ -524,14 +527,14 @@ GO(xcb_request_check, pFpu)
 //GO(xcb_rotate_properties_atoms_length, 
 //GO(xcb_rotate_properties_checked, 
 //GO(xcb_rotate_properties_sizeof, 
-GOS(xcb_screen_allowed_depths_iterator, pFEpp)  //xcb_depth_iterator_t is a structure
+GOS(xcb_screen_allowed_depths_iterator, pFEpp)  //%X xcb_depth_iterator_t is a structure
 //GO(xcb_screen_allowed_depths_length, 
 //GO(xcb_screen_end, 
 GO(xcb_screen_next, vFp)
 //GO(xcb_screen_sizeof, 
 //GO(xcb_segment_end, 
 //GO(xcb_segment_next, 
-GOS(xcb_send_event, pFEppCuup)
+GOS(xcb_send_event, pFEppCuup) //%x
 //GO(xcb_send_event_checked, 
 //GO(xcb_send_fd, 
 GO(xcb_send_request, uFpipp)
@@ -559,7 +562,7 @@ GO(xcb_send_request_with_fds64, UFpippup)
 //GO(xcb_set_font_path_font_iterator, 
 //GO(xcb_set_font_path_font_length, 
 //GO(xcb_set_font_path_sizeof, 
-GOS(xcb_set_input_focus, pFEppCuu) // xcb_void_cookie_t is a struct with only 1 uint inside
+GOS(xcb_set_input_focus, pFEppCuu) // xcb_void_cookie_t is a struct with only 1 uint inside //%x
 //GO(xcb_set_input_focus_checked, 
 //GO(xcb_set_modifier_mapping, 
 //GO(xcb_set_modifier_mapping_reply, 
@@ -571,7 +574,7 @@ GOS(xcb_set_input_focus, pFEppCuu) // xcb_void_cookie_t is a struct with only 1
 //GO(xcb_set_pointer_mapping_unchecked, 
 //GO(xcb_set_screen_saver, 
 //GO(xcb_set_screen_saver_checked, 
-GOS(xcb_set_selection_owner, pFEppuuu)
+GOS(xcb_set_selection_owner, pFEppuuu) //%x
 //GO(xcb_set_selection_owner_checked, 
 //GO(xcb_setup_authenticate_end, 
 //GO(xcb_setup_authenticate_next, 
@@ -588,7 +591,7 @@ GOS(xcb_set_selection_owner, pFEppuuu)
 //GO(xcb_setup_failed_sizeof, 
 //GO(xcb_setup_next, 
 GO(xcb_setup_pixmap_formats, pFp)
-GOS(xcb_setup_pixmap_formats_iterator, pFEpp)
+GOS(xcb_setup_pixmap_formats_iterator, pFEpp) //%X
 GO(xcb_setup_pixmap_formats_length, iFp)
 //GO(xcb_setup_request_authorization_protocol_data, 
 //GO(xcb_setup_request_authorization_protocol_data_end, 
@@ -599,7 +602,7 @@ GO(xcb_setup_pixmap_formats_length, iFp)
 //GO(xcb_setup_request_end, 
 //GO(xcb_setup_request_next, 
 //GO(xcb_setup_request_sizeof, 
-GOS(xcb_setup_roots_iterator, pFEpp)
+GOS(xcb_setup_roots_iterator, pFEpp) //%X
 GO(xcb_setup_roots_length, iFp)
 //GO(xcb_setup_sizeof, 
 //GO(xcb_setup_vendor, 
@@ -629,24 +632,24 @@ GO(xcb_setup_roots_length, iFp)
 //GO(xcb_timecoord_next, 
 //GO(xcb_timestamp_end, 
 //GO(xcb_timestamp_next, 
-GOS(xcb_translate_coordinates, pFEppuuWW)
+GOS(xcb_translate_coordinates, pFEppuuWW) //%x
 GO(xcb_translate_coordinates_reply, pFpup)
-GOS(xcb_translate_coordinates_unchecked, pFEppuuWW)
-GOS(xcb_ungrab_button, pFEppCuW)
-GOS(xcb_ungrab_button_checked, pFEppCuW)
-GOS(xcb_ungrab_key, pFEppCuW)
-GOS(xcb_ungrab_keyboard, pFEppu)
-GOS(xcb_ungrab_keyboard_checked, pFEppu)
-GOS(xcb_ungrab_key_checked, pFEppCuW)
-GOS(xcb_ungrab_pointer, pFEppu)
+GOS(xcb_translate_coordinates_unchecked, pFEppuuWW) //%x
+GOS(xcb_ungrab_button, pFEppCuW) //%x
+GOS(xcb_ungrab_button_checked, pFEppCuW) //%x
+GOS(xcb_ungrab_key, pFEppCuW) //%x
+GOS(xcb_ungrab_keyboard, pFEppu) //%x
+GOS(xcb_ungrab_keyboard_checked, pFEppu) //%x
+GOS(xcb_ungrab_key_checked, pFEppCuW) //%x
+GOS(xcb_ungrab_pointer, pFEppu) //%x
 //GO(xcb_ungrab_pointer_checked, 
-GOS(xcb_ungrab_server, pFEpp)
+GOS(xcb_ungrab_server, pFEpp) //%x
 //GO(xcb_ungrab_server_checked, 
 //GO(xcb_uninstall_colormap, 
 //GO(xcb_uninstall_colormap_checked, 
 //GO(xcb_unmap_subwindows, 
 //GO(xcb_unmap_subwindows_checked, 
-GOS(xcb_unmap_window, pFEppu)
+GOS(xcb_unmap_window, pFEppu) //%x
 //GO(xcb_unmap_window_checked, 
 GO(xcb_unregister_for_special_event, vFpp)
 //GO(xcb_visualid_end, 
@@ -657,7 +660,7 @@ GO(xcb_wait_for_event, pFp)
 GO(xcb_wait_for_reply, pFpup)
 GO(xcb_wait_for_reply64, pFpUp)
 //GO(xcb_wait_for_special_event, 
-GOS(xcb_warp_pointer, pFEppuuwwWWww)
+GOS(xcb_warp_pointer, pFEppuuwwWWww) //%x
 //GO(xcb_warp_pointer_checked, 
 //GO(xcb_window_end, 
 //GO(xcb_window_next, 

src/wrapped/wrappedlibxcbdri2_private.h

@@ -2,12 +2,14 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 //GO(xcb_dri2_attach_format_end, 
 //GO(xcb_dri2_attach_format_next, 
-GOS(xcb_dri2_authenticate, pFEppuu)
+GOS(xcb_dri2_authenticate, pFEppuu) //%X
 GO(xcb_dri2_authenticate_reply, pFpup)
 //GO(xcb_dri2_authenticate_unchecked, 
-GOS(xcb_dri2_connect, pFEppuu)
+GOS(xcb_dri2_connect, pFEppuu) //%X
 //GO(xcb_dri2_connect_alignment_pad, 
 //GO(xcb_dri2_connect_alignment_pad_end, 
 //GO(xcb_dri2_connect_alignment_pad_length, 
@@ -50,7 +52,7 @@ GO(xcb_dri2_connect_reply, pFpup)
 //GO(xcb_dri2_get_param_reply, 
 //GO(xcb_dri2_get_param_unchecked, 
 DATA(xcb_dri2_id, 8)
-GOS(xcb_dri2_query_version, pFEppuu)
+GOS(xcb_dri2_query_version, pFEppuu) //%X
 GO(xcb_dri2_query_version_reply, pFpup)
 //GO(xcb_dri2_query_version_unchecked, 
 //GO(xcb_dri2_swap_buffers, 

src/wrapped/wrappedlibxcbdri3_private.h

@@ -2,6 +2,8 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 //GO(xcb_dri3_buffer_from_pixmap, 
 //GO(xcb_dri3_buffer_from_pixmap_reply, 
 //GO(xcb_dri3_buffer_from_pixmap_reply_fds, 
@@ -37,14 +39,14 @@
 //GO(xcb_dri3_get_supported_modifiers_window_modifiers_end, 
 //GO(xcb_dri3_get_supported_modifiers_window_modifiers_length, 
 DATA(xcb_dri3_id, 8)
-GOS(xcb_dri3_open, pFEppuu)
+GOS(xcb_dri3_open, pFEppuu) //%X
 GO(xcb_dri3_open_reply, pFpup)
 GO(xcb_dri3_open_reply_fds, pFpp)
 //GO(xcb_dri3_open_unchecked, 
 //GO(xcb_dri3_pixmap_from_buffer, 
-GOS(xcb_dri3_pixmap_from_buffer_checked, pFEppuuuWWWCCi)
+GOS(xcb_dri3_pixmap_from_buffer_checked, pFEppuuuWWWCCi) //%X
 //GO(xcb_dri3_pixmap_from_buffers, 
 //GO(xcb_dri3_pixmap_from_buffers_checked, 
-GOS(xcb_dri3_query_version, pFEppuu)
+GOS(xcb_dri3_query_version, pFEppuu) //%X
 GO(xcb_dri3_query_version_reply, pFpup)
 //GO(xcb_dri3_query_version_unchecked, 

src/wrapped/wrappedlibxcbimage_private.h

@@ -2,6 +2,8 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 GO(xcb_create_pixmap_from_bitmap_data, pFpupuuuuup)
 GO(xcb_image_annotate, vFp)
 GO(xcb_image_convert, pFpp)
@@ -12,8 +14,8 @@ GO(xcb_image_destroy, vFp)
 GO(xcb_image_get, pFpdwwWWui)
 GO(xcb_image_get_pixel, uFpuu)
 GO(xcb_image_native, pFppi)
-GOS(xcb_image_put, pFEppuupwwC)
+GOS(xcb_image_put, pFEppuupwwC) //%X
 GO(xcb_image_put_pixel, vFpuuu)
 GO(xcb_image_shm_get, iFpupuupWWu)    //xcb_shm_segment_info_t is a struct with "u u p"
 GO(xcb_image_shm_put, pFpuupuupwwwwWWC)
-GO(xcb_image_subimage, pFpuuuupup)
+GO(xcb_image_subimage, pFpuuuupup)

src/wrapped/wrappedlibxcbpresent_private.h

@@ -2,15 +2,17 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 //GO(xcb_present_event_end, 
 //GO(xcb_present_event_next, 
 DATA(xcb_present_id, 8)
 //GO(xcb_present_notify_end, 
-GOS(xcb_present_notify_msc, pFEppuuUUU)
+GOS(xcb_present_notify_msc, pFEppuuUUU) //%X
 //GO(xcb_present_notify_msc_checked, 
 //GO(xcb_present_notify_next, 
-GOS(xcb_present_pixmap, pFEppuuuuuwwuuuuUUUup)
-GOS(xcb_present_pixmap_checked, pFEppuuuuuwwuuuuUUUup)
+GOS(xcb_present_pixmap, pFEppuuuuuwwuuuuUUUup) //%X
+GOS(xcb_present_pixmap_checked, pFEppuuuuuwwuuuuUUUup) //%X
 //GO(xcb_present_pixmap_notifies, 
 //GO(xcb_present_pixmap_notifies_iterator, 
 //GO(xcb_present_pixmap_notifies_length, 
@@ -18,7 +20,7 @@ GOS(xcb_present_pixmap_checked, pFEppuuuuuwwuuuuUUUup)
 //GO(xcb_present_query_capabilities, 
 //GO(xcb_present_query_capabilities_reply, 
 //GO(xcb_present_query_capabilities_unchecked, 
-GOS(xcb_present_query_version, pFEppuu)
+GOS(xcb_present_query_version, pFEppuu) //%X
 GO(xcb_present_query_version_reply, pFpup)
 //GO(xcb_present_query_version_unchecked, 
 //GO(xcb_present_redirect_notify_notifies, 
@@ -26,4 +28,4 @@ GO(xcb_present_query_version_reply, pFpup)
 //GO(xcb_present_redirect_notify_notifies_length, 
 //GO(xcb_present_redirect_notify_sizeof, 
 //GO(xcb_present_select_input, 
-GOS(xcb_present_select_input_checked, pFEppuuu)
+GOS(xcb_present_select_input_checked, pFEppuuu) //%X

src/wrapped/wrappedlibxcbrandr_private.h

@@ -2,6 +2,9 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+//%S T my_xcb_iterator_t
+
 //GOS(xcb_randr_add_output_mode, 
 //GOS(xcb_randr_add_output_mode_checked, 
 //GOS(xcb_randr_change_output_property, 
@@ -62,7 +65,7 @@
 //GOS(xcb_randr_get_crtc_gamma_size_reply, 
 //GOS(xcb_randr_get_crtc_gamma_size_unchecked, 
 //GOS(xcb_randr_get_crtc_gamma_unchecked, 
-GOS(xcb_randr_get_crtc_info, pFEpppu)
+GOS(xcb_randr_get_crtc_info, pFEpppu) //%X
 //GOS(xcb_randr_get_crtc_info_outputs, 
 //GOS(xcb_randr_get_crtc_info_outputs_end, 
 //GOS(xcb_randr_get_crtc_info_outputs_length, 
@@ -71,7 +74,7 @@ GOS(xcb_randr_get_crtc_info, pFEpppu)
 //GOS(xcb_randr_get_crtc_info_possible_length, 
 GO(xcb_randr_get_crtc_info_reply, pFpup)
 //GOS(xcb_randr_get_crtc_info_sizeof, 
-GOS(xcb_randr_get_crtc_info_unchecked, pFEpppu)
+GOS(xcb_randr_get_crtc_info_unchecked, pFEpppu) //%X
 //GOS(xcb_randr_get_crtc_transform, 
 //GOS(xcb_randr_get_crtc_transform_current_filter_name, 
 //GOS(xcb_randr_get_crtc_transform_current_filter_name_end, 
@@ -94,7 +97,7 @@ GOS(xcb_randr_get_crtc_info_unchecked, pFEpppu)
 //GOS(xcb_randr_get_monitors_reply, 
 //GOS(xcb_randr_get_monitors_sizeof, 
 //GOS(xcb_randr_get_monitors_unchecked, 
-GOS(xcb_randr_get_output_info, pFEpppu)
+GOS(xcb_randr_get_output_info, pFEpppu) //%X
 //GOS(xcb_randr_get_output_info_clones, 
 //GOS(xcb_randr_get_output_info_clones_end, 
 //GOS(xcb_randr_get_output_info_clones_length, 
@@ -109,10 +112,10 @@ GOS(xcb_randr_get_output_info, pFEpppu)
 //GOS(xcb_randr_get_output_info_name_length, 
 GO(xcb_randr_get_output_info_reply, pFpup)
 //GOS(xcb_randr_get_output_info_sizeof, 
-GOS(xcb_randr_get_output_info_unchecked, pFEpppu)
-GOS(xcb_randr_get_output_primary, pFEppu)
+GOS(xcb_randr_get_output_info_unchecked, pFEpppu) //%X
+GOS(xcb_randr_get_output_primary, pFEppu) //%X
 GO(xcb_randr_get_output_primary_reply, pFpup)
-GOS(xcb_randr_get_output_primary_unchecked, pFEppu)
+GOS(xcb_randr_get_output_primary_unchecked, pFEppu) //%X
 //GOS(xcb_randr_get_output_property, 
 //GOS(xcb_randr_get_output_property_data, 
 //GOS(xcb_randr_get_output_property_data_end, 
@@ -165,11 +168,11 @@ GOS(xcb_randr_get_output_primary_unchecked, pFEppu)
 //GOS(xcb_randr_get_screen_info_sizes_iterator, 
 //GOS(xcb_randr_get_screen_info_sizes_length, 
 //GOS(xcb_randr_get_screen_info_unchecked, 
-GOS(xcb_randr_get_screen_resources, pFEppu)
+GOS(xcb_randr_get_screen_resources, pFEppu) //%X
 //GOS(xcb_randr_get_screen_resources_crtcs, 
 //GOS(xcb_randr_get_screen_resources_crtcs_end, 
 //GOS(xcb_randr_get_screen_resources_crtcs_length, 
-GOS(xcb_randr_get_screen_resources_current, pFEppu)
+GOS(xcb_randr_get_screen_resources_current, pFEppu) //%X
 //GOS(xcb_randr_get_screen_resources_current_crtcs, 
 //GOS(xcb_randr_get_screen_resources_current_crtcs_end, 
 //GOS(xcb_randr_get_screen_resources_current_crtcs_length, 
@@ -180,7 +183,7 @@ GOS(xcb_randr_get_screen_resources_current, pFEppu)
 //GOS(xcb_randr_get_screen_resources_current_names_end, 
 //GOS(xcb_randr_get_screen_resources_current_names_length, 
 GO(xcb_randr_get_screen_resources_current_outputs, pFp)
-GOS(xcb_randr_get_screen_resources_current_outputs_end, pFEpp)
+GOS(xcb_randr_get_screen_resources_current_outputs_end, pFEpp) //%T
 GO(xcb_randr_get_screen_resources_current_outputs_length, iFp)
 GO(xcb_randr_get_screen_resources_current_reply, pFpup)
 //GOS(xcb_randr_get_screen_resources_current_sizeof, 
@@ -191,12 +194,12 @@ GO(xcb_randr_get_screen_resources_current_reply, pFpup)
 //GOS(xcb_randr_get_screen_resources_names, 
 //GOS(xcb_randr_get_screen_resources_names_end, 
 //GOS(xcb_randr_get_screen_resources_names_length, 
-GOS(xcb_randr_get_screen_resources_outputs, pFEppu)
+GOS(xcb_randr_get_screen_resources_outputs, pFEppu) //%X
 //GOS(xcb_randr_get_screen_resources_outputs_end, 
 GO(xcb_randr_get_screen_resources_outputs_length, iFp)
 GO(xcb_randr_get_screen_resources_reply, pFpup)
 //GOS(xcb_randr_get_screen_resources_sizeof, 
-GOS(xcb_randr_get_screen_resources_unchecked, pFEppu)
+GOS(xcb_randr_get_screen_resources_unchecked, pFEppu) //%X
 //GOS(xcb_randr_get_screen_size_range, 
 //GOS(xcb_randr_get_screen_size_range_reply, 
 //GOS(xcb_randr_get_screen_size_range_unchecked, 
@@ -253,9 +256,9 @@ DATA(xcb_randr_id, 8)
 //GOS(xcb_randr_query_provider_property_valid_values, 
 //GOS(xcb_randr_query_provider_property_valid_values_end, 
 //GOS(xcb_randr_query_provider_property_valid_values_length, 
-GOS(xcb_randr_query_version, pFEppuu)
+GOS(xcb_randr_query_version, pFEppuu) //%X
 GO(xcb_randr_query_version_reply, pFpup)
-GOS(xcb_randr_query_version_unchecked, pFEppuu)
+GOS(xcb_randr_query_version_unchecked, pFEppuu) //%X
 //GOS(xcb_randr_refresh_rates_end, 
 //GOS(xcb_randr_refresh_rates_next, 
 //GOS(xcb_randr_refresh_rates_rates, 
@@ -266,8 +269,8 @@ GOS(xcb_randr_query_version_unchecked, pFEppuu)
 //GOS(xcb_randr_resource_change_next, 
 //GOS(xcb_randr_screen_size_end, 
 //GOS(xcb_randr_screen_size_next, 
-GOS(xcb_randr_select_input, pFEppuW)
-GOS(xcb_randr_select_input_checked, pFEppuW)
+GOS(xcb_randr_select_input, pFEppuW) //%X
+GOS(xcb_randr_select_input_checked, pFEppuW) //%X
 //GOS(xcb_randr_set_crtc_config, 
 //GOS(xcb_randr_set_crtc_config_reply, 
 //GOS(xcb_randr_set_crtc_config_sizeof, 
@@ -310,4 +313,4 @@ GOS(xcb_randr_select_input_checked, pFEppuW)
 //GOS(xcb_randr_set_screen_config_reply, 
 //GOS(xcb_randr_set_screen_config_unchecked, 
 //GOS(xcb_randr_set_screen_size, 
-//GOS(xcb_randr_set_screen_size_checked, 
+//GOS(xcb_randr_set_screen_size_checked, 

src/wrapped/wrappedlibxcbshape_private.h

@@ -2,6 +2,8 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 //GOS(xcb_shape_combine, 
 //GOS(xcb_shape_combine_checked, 
 //GOS(xcb_shape_get_rectangles, 
@@ -17,8 +19,8 @@ DATA(xcb_shape_id, 8)
 //GOS(xcb_shape_input_selected_unchecked, 
 //GOS(xcb_shape_kind_end, 
 //GOS(xcb_shape_kind_next, 
-GOS(xcb_shape_mask, pFEppuuuwwu)
-GOS(xcb_shape_mask_checked, pFEppuuuwwu)
+GOS(xcb_shape_mask, pFEppuuuwwu)         //%X
+GOS(xcb_shape_mask_checked, pFEppuuuwwu) //%X
 //GOS(xcb_shape_offset, 
 //GOS(xcb_shape_offset_checked, 
 //GOS(xcb_shape_op_end, 
@@ -36,4 +38,4 @@ GOS(xcb_shape_mask_checked, pFEppuuuwwu)
 //GOS(xcb_shape_rectangles_rectangles_length, 
 //GOS(xcb_shape_rectangles_sizeof, 
 //GOS(xcb_shape_select_input, 
-//GOS(xcb_shape_select_input_checked, 
+//GOS(xcb_shape_select_input_checked, 

src/wrapped/wrappedlibxcbshm_private.h

@@ -2,26 +2,29 @@
 #error meh!
 #endif
 
-GOS(xcb_shm_attach, pFEppuuC)
-GOS(xcb_shm_attach_checked, pFEppuuC)
-GOS(xcb_shm_attach_fd, pFEppuuC)
-GOS(xcb_shm_attach_fd_checked, pFEppuuC)
-GOS(xcb_shm_create_pixmap, pFEppuuWWCuu)
-GOS(xcb_shm_create_pixmap_checked, pFEppuuWWCuu)
-GOS(xcb_shm_create_segment, pFEppuuC)
+//%S X my_xcb_cookie_t
+//%S T my_xcb_iterator_t
+
+GOS(xcb_shm_attach, pFEppuuC) //%X
+GOS(xcb_shm_attach_checked, pFEppuuC) //%X
+GOS(xcb_shm_attach_fd, pFEppuuC) //%X
+GOS(xcb_shm_attach_fd_checked, pFEppuuC) //%X
+GOS(xcb_shm_create_pixmap, pFEppuuWWCuu) //%X
+GOS(xcb_shm_create_pixmap_checked, pFEppuuWWCuu) //%X
+GOS(xcb_shm_create_segment, pFEppuuC) //%X
 GO(xcb_shm_create_segment_reply, pFpup)
 GO(xcb_shm_create_segment_reply_fds, pFpp)
-GOS(xcb_shm_create_segment_unchecked, pFEppuuC)
-GOS(xcb_shm_detach, pFEppu)
-GOS(xcb_shm_detach_checked, pFEppu)
-GOS(xcb_shm_get_image, pFEppuwwWWuCuu)
+GOS(xcb_shm_create_segment_unchecked, pFEppuuC) //%X
+GOS(xcb_shm_detach, pFEppu) //%X
+GOS(xcb_shm_detach_checked, pFEppu) //%X
+GOS(xcb_shm_get_image, pFEppuwwWWuCuu) //%X
 GO(xcb_shm_get_image_reply, pFpup)
-GOS(xcb_shm_get_image_unchecked, pFEppuwwWWuCuu)
+GOS(xcb_shm_get_image_unchecked, pFEppuwwWWuCuu) //%X
 DATA(xcb_shm_id, 8)
-GOS(xcb_shm_put_image, pFEppuuWWWWWWwwCCCuu)
-GOS(xcb_shm_put_image_checked, pFEppuuWWWWWWwwCCCuu)
-GOS(xcb_shm_query_version, pFEpp)
+GOS(xcb_shm_put_image, pFEppuuWWWWWWwwCCCuu) //%X
+GOS(xcb_shm_put_image_checked, pFEppuuWWWWWWwwCCCuu) //%X
+GOS(xcb_shm_query_version, pFEpp) //%X
 GO(xcb_shm_query_version_reply, pFpup)
-GOS(xcb_shm_query_version_unchecked, pFEpp)
-GOS(xcb_shm_seg_end, pFEppii)   // xcb_generic_iterator _t by value, so "pii"
-GO(xcb_shm_seg_next, vFp)
+GOS(xcb_shm_query_version_unchecked, pFEpp) //%X
+GOS(xcb_shm_seg_end, pFEppii)   //%{TFT} xcb_generic_iterator_t by value, so "pii"
+GO(xcb_shm_seg_next, vFp)

src/wrapped/wrappedlibxcbxfixes_private.h

@@ -2,6 +2,8 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 //GOS(xcb_xfixes_barrier_end, 
 //GOS(xcb_xfixes_barrier_next, 
 //GOS(xcb_xfixes_change_cursor, 
@@ -22,7 +24,7 @@
 //GOS(xcb_xfixes_create_pointer_barrier_devices_end, 
 //GOS(xcb_xfixes_create_pointer_barrier_devices_length, 
 //GOS(xcb_xfixes_create_pointer_barrier_sizeof, 
-GOS(xcb_xfixes_create_region, pFEppuup)
+GOS(xcb_xfixes_create_region, pFEppuup)                     //%X
 //GOS(xcb_xfixes_create_region_checked, 
 //GOS(xcb_xfixes_create_region_from_bitmap, 
 //GOS(xcb_xfixes_create_region_from_bitmap_checked, 
@@ -38,7 +40,7 @@ GOS(xcb_xfixes_create_region, pFEppuup)
 //GOS(xcb_xfixes_create_region_sizeof, 
 //GOS(xcb_xfixes_delete_pointer_barrier, 
 //GOS(xcb_xfixes_delete_pointer_barrier_checked, 
-GOS(xcb_xfixes_destroy_region, pFEppu)
+GOS(xcb_xfixes_destroy_region, pFEppu)                      //%X
 //GOS(xcb_xfixes_destroy_region_checked, 
 //GOS(xcb_xfixes_expand_region, 
 //GOS(xcb_xfixes_expand_region_checked, 
@@ -82,7 +84,7 @@ DATA(xcb_xfixes_id, 8)
 //GOS(xcb_xfixes_invert_region_checked, 
 //GOS(xcb_xfixes_query_version, 
 GO(xcb_xfixes_query_version_reply, pFpup)
-GOS(xcb_xfixes_query_version_unchecked, pFEppuu)
+GOS(xcb_xfixes_query_version_unchecked, pFEppuu)            //%X
 //GOS(xcb_xfixes_region_end, 
 //GOS(xcb_xfixes_region_extents, 
 //GOS(xcb_xfixes_region_extents_checked, 
@@ -107,8 +109,8 @@ GOS(xcb_xfixes_query_version_unchecked, pFEppuu)
 //GOS(xcb_xfixes_set_region_rectangles_iterator, 
 //GOS(xcb_xfixes_set_region_rectangles_length, 
 //GOS(xcb_xfixes_set_region_sizeof, 
-GOS(xcb_xfixes_set_window_shape_region, pFEppuuwwu)
-GOS(xcb_xfixes_set_window_shape_region_checked, pFEppuuwwu)
+GOS(xcb_xfixes_set_window_shape_region, pFEppuuwwu)         //%X
+GOS(xcb_xfixes_set_window_shape_region_checked, pFEppuuwwu) //%X
 //GOS(xcb_xfixes_show_cursor, 
 //GOS(xcb_xfixes_show_cursor_checked, 
 //GOS(xcb_xfixes_subtract_region, 

src/wrapped/wrappedlibxcbxtest_private.h

@@ -2,14 +2,16 @@
 #error meh!
 #endif
 
+//%S X my_xcb_cookie_t
+
 //GOS(xcb_test_compare_cursor, 
 //GOS(xcb_test_compare_cursor_reply, 
 //GOS(xcb_test_compare_cursor_unchecked, 
-GOS(xcb_test_fake_input, pFEppCCuuwwC)
-GOS(xcb_test_fake_input_checked, pFEppCCuuwwC)
+GOS(xcb_test_fake_input, pFEppCCuuwwC) //%X
+GOS(xcb_test_fake_input_checked, pFEppCCuuwwC) //%X
 //GOS(xcb_test_get_version, 
 //GOS(xcb_test_get_version_reply, 
 //GOS(xcb_test_get_version_unchecked, 
 //GOS(xcb_test_grab_control, 
 //GOS(xcb_test_grab_control_checked, 
-DATA(xcb_test_id, 8)
+DATA(xcb_test_id, 8)