[WRAPPER] Reworked libresolv with new wrapper helper ([STATICBUILD] fixed potential issue with static build)

5 files changed, 67 insertions, 42 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 5f9161e0..fadf6586 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -447,6 +447,7 @@
 #() vFpid
 #() vFpiL
 #() vFpip
+#() vFpiS
 #() vFpui
 #() vFpuI
 #() vFpuC
@@ -537,6 +538,7 @@
 #() iFupp
 #() iFfff
 #() iFLip
+#() iFLpL
 #() iFLpp
 #() iFpwp
 #() iFpii
@@ -787,6 +789,7 @@
 #() pFppl
 #() pFppL
 #() pFppp
+#() pFppS
 #() pFppA
 #() pFpbi
 #() pFSpl
@@ -1329,6 +1332,7 @@
 #() pFppiu
 #() pFppiL
 #() pFppip
+#() pFppiS
 #() pFppCp
 #() pFppWp
 #() pFppuu
@@ -3121,6 +3125,7 @@
 #() iFpiLppppppppp
 #() iFpCCCWCWCCCWp
 #() iFpLLlliLppppp
+#() iFpLpuuLpLpppL
 #() iFpLpppppppppp
 #() iFppLlliLppppp
 #() iFpppppppppppp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 43fba3a1..4a515e47 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -482,6 +482,7 @@ typedef void (*vFpif_t)(void*, int32_t, float);
 typedef void (*vFpid_t)(void*, int32_t, double);
 typedef void (*vFpiL_t)(void*, int32_t, uintptr_t);
 typedef void (*vFpip_t)(void*, int32_t, void*);
+typedef void (*vFpiS_t)(void*, int32_t, void*);
 typedef void (*vFpui_t)(void*, uint32_t, int32_t);
 typedef void (*vFpuI_t)(void*, uint32_t, int64_t);
 typedef void (*vFpuC_t)(void*, uint32_t, uint8_t);
@@ -572,6 +573,7 @@ typedef int32_t (*iFupL_t)(uint32_t, void*, uintptr_t);
 typedef int32_t (*iFupp_t)(uint32_t, void*, void*);
 typedef int32_t (*iFfff_t)(float, float, float);
 typedef int32_t (*iFLip_t)(uintptr_t, int32_t, void*);
+typedef int32_t (*iFLpL_t)(uintptr_t, void*, uintptr_t);
 typedef int32_t (*iFLpp_t)(uintptr_t, void*, void*);
 typedef int32_t (*iFpwp_t)(void*, int16_t, void*);
 typedef int32_t (*iFpii_t)(void*, int32_t, int32_t);
@@ -818,6 +820,7 @@ typedef void* (*pFppd_t)(void*, void*, double);
 typedef void* (*pFppl_t)(void*, void*, intptr_t);
 typedef void* (*pFppL_t)(void*, void*, uintptr_t);
 typedef void* (*pFppp_t)(void*, void*, void*);
+typedef void* (*pFppS_t)(void*, void*, void*);
 typedef void* (*pFppA_t)(void*, void*, void*);
 typedef void* (*pFpbi_t)(void*, void*, int32_t);
 typedef void* (*pFSpl_t)(void*, void*, intptr_t);
