[BOX32][WRAPPER] Added 32bits wrapped libxcb

Author: ptitSeb

CMakeLists.txt

@@ -835,6 +835,7 @@ if(BOX32)
         "${BOX64_ROOT}/src/wrapped32/wrappedxinerama.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedexpat.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedlibx11xcb.c"
+        "${BOX64_ROOT}/src/wrapped32/wrappedlibxcb.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedudev0.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedudev1.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedlibuuid.c"

rebuild_wrappers_32.py

@@ -1204,8 +1204,8 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 			CType[(value, CType.ReadWrite.none)].asarg = asarg
 			CType[(value, CType.ReadWrite.none)].aspost = ""
 			if value == 'n':
-				CType[(value, CType.ReadWrite.none)].aspre = f"void *aligned_xcb = align_xcb_connection32(from_ptrv(R_ESP + {{p}})); "
-				CType[(value, CType.ReadWrite.none)].aspost = f" unalign_xcb_connection32(aligned_xcb, from_ptrv(R_ESP + {{p}}));"
+				CType[(value, CType.ReadWrite.none)].aspre = f"void *aligned_xcb = align_xcb_connection32(from_ptriv(R_ESP + {{p}})); "
+				CType[(value, CType.ReadWrite.none)].aspost = f" unalign_xcb_connection32(aligned_xcb, from_ptriv(R_ESP + {{p}}));"
 	for ctn in CType.getSingletons():
 		CType[ctn].generate_converters()
 

src/library_list_32.h

@@ -61,6 +61,8 @@ GO("libXinerama.so.1", xinerama)
 
 GO("libX11-xcb.so.1", libx11xcb)
 GO("libX11-xcb.so", libx11xcb)
+GO("libxcb.so.1", libxcb)
+GO("libxcb.so", libxcb)
 
 GO("libopenal.so.1", openal)
 GO("libopenal.so.0", openal)

src/libtools/myalignxcb32.c

