Added wrapped libcurl/libcurl-gnutls

6 files changed, 655 insertions, 2 deletions

diff --git a/src/library_list.h b/src/library_list.h
index f9db052a..63c47cc5 100755
--- a/src/library_list.h
+++ b/src/library_list.h
@@ -69,8 +69,8 @@ GO("libalure.so.1", alure)
 //GO("libjpeg.so.8", libjpeg)
 //GO("libjpeg.so.62", libjpeg62)
 //GO("libturbojpeg.so.0", turbojpeg)
-//GO("libcurl.so.4", curl)
-//GO("libcurl-gnutls.so.4", curl)
+GO("libcurl.so.4", curl)
+GO("libcurl-gnutls.so.4", curl)
 GO("libudev.so.0", udev0)
 GO("libudev.so.1", udev1)
 GO("libdbus-1.so.3", dbus)
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 75e2413a..18507ec7 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -502,6 +502,7 @@
 #() IFEpIi
 #() IFppip
 #() IFSIii
+#() uFEpup
 #() uFifff
 #() uFuuuu
 #() uFpipp
@@ -853,6 +854,7 @@
 #() iFpppppL
 #() iFpppppp
 #() uFpippup
+#() uFpppppp
 #() UFpippup
 #() lFipLipu
 #() lFipLipp
@@ -1131,6 +1133,7 @@
 #() vFuuiiiiuuiiiiiii
 #() vFfffffffffffffff
 #() pFppppppppppppppp
+#() iFpppppppppppppppp
 #() pFpppppppppppppppp
 #() vFppuiiiiipuiiiiiiii
 #() pFipppppppppppppppppppppp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 2d9ffc2e..92ae4a7d 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -535,6 +535,7 @@ typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
 typedef int64_t (*IFEpIi_t)(x64emu_t*, void*, int64_t, int64_t);
 typedef int64_t (*IFppip_t)(void*, void*, int64_t, void*);
 typedef int64_t (*IFSIii_t)(void*, int64_t, int64_t, int64_t);
+typedef uint64_t (*uFEpup_t)(x64emu_t*, void*, uint64_t, void*);
 typedef uint64_t (*uFifff_t)(int64_t, float, float, float);
 typedef uint64_t (*uFuuuu_t)(uint64_t, uint64_t, uint64_t, uint64_t);
 typedef uint64_t (*uFpipp_t)(void*, int64_t, void*, void*);
@@ -886,6 +887,7 @@ typedef int64_t (*iFpppppi_t)(void*, void*, void*, void*, void*, int64_t);
 typedef int64_t (*iFpppppL_t)(void*, void*, void*, void*, void*, uintptr_t);
 typedef int64_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
 typedef uint64_t (*uFpippup_t)(void*, int64_t, void*, void*, uint64_t, void*);
+typedef uint64_t (*uFpppppp_t)(void*, void*, void*, void*, void*, void*);
 typedef uint64_t (*UFpippup_t)(void*, int64_t, void*, void*, uint64_t, void*);
 typedef intptr_t (*lFipLipu_t)(int64_t, void*, uintptr_t, int64_t, void*, uint64_t);
 typedef intptr_t (*lFipLipp_t)(int64_t, void*, uintptr_t, int64_t, void*, void*);