@@ -1358,6 +1361,7 @@ typedef void* (*pFppii_t)(void*, void*, int32_t, int32_t);
 typedef void* (*pFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef void* (*pFppiL_t)(void*, void*, int32_t, uintptr_t);
 typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
+typedef void* (*pFppiS_t)(void*, void*, int32_t, void*);
 typedef void* (*pFppCp_t)(void*, void*, uint8_t, void*);
 typedef void* (*pFppWp_t)(void*, void*, uint16_t, void*);
 typedef void* (*pFppuu_t)(void*, void*, uint32_t, uint32_t);
@@ -3148,6 +3152,7 @@ typedef int32_t (*iFpiLlliLppppp_t)(void*, int32_t, uintptr_t, intptr_t, intptr_
 typedef int32_t (*iFpiLppppppppp_t)(void*, int32_t, uintptr_t, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpCCCWCWCCCWp_t)(void*, uint8_t, uint8_t, uint8_t, uint16_t, uint8_t, uint16_t, uint8_t, uint8_t, uint8_t, uint16_t, void*);
 typedef int32_t (*iFpLLlliLppppp_t)(void*, uintptr_t, uintptr_t, intptr_t, intptr_t, int32_t, uintptr_t, void*, void*, void*, void*, void*);
+typedef int32_t (*iFpLpuuLpLpppL_t)(void*, uintptr_t, void*, uint32_t, uint32_t, uintptr_t, void*, uintptr_t, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpLpppppppppp_t)(void*, uintptr_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFppLlliLppppp_t)(void*, void*, uintptr_t, intptr_t, intptr_t, int32_t, uintptr_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
@@ -3740,6 +3745,7 @@ void vFpif(x64emu_t *emu, uintptr_t fcn) { vFpif_t fn = (vFpif_t)fcn; fn((void*)
 void vFpid(x64emu_t *emu, uintptr_t fcn) { vFpid_t fn = (vFpid_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, emu->xmm[0].d[0]); }
 void vFpiL(x64emu_t *emu, uintptr_t fcn) { vFpiL_t fn = (vFpiL_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpip(x64emu_t *emu, uintptr_t fcn) { vFpip_t fn = (vFpip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
+void vFpiS(x64emu_t *emu, uintptr_t fcn) { vFpiS_t fn = (vFpiS_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, io_convert((void*)R_RDX)); }
 void vFpui(x64emu_t *emu, uintptr_t fcn) { vFpui_t fn = (vFpui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void vFpuI(x64emu_t *emu, uintptr_t fcn) { vFpuI_t fn = (vFpuI_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int64_t)R_RDX); }
 void vFpuC(x64emu_t *emu, uintptr_t fcn) { vFpuC_t fn = (vFpuC_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX); }
@@ -3830,6 +3836,7 @@ void iFupL(x64emu_t *emu, uintptr_t fcn) { iFupL_t fn = (iFupL_t)fcn; R_RAX=(int
 void iFupp(x64emu_t *emu, uintptr_t fcn) { iFupp_t fn = (iFupp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFfff(x64emu_t *emu, uintptr_t fcn) { iFfff_t fn = (iFfff_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void iFLip(x64emu_t *emu, uintptr_t fcn) { iFLip_t fn = (iFLip_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
+void iFLpL(x64emu_t *emu, uintptr_t fcn) { iFLpL_t fn = (iFLpL_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFLpp(x64emu_t *emu, uintptr_t fcn) { iFLpp_t fn = (iFLpp_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFpwp(x64emu_t *emu, uintptr_t fcn) { iFpwp_t fn = (iFpwp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int16_t)R_RSI, (void*)R_RDX); }
 void iFpii(x64emu_t *emu, uintptr_t fcn) { iFpii_t fn = (iFpii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
@@ -4076,6 +4083,7 @@ void pFppd(x64emu_t *emu, uintptr_t fcn) { pFppd_t fn = (pFppd_t)fcn; R_RAX=(uin
 void pFppl(x64emu_t *emu, uintptr_t fcn) { pFppl_t fn = (pFppl_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
 void pFppL(x64emu_t *emu, uintptr_t fcn) { pFppL_t fn = (pFppL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFppp(x64emu_t *emu, uintptr_t fcn) { pFppp_t fn = (pFppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void pFppS(x64emu_t *emu, uintptr_t fcn) { pFppS_t fn = (pFppS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, io_convert((void*)R_RDX)); }
 void pFppA(x64emu_t *emu, uintptr_t fcn) { pFppA_t fn = (pFppA_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFpbi(x64emu_t *emu, uintptr_t fcn) { pFpbi_t fn = (pFpbi_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RSI); R_RAX=(uintptr_t)fn((void*)R_RDI, aligned_xcb, (int32_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RSI); }
 void pFSpl(x64emu_t *emu, uintptr_t fcn) { pFSpl_t fn = (pFSpl_t)fcn; R_RAX=(uintptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (intptr_t)R_RDX); }
@@ -4616,6 +4624,7 @@ void pFppii(x64emu_t *emu, uintptr_t fcn) { pFppii_t fn = (pFppii_t)fcn; R_RAX=(
 void pFppiu(x64emu_t *emu, uintptr_t fcn) { pFppiu_t fn = (pFppiu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void pFppiL(x64emu_t *emu, uintptr_t fcn) { pFppiL_t fn = (pFppiL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void pFppip(x64emu_t *emu, uintptr_t fcn) { pFppip_t fn = (pFppip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void pFppiS(x64emu_t *emu, uintptr_t fcn) { pFppiS_t fn = (pFppiS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, io_convert((void*)R_RCX)); }
 void pFppCp(x64emu_t *emu, uintptr_t fcn) { pFppCp_t fn = (pFppCp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (void*)R_RCX); }
 void pFppWp(x64emu_t *emu, uintptr_t fcn) { pFppWp_t fn = (pFppWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
 void pFppuu(x64emu_t *emu, uintptr_t fcn) { pFppuu_t fn = (pFppuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -6406,6 +6415,7 @@ void iFpiLlliLppppp(x64emu_t *emu, uintptr_t fcn) { iFpiLlliLppppp_t fn = (iFpiL
 void iFpiLppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpiLppppppppp_t fn = (iFpiLppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFpCCCWCWCCCWp(x64emu_t *emu, uintptr_t fcn) { iFpCCCWCWCCCWp_t fn = (iFpCCCWCWCCCWp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint16_t)R_R8, (uint8_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16), *(uint8_t*)(R_RSP + 24), *(uint8_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFpLLlliLppppp(x64emu_t *emu, uintptr_t fcn) { iFpLLlliLppppp_t fn = (iFpLLlliLppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
+void iFpLpuuLpLpppL(x64emu_t *emu, uintptr_t fcn) { iFpLpuuLpLpppL_t fn = (iFpLpuuLpLpppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(uintptr_t*)(R_RSP + 48)); }
 void iFpLpppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpLpppppppppp_t fn = (iFpLpppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFppLlliLppppp(x64emu_t *emu, uintptr_t fcn) { iFppLlliLppppp_t fn = (iFppLlliLppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppppppp_t fn = (iFpppppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
@@ -6992,6 +7002,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFupp) return 1;
 	if (fun == &iFfff) return 4;
 	if (fun == &iFLip) return 1;
+	if (fun == &iFLpL) return 1;
 	if (fun == &iFLpp) return 1;
 	if (fun == &iFpwp) return 1;
 	if (fun == &iFpii) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 1b1ba22f..d0c0ec58 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -484,6 +484,7 @@ void vFpif(x64emu_t *emu, uintptr_t fnc);
 void vFpid(x64emu_t *emu, uintptr_t fnc);
 void vFpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpip(x64emu_t *emu, uintptr_t fnc);
+void vFpiS(x64emu_t *emu, uintptr_t fnc);
 void vFpui(x64emu_t *emu, uintptr_t fnc);
 void vFpuI(x64emu_t *emu, uintptr_t fnc);
 void vFpuC(x64emu_t *emu, uintptr_t fnc);
@@ -574,6 +575,7 @@ void iFupL(x64emu_t *emu, uintptr_t fnc);
 void iFupp(x64emu_t *emu, uintptr_t fnc);
 void iFfff(x64emu_t *emu, uintptr_t fnc);
 void iFLip(x64emu_t *emu, uintptr_t fnc);
+void iFLpL(x64emu_t *emu, uintptr_t fnc);
 void iFLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpwp(x64emu_t *emu, uintptr_t fnc);
 void iFpii(x64emu_t *emu, uintptr_t fnc);
@@ -824,6 +826,7 @@ void pFppd(x64emu_t *emu, uintptr_t fnc);
 void pFppl(x64emu_t *emu, uintptr_t fnc);
 void pFppL(x64emu_t *emu, uintptr_t fnc);
 void pFppp(x64emu_t *emu, uintptr_t fnc);
+void pFppS(x64emu_t *emu, uintptr_t fnc);
 void pFppA(x64emu_t *emu, uintptr_t fnc);
 void pFpbi(x64emu_t *emu, uintptr_t fnc);
 void pFSpl(x64emu_t *emu, uintptr_t fnc);
@@ -1366,6 +1369,7 @@ void pFppii(x64emu_t *emu, uintptr_t fnc);
 void pFppiu(x64emu_t *emu, uintptr_t fnc);
 void pFppiL(x64emu_t *emu, uintptr_t fnc);
 void pFppip(x64emu_t *emu, uintptr_t fnc);
+void pFppiS(x64emu_t *emu, uintptr_t fnc);
 void pFppCp(x64emu_t *emu, uintptr_t fnc);
 void pFppWp(x64emu_t *emu, uintptr_t fnc);
 void pFppuu(x64emu_t *emu, uintptr_t fnc);
@@ -3158,6 +3162,7 @@ void iFpiLlliLppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiLppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpCCCWCWCCCWp(x64emu_t *emu, uintptr_t fnc);
 void iFpLLlliLppppp(x64emu_t *emu, uintptr_t fnc);
+void iFpLpuuLpLpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFppLlliLppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index ad937bf1..1251e171 100644
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -234,7 +234,11 @@ GO(div, UFii)
 //GO(_dl_catch_exception, 
 GOWM(dl_iterate_phdr, iFEpp)
 //GO(_dl_mcount_wrapper, 
+#ifdef STATICBUILD
+//GO(_dl_mcount_wrapper_check, vFp)
+#else
 GO(_dl_mcount_wrapper_check, vFp)
+#endif
 //DATAB(_dl_open_hook, 
 //DATAB(_dl_open_hook2, 
 //GO(_dl_signal_error, 
diff --git a/src/wrapped/wrappedlibresolv_private.h b/src/wrapped/wrappedlibresolv_private.h
index 8f2fceb2..8890e6e5 100644
--- a/src/wrapped/wrappedlibresolv_private.h
+++ b/src/wrapped/wrappedlibresolv_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(__b64_ntop, iFpLpL)
@@ -9,15 +9,15 @@ GO(__dn_count_labels, iFp)
 GO(__dn_expand, iFppppi)
 GOW(dn_expand, iFppppi)
 GO(__dn_skipname, iFpp)
-GO(__fp_nquery, vFpip)
-GO(__fp_query, vFpp)
-//GO(__fp_resstat
-//GO(_gethtbyaddr
-//GO(_gethtbyname
-//GO(_gethtbyname2
-//GO(_gethtent
-//GO(_getlong
-//GO(_getshort
+GO(__fp_nquery, vFpiS)
+GO(__fp_query, vFpS)
+GO(__fp_resstat, vFpS)
+//GO(_gethtbyaddr, 
+//GO(_gethtbyname, 
+//GO(_gethtbyname2, 
+//GO(_gethtent, 
+//GO(_getlong, 
+//GO(_getshort, 
 GO(__hostalias, pFp)
 GO(inet_neta, pFupL)
 GO(inet_net_ntop, pFipipL)
@@ -25,70 +25,70 @@ GO(inet_net_pton, iFippL)
 GO(__loc_aton, iFpp)
 GO(__loc_ntoa, pFpp)
 GO(ns_datetosecs, uFpp)
-//GO(ns_format_ttl
+GO(ns_format_ttl, iFLpL)
 GO(__ns_get16, uFp)
 GOW(ns_get16, uFp)
 GO(__ns_get32, LFp)
 GOW(ns_get32, LFp)
 GO(ns_initparse, iFpip)
-//GO(ns_makecanon
-//GO(ns_msg_getflag
+GO(ns_makecanon, iFppL)
+//GO(ns_msg_getflag, 
 GO(ns_name_compress, iFppLpp)
 GO(ns_name_ntol, iFppL)
 GO(__ns_name_ntop, iFppL)
-GOW(ns_name_ntop,iFppL)
+GOW(ns_name_ntop, iFppL)
 GO(ns_name_pack, iFppipp)
 GO(ns_name_pton, iFppL)
-GO(ns_name_rollback, iFpp)
+GO(ns_name_rollback, vFppp)
 GO(ns_name_skip, iFpp)
 GO(ns_name_uncompress, iFppppL)
 GO(__ns_name_unpack, iFppppL)
 GOW(ns_name_unpack, iFppppL)
-GO(ns_parserr, iFpiip)
-//GO(ns_parse_ttl
+GO(ns_parserr, iFpuip)
+GO(ns_parse_ttl, iFpp)
 GO(ns_put16, vFup)
 GO(ns_put32, vFLp)
-//GO(ns_samedomain
-//GO(ns_samename
-GO(ns_skiprr, iFppii)
-//GO(ns_sprintrr
-//GO(ns_sprintrrf
-//GO(ns_subdomain
-GO(__p_cdname, pFppp)
-GO(__p_cdnname, pFppip)
+GO(ns_samedomain, iFpp)
+GO(ns_samename, iFpp)
+GO(ns_skiprr, iFppui)
+GO(ns_sprintrr, iFpppppL)
+GO(ns_sprintrrf, iFpLpuuLpLpppL)
+GO(ns_subdomain, iFpp)
+GO(__p_cdname, pFppS)
+GO(__p_cdnname, pFppiS)
 GO(__p_class, pFi)
 //DATA(__p_class_syms, 4)
-GO(__p_fqname, pFppp)
+GO(__p_fqname, pFppS)
 GO(__p_fqnname, pFppipi)
 GO(__p_option, pFL)
 GO(__p_query, vFp)
 GO(__p_rcode, pFi)
-//GO(__p_secstodate
-GO(__p_time, pFL)
+//GO(__p_secstodate, 
+GO(__p_time, pFu)
 GO(__p_type, pFi)
 //DATA(__p_type_syms, 4)
-GO(__putlong, vFLp)
+GO(__putlong, vFup)
 GO(__putshort, vFWp)
 GO(__res_close, vFv)
-//GO(__res_context_hostalias
-//GO(__res_context_query
-//GO(__res_context_search
+//GO(__res_context_hostalias, 
+//GO(__res_context_query, 
+//GO(__res_context_search, 
 GO(__res_dnok, iFp)
-//GO(res_gethostbyaddr
-//GO(res_gethostbyname
-//GO(res_gethostbyname2
+//GO(res_gethostbyaddr, 
+//GO(res_gethostbyname, 
+//GO(res_gethostbyname2, 
 GO(__res_hnok, iFp)
-//GO(__res_hostalias
+GO(__res_hostalias, pFpppL)
 GO(__res_isourserver, iFp)
 GO(__res_mailok, iFp)
 GO(__res_mkquery, iFipiipippi)
 GOW(res_mkquery, iFipiipippi)
 GO(__res_nameinquery, iFpiipp)
-//GO(__res_nmkquery
+//GO(__res_nmkquery, 
 GO(__res_nquery, iFppiipi)
-//GO(__res_nquerydomain
+//GO(__res_nquerydomain, 
 GO(__res_nsearch, iFppiipi)
-//GO(__res_nsend
+//GO(__res_nsend, 
 //DATA(_res_opcodes, 4)
 GO(__res_ownok, iFp)
 GO(__res_queriesmatch, iFpppp)
@@ -99,9 +99,9 @@ GOW(res_querydomain, iFppiipi)
 GO2(__res_search, iFpiipi, res_search)
 GOW(res_search, iFpiipi)
 GO(__res_send, iFpipi)
-//GO(res_send_setqhook
-//GO(res_send_setrhook
-//GO(_sethtent
+//GO(res_send_setqhook, 
+//GO(res_send_setrhook, 
+//GO(_sethtent, 
 GO(__sym_ntop, pFpip)
 GO(__sym_ntos, pFpip)
 GO(__sym_ston, iFppp)