@@ -72,7 +72,7 @@ typedef struct my_xcb_connection_32_s {
 
 #define NXCB 8
 static my_xcb_connection_t* my_xcb_connects[NXCB] = {0};
-static my_xcb_connection_32_t x64_xcb_connects[NXCB] = {0};
+static my_xcb_connection_32_t i386_xcb_connects[NXCB] = {0};
 
 void* align_xcb_connection32(void* src)
 {
@@ -81,7 +81,7 @@ void* align_xcb_connection32(void* src)
     // find it
     my_xcb_connection_t * dest = NULL;
     for(int i=0; i<NXCB && !dest; ++i)
-        if(src==&x64_xcb_connects[i])
+        if(src==&i386_xcb_connects[i])
             dest = my_xcb_connects[i];
     #if 1
     if(!dest)
@@ -180,15 +180,15 @@ void* add_xcb_connection32(void* src)
     // check if already exist
     for(int i=0; i<NXCB; ++i)
         if(my_xcb_connects[i] == src) {
-            unalign_xcb_connection32(src, &x64_xcb_connects[i]);
-            return &x64_xcb_connects[i];
+            unalign_xcb_connection32(src, &i386_xcb_connects[i]);
+            return &i386_xcb_connects[i];
         }
     // find a free slot
     for(int i=0; i<NXCB; ++i)
         if(!my_xcb_connects[i]) {
             my_xcb_connects[i] = src;
-            unalign_xcb_connection32(src, &x64_xcb_connects[i]);
-            return &x64_xcb_connects[i];
+            unalign_xcb_connection32(src, &i386_xcb_connects[i]);
+            return &i386_xcb_connects[i];
         }
     printf_log(LOG_NONE, "BOX64: Error, no more free xcb_connect 32bits slot for %p\n", src);
     return src;
@@ -200,9 +200,9 @@ void del_xcb_connection32(void* src)
         return;
     // find it
     for(int i=0; i<NXCB; ++i)
-        if(src==&x64_xcb_connects[i]) {
+        if(src==&i386_xcb_connects[i]) {
             my_xcb_connects[i] = NULL;
-            memset(&x64_xcb_connects[i], 0, sizeof(my_xcb_connection_32_t));
+            memset(&i386_xcb_connects[i], 0, sizeof(my_xcb_connection_32_t));
             return;
         }
     printf_log(LOG_NONE, "BOX64: Error, 32bits xcb_connect %p not found for deletion\n", src);

src/wrapped32/generated/converter32.c

@@ -194,6 +194,22 @@ void to_struct_LLLLLLLLLLLLLLLLLL(ptr_t d, const struct_LLLLLLLLLLLLLLLLLL_t *sr
 	*(ulong_t*)dest = to_ulong(src->L17); dest += 4;
 }
 
+void from_struct_LpCC(struct_LpCC_t *dest, ptr_t s) {
+	uint8_t* src = (uint8_t*)from_ptrv(s);
+	dest->L0 = from_ulong(*(ulong_t*)src); src += 4;
+	dest->p1 = from_ptrv(*(ptr_t*)src); src += 4;
+	dest->C2 = *(uint8_t*)src; src += 1;
+	dest->C3 = *(uint8_t*)src; src += 1;
+}
+void to_struct_LpCC(ptr_t d, const struct_LpCC_t *src) {
+	if (!src) return;
+	uint8_t* dest = (uint8_t*)from_ptrv(d);
+	*(ulong_t*)dest = to_ulong(src->L0); dest += 4;
+	*(ptr_t*)dest = to_ptrv(src->p1); dest += 4;
+	*(uint8_t*)dest = src->C2; dest += 1;
+	*(uint8_t*)dest = src->C3; dest += 1;
+}
+
 void from_struct_h(struct_h_t *dest, ptr_t s) {
 	uint8_t* src = (uint8_t*)from_ptrv(s);
 	dest->h0 = from_hash(*(ulong_t*)src); src += 4;
@@ -214,6 +230,18 @@ void to_struct_H(ptr_t d, const struct_H_t *src) {
 	*(ulong_t*)dest = to_hash_d(src->H0); dest += 4;
 }
 
+void from_struct_pL(struct_pL_t *dest, ptr_t s) {
+	uint8_t* src = (uint8_t*)from_ptrv(s);
+	dest->p0 = from_ptrv(*(ptr_t*)src); src += 4;
+	dest->L1 = from_ulong(*(long_t*)src); src += 4;
+}
+void to_struct_pL(ptr_t d, const struct_pL_t *src) {
+	if (!src) return;
+	uint8_t* dest = (uint8_t*)from_ptrv(d);
+	*(ptr_t*)dest = to_ptrv(src->p0); dest += 4;
+	*(ulong_t*)dest = to_ulong(src->L1); dest += 4;
+}
+
 void from_struct_ppppii(struct_ppppii_t *dest, ptr_t s) {
 	uint8_t* src = (uint8_t*)from_ptrv(s);
 	dest->p0 = from_ptrv(*(ptr_t*)src); src += 4;
@@ -551,6 +579,20 @@ void to_struct_puu(ptr_t d, const struct_puu_t *src) {
 	*(uint32_t*)dest = src->u2; dest += 4;
 }
 
+void from_struct_pii(struct_pii_t *dest, ptr_t s) {
+	uint8_t* src = (uint8_t*)from_ptrv(s);
+	dest->p0 = from_ptrv(*(ptr_t*)src); src += 4;
+	dest->i1 = *(int*)src; src += 4;
+	dest->i2 = *(int*)src; src += 4;
+}
+void to_struct_pii(ptr_t d, const struct_pii_t *src) {
+	if (!src) return;
+	uint8_t* dest = (uint8_t*)from_ptrv(d);
+	*(ptr_t*)dest = to_ptrv(src->p0); dest += 4;
+	*(int*)dest = src->i1; dest += 4;
+	*(int*)dest = src->i2; dest += 4;
+}
+
 void from_struct_piiL(struct_piiL_t *dest, ptr_t s) {
 	uint8_t* src = (uint8_t*)from_ptrv(s);
 	dest->p0 = from_ptrv(*(ptr_t*)src); src += 4;
@@ -567,6 +609,22 @@ void to_struct_piiL(ptr_t d, const struct_piiL_t *src) {
 	*(ulong_t*)dest = to_ulong(src->L3); dest += 4;
 }
 
+void from_struct_ipip(struct_ipip_t *dest, ptr_t s) {
+	uint8_t* src = (uint8_t*)from_ptrv(s);
+	dest->i0 = *(int*)src; src += 4;
+	dest->p1 = from_ptrv(*(ptr_t*)src); src += 4;
+	dest->i2 = *(int*)src; src += 4;
+	dest->p3 = from_ptrv(*(ptr_t*)src); src += 4;
+}
+void to_struct_ipip(ptr_t d, const struct_ipip_t *src) {
+	if (!src) return;
+	uint8_t* dest = (uint8_t*)from_ptrv(d);
+	*(int*)dest = src->i0; dest += 4;
+	*(ptr_t*)dest = to_ptrv(src->p1); dest += 4;
+	*(int*)dest = src->i2; dest += 4;
+	*(ptr_t*)dest = to_ptrv(src->p3); dest += 4;
+}
+
 void from_struct_piip(struct_piip_t *dest, ptr_t s) {
 	uint8_t* src = (uint8_t*)from_ptrv(s);
 	dest->p0 = from_ptrv(*(ptr_t*)src); src += 4;

src/wrapped32/generated/converter32.h

@@ -96,6 +96,14 @@ typedef struct struct_LLLLLLLLLLLLLLLLLL_s {
 } struct_LLLLLLLLLLLLLLLLLL_t;
 void from_struct_LLLLLLLLLLLLLLLLLL(struct_LLLLLLLLLLLLLLLLLL_t *dest, ptr_t src);
 void to_struct_LLLLLLLLLLLLLLLLLL(ptr_t dest, const struct_LLLLLLLLLLLLLLLLLL_t *src);
+typedef struct struct_LpCC_s {
+	unsigned long L0;
+	void* p1;
+	uint8_t C2;
+	uint8_t C3;
+} struct_LpCC_t;
+void from_struct_LpCC(struct_LpCC_t *dest, ptr_t src);
+void to_struct_LpCC(ptr_t dest, const struct_LpCC_t *src);
 typedef struct struct_h_s {
 	uintptr_t h0;
 } struct_h_t;
@@ -106,6 +114,12 @@ typedef struct struct_H_s {
 } struct_H_t;
 void from_struct_H(struct_H_t *dest, ptr_t src);
 void to_struct_H(ptr_t dest, const struct_H_t *src);
+typedef struct struct_pL_s {
+	void* p0;
+	unsigned long L1;
+} struct_pL_t;
+void from_struct_pL(struct_pL_t *dest, ptr_t src);
+void to_struct_pL(ptr_t dest, const struct_pL_t *src);
 typedef struct struct_ppppii_s {
 	void* p0;
 	void* p1;
@@ -277,6 +291,13 @@ typedef struct struct_puu_s {
 } struct_puu_t;
 void from_struct_puu(struct_puu_t *dest, ptr_t src);
 void to_struct_puu(ptr_t dest, const struct_puu_t *src);
+typedef struct struct_pii_s {
+	void* p0;
+	int i1;
+	int i2;
+} struct_pii_t;
+void from_struct_pii(struct_pii_t *dest, ptr_t src);
+void to_struct_pii(ptr_t dest, const struct_pii_t *src);
 typedef struct struct_piiL_s {
 	void* p0;
 	int i1;
@@ -299,6 +320,14 @@ typedef struct struct_ppup_s {
 	uint32_t u2;
 	void* p3;
 } struct_ppup_t;
+typedef struct struct_ipip_s {
+	int i0;
+	void* p1;
+	int i2;
+	void* p3;
+} struct_ipip_t;
+void from_struct_ipip(struct_ipip_t *dest, ptr_t src);
+void to_struct_ipip(ptr_t dest, const struct_ipip_t *src);
 void from_struct_ppup(struct_ppup_t *dest, ptr_t src);
 void to_struct_ppup(ptr_t dest, const struct_ppup_t *src);
 typedef struct struct_iiiiiLi_s {