@@ -1164,6 +1166,7 @@ typedef void (*vFuddiiddiiddiip_t)(uint64_t, double, double, int64_t, int64_t, d
 typedef void (*vFuuiiiiuuiiiiiii_t)(uint64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFfffffffffffffff_t)(float, float, float, float, float, float, float, float, float, float, float, float, float, float, float);
 typedef void* (*pFppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
+typedef int64_t (*iFpppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFppuiiiiipuiiiiiiii_t)(void*, void*, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void* (*pFipppppppppppppppppppppp_t)(int64_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
@@ -1684,6 +1687,7 @@ void iFpppp(x64emu_t *emu, uintptr_t fcn) { iFpppp_t fn = (iFpppp_t)fcn; R_RAX=(
 void IFEpIi(x64emu_t *emu, uintptr_t fcn) { IFEpIi_t fn = (IFEpIi_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void IFppip(x64emu_t *emu, uintptr_t fcn) { IFppip_t fn = (IFppip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void IFSIii(x64emu_t *emu, uintptr_t fcn) { IFSIii_t fn = (IFSIii_t)fcn; R_RAX=(int64_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
+void uFEpup(x64emu_t *emu, uintptr_t fcn) { uFEpup_t fn = (uFEpup_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void uFifff(x64emu_t *emu, uintptr_t fcn) { uFifff_t fn = (uFifff_t)fcn; R_RAX=(uint64_t)fn((int64_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void uFuuuu(x64emu_t *emu, uintptr_t fcn) { uFuuuu_t fn = (uFuuuu_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
 void uFpipp(x64emu_t *emu, uintptr_t fcn) { uFpipp_t fn = (uFpipp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -2035,6 +2039,7 @@ void iFpppppi(x64emu_t *emu, uintptr_t fcn) { iFpppppi_t fn = (iFpppppi_t)fcn; R
 void iFpppppL(x64emu_t *emu, uintptr_t fcn) { iFpppppL_t fn = (iFpppppL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void iFpppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppp_t fn = (iFpppppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpippup(x64emu_t *emu, uintptr_t fcn) { uFpippup_t fn = (uFpippup_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint64_t)R_R8, (void*)R_R9); }
+void uFpppppp(x64emu_t *emu, uintptr_t fcn) { uFpppppp_t fn = (uFpppppp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void UFpippup(x64emu_t *emu, uintptr_t fcn) { UFpippup_t fn = (UFpippup_t)fcn; R_RAX=fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint64_t)R_R8, (void*)R_R9); }
 void lFipLipu(x64emu_t *emu, uintptr_t fcn) { lFipLipu_t fn = (lFipLipu_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (uint64_t)R_R9); }
 void lFipLipp(x64emu_t *emu, uintptr_t fcn) { lFipLipp_t fn = (lFipLipp_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -2313,6 +2318,7 @@ void vFuddiiddiiddiip(x64emu_t *emu, uintptr_t fcn) { vFuddiiddiiddiip_t fn = (v
 void vFuuiiiiuuiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFuuiiiiuuiiiiiii_t fn = (vFuuiiiiuuiiiiiii_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24), *(int64_t*)(R_RSP + 32), *(int64_t*)(R_RSP + 40), *(int64_t*)(R_RSP + 48), *(int64_t*)(R_RSP + 56), *(int64_t*)(R_RSP + 64), *(int64_t*)(R_RSP + 72)); }
 void vFfffffffffffffff(x64emu_t *emu, uintptr_t fcn) { vFfffffffffffffff_t fn = (vFfffffffffffffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16), *(float*)(R_RSP + 24), *(float*)(R_RSP + 32), *(float*)(R_RSP + 40), *(float*)(R_RSP + 48), *(float*)(R_RSP + 56)); }
 void pFppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFppppppppppppppp_t fn = (pFppppppppppppppp_t)fcn; R_RAX=(uintptr_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), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72)); }
+void iFpppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppppppppppp_t fn = (iFpppppppppppppppp_t)fcn; R_RAX=(int64_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), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80)); }
 void pFpppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpppppppppppppppp_t fn = (pFpppppppppppppppp_t)fcn; R_RAX=(uintptr_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), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80)); }
 void vFppuiiiiipuiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuiiiiipuiiiiiiii_t fn = (vFppuiiiiipuiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(uint64_t*)(R_RSP + 32), *(int64_t*)(R_RSP + 40), *(int64_t*)(R_RSP + 48), *(int64_t*)(R_RSP + 56), *(int64_t*)(R_RSP + 64), *(int64_t*)(R_RSP + 72), *(int64_t*)(R_RSP + 80), *(int64_t*)(R_RSP + 88), *(int64_t*)(R_RSP + 96)); }
 void pFipppppppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFipppppppppppppppppppppp_t fn = (pFipppppppppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((int64_t)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), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104), *(void**)(R_RSP + 112), *(void**)(R_RSP + 120), *(void**)(R_RSP + 128), *(void**)(R_RSP + 136)); }
@@ -3070,6 +3076,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppppL) return 1;
 	if (fun == &iFpppppp) return 1;
 	if (fun == &uFpippup) return 1;
+	if (fun == &uFpppppp) return 1;
 	if (fun == &UFpippup) return 1;
 	if (fun == &lFipLipu) return 1;
 	if (fun == &lFipLipp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 234ff1b0..19b5dece 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -532,6 +532,7 @@ void iFpppp(x64emu_t *emu, uintptr_t fnc);
 void IFEpIi(x64emu_t *emu, uintptr_t fnc);
 void IFppip(x64emu_t *emu, uintptr_t fnc);
 void IFSIii(x64emu_t *emu, uintptr_t fnc);
+void uFEpup(x64emu_t *emu, uintptr_t fnc);
 void uFifff(x64emu_t *emu, uintptr_t fnc);
 void uFuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFpipp(x64emu_t *emu, uintptr_t fnc);
@@ -883,6 +884,7 @@ void iFpppppi(x64emu_t *emu, uintptr_t fnc);
 void iFpppppL(x64emu_t *emu, uintptr_t fnc);
 void iFpppppp(x64emu_t *emu, uintptr_t fnc);
 void uFpippup(x64emu_t *emu, uintptr_t fnc);
+void uFpppppp(x64emu_t *emu, uintptr_t fnc);
 void UFpippup(x64emu_t *emu, uintptr_t fnc);
 void lFipLipu(x64emu_t *emu, uintptr_t fnc);
 void lFipLipp(x64emu_t *emu, uintptr_t fnc);
@@ -1161,6 +1163,7 @@ void vFuddiiddiiddiip(x64emu_t *emu, uintptr_t fnc);
 void vFuuiiiiuuiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFfffffffffffffff(x64emu_t *emu, uintptr_t fnc);
 void pFppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
+void iFpppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFppuiiiiipuiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void pFipppppppppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedcurl.c b/src/wrapped/wrappedcurl.c
new file mode 100755
index 00000000..9bb7867d
--- /dev/null
+++ b/src/wrapped/wrappedcurl.c
@@ -0,0 +1,562 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <dlfcn.h>
+
+#include "wrappedlibs.h"
+
+#include "wrapper.h"
+#include "bridge.h"
+#include "librarian.h"
+#include "librarian/library_private.h"
+#include "x64emu.h"
+#include "debug.h"
+#include "box64context.h"
+#include "emu/x64emu_private.h"
+#include "callback.h"
+
+const char* curlName = "libcurl.so.4";
+#define ALTNAME "libcurl-gnutls.so.4"
+#define LIBNAME curl
+
+static library_t* my_lib = NULL;
+
+typedef uint32_t (*uFpup_t)(void*, uint32_t, void*);
+typedef void (*vFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+
+#define SUPER() \
+    GO(curl_easy_setopt, uFpup_t)
+
+typedef struct curl_my_s {
+    // functions
+    #define GO(A, B)    B   A;
+    SUPER()
+    #undef GO
+} curl_my_t;
+
+void* getCurlMy(library_t* lib)
+{
+    curl_my_t* my = (curl_my_t*)calloc(1, sizeof(curl_my_t));
+    #define GO(A, W) my->A = (W)dlsym(lib->priv.w.lib, #A);
+    SUPER()
+    #undef GO
+
+    return my;
+}
+
+void freeCurlMy(void* lib)
+{
+//    curl_my_t *my = (curl_my_t *)lib;
+
+}
+#undef SUPER
+
+#define LONG          0
+#define OBJECTPOINT   10000
+#define STRINGPOINT   10000
+#define FUNCTIONPOINT 20000
+#define OFF_T         30000
+#define CINIT(name,type,number) CURLOPT_ ## name = type + number
+
+typedef enum {
+  CINIT(WRITEDATA, OBJECTPOINT, 1),
+  CINIT(URL, STRINGPOINT, 2),
+  CINIT(PORT, LONG, 3),
+  CINIT(PROXY, STRINGPOINT, 4),
+  CINIT(USERPWD, STRINGPOINT, 5),
+  CINIT(PROXYUSERPWD, STRINGPOINT, 6),
+  CINIT(RANGE, STRINGPOINT, 7),
+  CINIT(READDATA, OBJECTPOINT, 9),
+  CINIT(ERRORBUFFER, OBJECTPOINT, 10),
+  CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
+  CINIT(READFUNCTION, FUNCTIONPOINT, 12),
+  CINIT(TIMEOUT, LONG, 13),
+  CINIT(INFILESIZE, LONG, 14),
+  CINIT(POSTFIELDS, OBJECTPOINT, 15),
+  CINIT(REFERER, STRINGPOINT, 16),
+  CINIT(FTPPORT, STRINGPOINT, 17),
+  CINIT(USERAGENT, STRINGPOINT, 18),
+  CINIT(LOW_SPEED_LIMIT, LONG, 19),
+  CINIT(LOW_SPEED_TIME, LONG, 20),
+  CINIT(RESUME_FROM, LONG, 21),
+  CINIT(COOKIE, STRINGPOINT, 22),
+  CINIT(HTTPHEADER, OBJECTPOINT, 23),
+  CINIT(HTTPPOST, OBJECTPOINT, 24),
+  CINIT(SSLCERT, STRINGPOINT, 25),
+  CINIT(KEYPASSWD, STRINGPOINT, 26),
+  CINIT(CRLF, LONG, 27),
+  CINIT(QUOTE, OBJECTPOINT, 28),
+  CINIT(HEADERDATA, OBJECTPOINT, 29),
+  CINIT(COOKIEFILE, STRINGPOINT, 31),
+  CINIT(SSLVERSION, LONG, 32),
+  CINIT(TIMECONDITION, LONG, 33),
+  CINIT(TIMEVALUE, LONG, 34),
+  CINIT(CUSTOMREQUEST, STRINGPOINT, 36),
+  CINIT(STDERR, OBJECTPOINT, 37),
+  CINIT(POSTQUOTE, OBJECTPOINT, 39),
+  CINIT(OBSOLETE40, OBJECTPOINT, 40),
+  CINIT(VERBOSE, LONG, 41),
+  CINIT(HEADER, LONG, 42),
+  CINIT(NOPROGRESS, LONG, 43),
+  CINIT(NOBODY, LONG, 44),
+  CINIT(FAILONERROR, LONG, 45),
+  CINIT(UPLOAD, LONG, 46),
+  CINIT(POST, LONG, 47),
+  CINIT(DIRLISTONLY, LONG, 48),
+  CINIT(APPEND, LONG, 50),
+  CINIT(NETRC, LONG, 51),
+  CINIT(FOLLOWLOCATION, LONG, 52),
+  CINIT(TRANSFERTEXT, LONG, 53),
+  CINIT(PUT, LONG, 54),
+  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
+  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
+#define CURLOPT_XFERINFODATA CURLOPT_PROGRESSDATA
+  CINIT(AUTOREFERER, LONG, 58),
+  CINIT(PROXYPORT, LONG, 59),
+  CINIT(POSTFIELDSIZE, LONG, 60),
+  CINIT(HTTPPROXYTUNNEL, LONG, 61),
+  CINIT(INTERFACE, STRINGPOINT, 62),
+  CINIT(KRBLEVEL, STRINGPOINT, 63),
+  CINIT(SSL_VERIFYPEER, LONG, 64),
+  CINIT(CAINFO, STRINGPOINT, 65),
+  CINIT(MAXREDIRS, LONG, 68),
+  CINIT(FILETIME, LONG, 69),
+  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
+  CINIT(MAXCONNECTS, LONG, 71),
+  CINIT(OBSOLETE72, LONG, 72),
+  CINIT(FRESH_CONNECT, LONG, 74),
+  CINIT(FORBID_REUSE, LONG, 75),
+  CINIT(RANDOM_FILE, STRINGPOINT, 76),
+  CINIT(EGDSOCKET, STRINGPOINT, 77),
+  CINIT(CONNECTTIMEOUT, LONG, 78),
+  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
+  CINIT(HTTPGET, LONG, 80),
+  CINIT(SSL_VERIFYHOST, LONG, 81),
+  CINIT(COOKIEJAR, STRINGPOINT, 82),
+  CINIT(SSL_CIPHER_LIST, STRINGPOINT, 83),
+  CINIT(HTTP_VERSION, LONG, 84),
+  CINIT(FTP_USE_EPSV, LONG, 85),
+  CINIT(SSLCERTTYPE, STRINGPOINT, 86),
+  CINIT(SSLKEY, STRINGPOINT, 87),
+  CINIT(SSLKEYTYPE, STRINGPOINT, 88),
+  CINIT(SSLENGINE, STRINGPOINT, 89),
+  CINIT(SSLENGINE_DEFAULT, LONG, 90),
+  CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91),
+  CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
+  CINIT(PREQUOTE, OBJECTPOINT, 93),
+  CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
+  CINIT(DEBUGDATA, OBJECTPOINT, 95),
+  CINIT(COOKIESESSION, LONG, 96),
+  CINIT(CAPATH, STRINGPOINT, 97),
+  CINIT(BUFFERSIZE, LONG, 98),
+  CINIT(NOSIGNAL, LONG, 99),
+  CINIT(SHARE, OBJECTPOINT, 100),
+  CINIT(PROXYTYPE, LONG, 101),
+  CINIT(ACCEPT_ENCODING, STRINGPOINT, 102),
+  CINIT(PRIVATE, OBJECTPOINT, 103),
+  CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
+  CINIT(UNRESTRICTED_AUTH, LONG, 105),
+  CINIT(FTP_USE_EPRT, LONG, 106),
+  CINIT(HTTPAUTH, LONG, 107),
+  CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
+  CINIT(SSL_CTX_DATA, OBJECTPOINT, 109),
+  CINIT(FTP_CREATE_MISSING_DIRS, LONG, 110),
+  CINIT(PROXYAUTH, LONG, 111),
+  CINIT(FTP_RESPONSE_TIMEOUT, LONG, 112),
+#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
+  CINIT(IPRESOLVE, LONG, 113),
+  CINIT(MAXFILESIZE, LONG, 114),
+  CINIT(INFILESIZE_LARGE, OFF_T, 115),
+  CINIT(RESUME_FROM_LARGE, OFF_T, 116),
+  CINIT(MAXFILESIZE_LARGE, OFF_T, 117),
+  CINIT(NETRC_FILE, STRINGPOINT, 118),
+  CINIT(USE_SSL, LONG, 119),
+  CINIT(POSTFIELDSIZE_LARGE, OFF_T, 120),
+  CINIT(TCP_NODELAY, LONG, 121),
+  CINIT(FTPSSLAUTH, LONG, 129),
+  CINIT(IOCTLFUNCTION, FUNCTIONPOINT, 130),
+  CINIT(IOCTLDATA, OBJECTPOINT, 131),
+  CINIT(FTP_ACCOUNT, STRINGPOINT, 134),
+  CINIT(COOKIELIST, STRINGPOINT, 135),
+  CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
+  CINIT(FTP_SKIP_PASV_IP, LONG, 137),
+  CINIT(FTP_FILEMETHOD, LONG, 138),
+  CINIT(LOCALPORT, LONG, 139),
+  CINIT(LOCALPORTRANGE, LONG, 140),
+  CINIT(CONNECT_ONLY, LONG, 141),
+  CINIT(CONV_FROM_NETWORK_FUNCTION, FUNCTIONPOINT, 142),
+  CINIT(CONV_TO_NETWORK_FUNCTION, FUNCTIONPOINT, 143),
+  CINIT(CONV_FROM_UTF8_FUNCTION, FUNCTIONPOINT, 144),
+  CINIT(MAX_SEND_SPEED_LARGE, OFF_T, 145),
+  CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
+  CINIT(FTP_ALTERNATIVE_TO_USER, STRINGPOINT, 147),
+  CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
+  CINIT(SOCKOPTDATA, OBJECTPOINT, 149),
+  CINIT(SSL_SESSIONID_CACHE, LONG, 150),
+  CINIT(SSH_AUTH_TYPES, LONG, 151),
+  CINIT(SSH_PUBLIC_KEYFILE, STRINGPOINT, 152),
+  CINIT(SSH_PRIVATE_KEYFILE, STRINGPOINT, 153),
+  CINIT(FTP_SSL_CCC, LONG, 154),
+  CINIT(TIMEOUT_MS, LONG, 155),
+  CINIT(CONNECTTIMEOUT_MS, LONG, 156),
+  CINIT(HTTP_TRANSFER_DECODING, LONG, 157),
+  CINIT(HTTP_CONTENT_DECODING, LONG, 158),
+  CINIT(NEW_FILE_PERMS, LONG, 159),
+  CINIT(NEW_DIRECTORY_PERMS, LONG, 160),
+  CINIT(POSTREDIR, LONG, 161),
+  CINIT(SSH_HOST_PUBLIC_KEY_MD5, STRINGPOINT, 162),
+  CINIT(OPENSOCKETFUNCTION, FUNCTIONPOINT, 163),
+  CINIT(OPENSOCKETDATA, OBJECTPOINT, 164),
+  CINIT(COPYPOSTFIELDS, OBJECTPOINT, 165),
+  CINIT(PROXY_TRANSFER_MODE, LONG, 166),
+  CINIT(SEEKFUNCTION, FUNCTIONPOINT, 167),
+  CINIT(SEEKDATA, OBJECTPOINT, 168),
+  CINIT(CRLFILE, STRINGPOINT, 169),
+  CINIT(ISSUERCERT, STRINGPOINT, 170),
+  CINIT(ADDRESS_SCOPE, LONG, 171),
+  CINIT(CERTINFO, LONG, 172),
+  CINIT(USERNAME, STRINGPOINT, 173),
+  CINIT(PASSWORD, STRINGPOINT, 174),
+  CINIT(PROXYUSERNAME, STRINGPOINT, 175),
+  CINIT(PROXYPASSWORD, STRINGPOINT, 176),
+  CINIT(NOPROXY, STRINGPOINT, 177),
+  CINIT(TFTP_BLKSIZE, LONG, 178),
+  CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179),
+  CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
+  CINIT(PROTOCOLS, LONG, 181),
+  CINIT(REDIR_PROTOCOLS, LONG, 182),
+  CINIT(SSH_KNOWNHOSTS, STRINGPOINT, 183),
+  CINIT(SSH_KEYFUNCTION, FUNCTIONPOINT, 184),
+  CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
+  CINIT(MAIL_FROM, STRINGPOINT, 186),
+  CINIT(MAIL_RCPT, OBJECTPOINT, 187),
+  CINIT(FTP_USE_PRET, LONG, 188),
+  CINIT(RTSP_REQUEST, LONG, 189),
+  CINIT(RTSP_SESSION_ID, STRINGPOINT, 190),
+  CINIT(RTSP_STREAM_URI, STRINGPOINT, 191),
+  CINIT(RTSP_TRANSPORT, STRINGPOINT, 192),
+  CINIT(RTSP_CLIENT_CSEQ, LONG, 193),
+  CINIT(RTSP_SERVER_CSEQ, LONG, 194),
+  CINIT(INTERLEAVEDATA, OBJECTPOINT, 195),
+  CINIT(INTERLEAVEFUNCTION, FUNCTIONPOINT, 196),
+  CINIT(WILDCARDMATCH, LONG, 197),
+  CINIT(CHUNK_BGN_FUNCTION, FUNCTIONPOINT, 198),
+  CINIT(CHUNK_END_FUNCTION, FUNCTIONPOINT, 199),
+  CINIT(FNMATCH_FUNCTION, FUNCTIONPOINT, 200),
+  CINIT(CHUNK_DATA, OBJECTPOINT, 201),
+  CINIT(FNMATCH_DATA, OBJECTPOINT, 202),
+  CINIT(RESOLVE, OBJECTPOINT, 203),
+  CINIT(TLSAUTH_USERNAME, STRINGPOINT, 204),
+  CINIT(TLSAUTH_PASSWORD, STRINGPOINT, 205),
+  CINIT(TLSAUTH_TYPE, STRINGPOINT, 206),
+  CINIT(TRANSFER_ENCODING, LONG, 207),
+  CINIT(CLOSESOCKETFUNCTION, FUNCTIONPOINT, 208),
+  CINIT(CLOSESOCKETDATA, OBJECTPOINT, 209),
+  CINIT(GSSAPI_DELEGATION, LONG, 210),
+  CINIT(DNS_SERVERS, STRINGPOINT, 211),
+  CINIT(ACCEPTTIMEOUT_MS, LONG, 212),
+  CINIT(TCP_KEEPALIVE, LONG, 213),
+  CINIT(TCP_KEEPIDLE, LONG, 214),
+  CINIT(TCP_KEEPINTVL, LONG, 215),
+  CINIT(SSL_OPTIONS, LONG, 216),
+  CINIT(MAIL_AUTH, STRINGPOINT, 217),
+  CINIT(SASL_IR, LONG, 218),
+  CINIT(XFERINFOFUNCTION, FUNCTIONPOINT, 219),
+  CINIT(XOAUTH2_BEARER, STRINGPOINT, 220),
+  CINIT(DNS_INTERFACE, STRINGPOINT, 221),
+  CINIT(DNS_LOCAL_IP4, STRINGPOINT, 222),
+  CINIT(DNS_LOCAL_IP6, STRINGPOINT, 223),
+  CINIT(LOGIN_OPTIONS, STRINGPOINT, 224),
+  CINIT(SSL_ENABLE_NPN, LONG, 225),
+  CINIT(SSL_ENABLE_ALPN, LONG, 226),
+  CINIT(EXPECT_100_TIMEOUT_MS, LONG, 227),
+  CINIT(PROXYHEADER, OBJECTPOINT, 228),
+  CINIT(HEADEROPT, LONG, 229),
+  CINIT(PINNEDPUBLICKEY, STRINGPOINT, 230),
+  CINIT(UNIX_SOCKET_PATH, STRINGPOINT, 231),
+  CINIT(SSL_VERIFYSTATUS, LONG, 232),
+  CINIT(SSL_FALSESTART, LONG, 233),
+  CINIT(PATH_AS_IS, LONG, 234),
+  CINIT(PROXY_SERVICE_NAME, STRINGPOINT, 235),
+  CINIT(SERVICE_NAME, STRINGPOINT, 236),
+  CINIT(PIPEWAIT, LONG, 237),
+  CINIT(DEFAULT_PROTOCOL, STRINGPOINT, 238),
+  CINIT(STREAM_WEIGHT, LONG, 239),
+  CINIT(STREAM_DEPENDS, OBJECTPOINT, 240),
+  CINIT(STREAM_DEPENDS_E, OBJECTPOINT, 241),
+  CINIT(TFTP_NO_OPTIONS, LONG, 242),
+  CINIT(CONNECT_TO, OBJECTPOINT, 243),
+  CINIT(TCP_FASTOPEN, LONG, 244),
+  CINIT(KEEP_SENDING_ON_ERROR, LONG, 245),
+  CINIT(PROXY_CAINFO, STRINGPOINT, 246),
+  CINIT(PROXY_CAPATH, STRINGPOINT, 247),
+  CINIT(PROXY_SSL_VERIFYPEER, LONG, 248),
+  CINIT(PROXY_SSL_VERIFYHOST, LONG, 249),
+  CINIT(PROXY_SSLVERSION, LONG, 250),
+  CINIT(PROXY_TLSAUTH_USERNAME, STRINGPOINT, 251),
+  CINIT(PROXY_TLSAUTH_PASSWORD, STRINGPOINT, 252),
+  CINIT(PROXY_TLSAUTH_TYPE, STRINGPOINT, 253),
+  CINIT(PROXY_SSLCERT, STRINGPOINT, 254),
+  CINIT(PROXY_SSLCERTTYPE, STRINGPOINT, 255),
+  CINIT(PROXY_SSLKEY, STRINGPOINT, 256),
+  CINIT(PROXY_SSLKEYTYPE, STRINGPOINT, 257),
+  CINIT(PROXY_KEYPASSWD, STRINGPOINT, 258),
+  CINIT(PROXY_SSL_CIPHER_LIST, STRINGPOINT, 259),
+  CINIT(PROXY_CRLFILE, STRINGPOINT, 260),
+  CINIT(PROXY_SSL_OPTIONS, LONG, 261),
+  CINIT(PRE_PROXY, STRINGPOINT, 262),
+  CINIT(PROXY_PINNEDPUBLICKEY, STRINGPOINT, 263),
+  CINIT(ABSTRACT_UNIX_SOCKET, STRINGPOINT, 264),
+  CINIT(SUPPRESS_CONNECT_HEADERS, LONG, 265),
+  CINIT(REQUEST_TARGET, STRINGPOINT, 266),
+  CINIT(SOCKS5_AUTH, LONG, 267),
+  CINIT(SSH_COMPRESSION, LONG, 268),
+  CINIT(MIMEPOST, OBJECTPOINT, 269),
+  CINIT(TIMEVALUE_LARGE, OFF_T, 270),
+  CINIT(HAPPY_EYEBALLS_TIMEOUT_MS, LONG, 271),
+  CINIT(RESOLVER_START_FUNCTION, FUNCTIONPOINT, 272),
+  CINIT(RESOLVER_START_DATA, OBJECTPOINT, 273),
+  CINIT(HAPROXYPROTOCOL, LONG, 274),
+  CINIT(DNS_SHUFFLE_ADDRESSES, LONG, 275),
+  CINIT(TLS13_CIPHERS, STRINGPOINT, 276),
+  CINIT(PROXY_TLS13_CIPHERS, STRINGPOINT, 277),
+  CINIT(DISALLOW_USERNAME_IN_URL, LONG, 278),
+  CINIT(DOH_URL, STRINGPOINT, 279),
+  CINIT(UPLOAD_BUFFERSIZE, LONG, 280),
+  CINIT(UPKEEP_INTERVAL_MS, LONG, 281),
+  CINIT(CURLU, OBJECTPOINT, 282),
+  CINIT(TRAILERFUNCTION, FUNCTIONPOINT, 283),
+  CINIT(TRAILERDATA, OBJECTPOINT, 284),
+  CINIT(HTTP09_ALLOWED, LONG, 285),
+  CINIT(ALTSVC_CTRL, LONG, 286),
+  CINIT(ALTSVC, STRINGPOINT, 287),
+  CURLOPT_LASTENTRY /* the last unused */
+} CURLoption;
+#undef LONG
+#undef OBJECTPOINT
+#undef STRINGPOINT
+#undef FUNCTIONPOINT
+#undef OFF_T
+#undef CINIT
+
+#define SUPER() \
+    GO(0)   \
+    GO(1)   \
+    GO(2)   \
+    GO(3)
+
+// write
+#define GO(A)   \
+static uintptr_t my_write_fct_##A = 0;   \
+static size_t my_write_##A(char* ptr, size_t size, size_t nmemb, void* userdata)     \
+{                                       \
+    return (size_t)RunFunction(my_context, my_write_fct_##A, 4, ptr, size, nmemb, userdata);\
+}
+SUPER()
+#undef GO
+static void* find_write_Fct(void* fct)
+{
+    if(!fct) return NULL;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_write_fct_##A == (uintptr_t)fct) return my_write_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_write_fct_##A == 0) {my_write_fct_##A = (uintptr_t)fct; return my_write_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for curl write callback\n");
+    return NULL;
+}
+
+// read
+#define GO(A)   \
+static uintptr_t my_read_fct_##A = 0;   \
+static size_t my_read_##A(char* buffer, size_t size, size_t nitems, void* userdata)     \
+{                                       \
+    return (size_t)RunFunction(my_context, my_read_fct_##A, 4, buffer, size, nitems, userdata);\
+}
+SUPER()
+#undef GO
+static void* find_read_Fct(void* fct)
+{
+    if(!fct) return NULL;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_read_fct_##A == (uintptr_t)fct) return my_read_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_read_fct_##A == 0) {my_read_fct_##A = (uintptr_t)fct; return my_read_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for curl read callback\n");
+    return NULL;
+}
+
+// ioctl
+#define GO(A)   \
+static uintptr_t my_ioctl_fct_##A = 0;   \
+static size_t my_ioctl_##A(void* handle, int32_t fnc, void* userdata)     \
+{                                       \
+    return (size_t)RunFunction(my_context, my_ioctl_fct_##A, 3, handle, fnc, userdata);\
+}
+SUPER()
+#undef GO
+static void* find_ioctl_Fct(void* fct)
+{
+    if(!fct) return NULL;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_ioctl_fct_##A == (uintptr_t)fct) return my_ioctl_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_ioctl_fct_##A == 0) {my_ioctl_fct_##A = (uintptr_t)fct; return my_ioctl_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for curl ioctl callback\n");
+    return NULL;
+}
+
+// seek
+#define GO(A)   \
+static uintptr_t my_seek_fct_##A = 0;   \
+static int32_t my_seek_##A(void* userdata, int64_t off, int32_t origin)     \
+{                                       \
+    return (int32_t)RunFunction(my_context, my_seek_fct_##A, 4, userdata, (off&0xffffffff), ((off>>32)&0xffffffff), origin);\
+}
+SUPER()
+#undef GO
+static void* find_seek_Fct(void* fct)
+{
+    if(!fct) return NULL;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_seek_fct_##A == (uintptr_t)fct) return my_seek_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_seek_fct_##A == 0) {my_seek_fct_##A = (uintptr_t)fct; return my_seek_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for curl seek callback\n");
+    return NULL;
+}
+
+// header
+#define GO(A)   \
+static uintptr_t my_header_fct_##A = 0;   \
+static size_t my_header_##A(char* buffer, size_t size, size_t nitems, void* userdata)     \
+{                                       \
+    return (size_t)RunFunction(my_context, my_header_fct_##A, 4, buffer, size, nitems, userdata);\
+}
+SUPER()
+#undef GO
+static void* find_header_Fct(void* fct)
+{
+    if(!fct) return NULL;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_header_fct_##A == (uintptr_t)fct) return my_header_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_header_fct_##A == 0) {my_header_fct_##A = (uintptr_t)fct; return my_header_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for curl header callback\n");
+    return NULL;
+}
+
+// progress
+#define GO(A)   \
+static uintptr_t my_progress_fct_##A = 0;   \
+static int my_progress_##A(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)     \
+{                                       \
+    return (int)RunFunction(my_context, my_progress_fct_##A, 5, clientp, dltotal, dlnow, ultotal, ulnow);\
+}
+SUPER()
+#undef GO
+static void* find_progress_Fct(void* fct)
+{
+    if(!fct) return NULL;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_progress_fct_##A == (uintptr_t)fct) return my_progress_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_progress_fct_##A == 0) {my_progress_fct_##A = (uintptr_t)fct; return my_progress_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for curl progress callback\n");
+    return NULL;
+}
+
+#undef SUPER
+
+EXPORT uint32_t my_curl_easy_setopt(x64emu_t* emu, void* handle, uint32_t option, void* param)
+{
+    curl_my_t *my = (curl_my_t*)my_lib->priv.w.p2;
+
+    switch(option) {
+        case CURLOPT_WRITEDATA:
+            return my->curl_easy_setopt(handle, option, param);
+        case CURLOPT_WRITEFUNCTION:
+            return my->curl_easy_setopt(handle, option, find_write_Fct(param));
+        case CURLOPT_READDATA:
+            return my->curl_easy_setopt(handle, option, param);
+        case CURLOPT_READFUNCTION:
+            return my->curl_easy_setopt(handle, option, find_read_Fct(param));
+        case CURLOPT_IOCTLDATA:
+            return my->curl_easy_setopt(handle, option, param);
+        case CURLOPT_IOCTLFUNCTION:
+            return my->curl_easy_setopt(handle, option, find_ioctl_Fct(param));
+        case CURLOPT_SEEKDATA:
+            return my->curl_easy_setopt(handle, option, param);
+        case CURLOPT_SEEKFUNCTION:
+            return my->curl_easy_setopt(handle, option, find_seek_Fct(param));
+        case CURLOPT_HEADERDATA:
+            return my->curl_easy_setopt(handle, option, param);
+        case CURLOPT_HEADERFUNCTION:
+            return my->curl_easy_setopt(handle, option, find_header_Fct(param));
+        case CURLOPT_PROGRESSDATA:
+            return my->curl_easy_setopt(handle, option, param);
+        case CURLOPT_PROGRESSFUNCTION:
+            return my->curl_easy_setopt(handle, option, find_progress_Fct(param));
+        case CURLOPT_SOCKOPTFUNCTION:
+        case CURLOPT_SOCKOPTDATA:
+        case CURLOPT_OPENSOCKETFUNCTION:
+        case CURLOPT_OPENSOCKETDATA:
+        case CURLOPT_CLOSESOCKETFUNCTION:
+        case CURLOPT_CLOSESOCKETDATA:
+        case CURLOPT_XFERINFOFUNCTION:
+        //case CURLOPT_XFERINFODATA:
+        case CURLOPT_DEBUGFUNCTION:
+        case CURLOPT_DEBUGDATA:
+        case CURLOPT_SSL_CTX_FUNCTION:
+        case CURLOPT_SSL_CTX_DATA:
+        case CURLOPT_CONV_TO_NETWORK_FUNCTION:
+        case CURLOPT_CONV_FROM_NETWORK_FUNCTION:
+        case CURLOPT_CONV_FROM_UTF8_FUNCTION:
+        case CURLOPT_INTERLEAVEFUNCTION:
+        case CURLOPT_INTERLEAVEDATA:
+        case CURLOPT_CHUNK_BGN_FUNCTION:
+        case CURLOPT_CHUNK_END_FUNCTION:
+        case CURLOPT_CHUNK_DATA:
+        case CURLOPT_FNMATCH_FUNCTION:
+        case CURLOPT_FNMATCH_DATA:
+        case CURLOPT_SUPPRESS_CONNECT_HEADERS:
+        case CURLOPT_RESOLVER_START_FUNCTION:
+        case CURLOPT_RESOLVER_START_DATA:
+            printf_log(LOG_NONE, "Error: unimplemented option %u in curl_easy_setopt\n", option);
+            return 48; //unknown option...
+        default:
+            return my->curl_easy_setopt(handle, option, param);
+    }
+}
+
+
+#define CUSTOM_INIT \
+    lib->priv.w.p2 = getCurlMy(lib);    \
+    my_lib = lib;
+
+#define CUSTOM_FINI \
+    freeCurlMy(lib->priv.w.p2); \
+    free(lib->priv.w.p2);       \
+    my_lib = NULL;
+
+#include "wrappedlib_init.h"
+
diff --git a/src/wrapped/wrappedcurl_private.h b/src/wrapped/wrappedcurl_private.h
new file mode 100755
index 00000000..8412a412
--- /dev/null
+++ b/src/wrapped/wrappedcurl_private.h
@@ -0,0 +1,78 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh....
+#endif
+
+GO(curl_easy_cleanup, vFp)
+GO(curl_easy_duphandle, pFp)
+GO(curl_easy_escape, pFppi)
+GO(curl_easy_getinfo, uFpppppp) //vararg
+GO(curl_easy_init, pFv)
+//GO(curl_easy_pause, 
+GO(curl_easy_perform, uFp)
+//GO(curl_easy_recv, 
+GO(curl_easy_reset, vFp)
+//GO(curl_easy_send, 
+GOM(curl_easy_setopt, uFEpup)   // can set many callbacks!
+GO(curl_easy_strerror, pFu)
+//GO(curl_easy_unescape, 
+//GO(curl_escape, 
+GO(curl_formadd, iFpppppppppppppppp)    // there is a vararg here. Should GOM and use CURLFORM_ARRAY instead
+GO(curl_formfree, vFp)
+//GO(curl_formget, 
+GO(curl_free, vFp)
+//GO(curl_getdate, 
+//GO(curl_getenv, 
+GO(curl_global_cleanup, vFv)
+GO(curl_global_init, uFu)
+//GO(curl_global_init_mem, 
+//GO(curl_global_sslset, 
+//GO(curl_maprintf, 
+//GO(curl_mfprintf, 
+//GO(curl_mime_addpart, 
+//GO(curl_mime_data, 
+//GO(curl_mime_data_cb, 
+//GO(curl_mime_encoder, 
+//GO(curl_mime_filedata, 
+//GO(curl_mime_filename, 
+//GO(curl_mime_free, 
+//GO(curl_mime_headers, 
+//GO(curl_mime_init, 
+//GO(curl_mime_name, 
+//GO(curl_mime_subparts, 
+//GO(curl_mime_type, 
+//GO(curl_mprintf, 
+//GO(curl_msnprintf, 
+//GO(curl_msprintf, 
+GO(curl_multi_add_handle, uFpp)
+//GO(curl_multi_assign, 
+GO(curl_multi_cleanup, uFp)
+GO(curl_multi_fdset, uFppppp)
+GO(curl_multi_info_read, pFpp)
+GO(curl_multi_init, pFv)
+GO(curl_multi_perform, uFpp)
+GO(curl_multi_remove_handle, uFpp)
+//GO(curl_multi_setopt, 
+//GO(curl_multi_socket, 
+//GO(curl_multi_socket_action, 
+//GO(curl_multi_socket_all, 
+GO(curl_multi_strerror, pFi)
+//GO(curl_multi_timeout, 
+//GO(curl_multi_wait, 
+//GO(curl_mvaprintf, 
+//GO(curl_mvfprintf, 
+//GO(curl_mvprintf, 
+//GO(curl_mvsnprintf, 
+//GO(curl_mvsprintf, 
+//GO(curl_pushheader_byname, 
+//GO(curl_pushheader_bynum, 
+//GO(curl_share_cleanup, 
+//GO(curl_share_init, 
+//GO(curl_share_setopt, 
+//GO(curl_share_strerror, 
+GO(curl_slist_append, pFpp)
+GO(curl_slist_free_all, vFp)
+//GO(curl_strequal, 
+//GO(curl_strnequal, 
+//GO(curl_unescape, 
+GO(curl_version, pFv)
+GO(curl_version_info, pFi)