Added wrapping of libformw.so.6 (for #956)

8 files changed, 138 insertions, 0 deletions

diff --git a/src/library_list.h b/src/library_list.h
index 9770518c..9713469e 100644
--- a/src/library_list.h
+++ b/src/library_list.h
@@ -163,6 +163,7 @@ GO("libncursesw.so.5", libncursesw)
 GO("libncursesw.so.6", libncursesw6)
 GO("libform.so.5", libform)
 GO("libformw.so.5", libformw)
+GO("libformw.so.6", libformw6)
 GO("libncurses.so.5", libncurses)
 GO("libtinfo.so.5", libtinfo)
 GO("libpanel.so.5", libpanel)
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index dadbd5a3..8f8dc38b 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -4013,6 +4013,7 @@ wrappedlibegl:
   - eglGetProcAddress
 wrappedlibform:
 wrappedlibformw:
+wrappedlibformw6:
 wrappedlibfuse:
 - iFpp:
   - fuse_reply_entry
diff --git a/src/wrapped/generated/wrappedlibformw6defs.h b/src/wrapped/generated/wrappedlibformw6defs.h
new file mode 100644
index 00000000..0b37212a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformw6defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.2.0.18) *
+ *******************************************************************/
+#ifndef __wrappedlibformw6DEFS_H_
+#define __wrappedlibformw6DEFS_H_
+
+
+#endif // __wrappedlibformw6DEFS_H_
diff --git a/src/wrapped/generated/wrappedlibformw6types.h b/src/wrapped/generated/wrappedlibformw6types.h
new file mode 100644
index 00000000..6ffdcc57
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformw6types.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.2.0.18) *
+ *******************************************************************/
+#ifndef __wrappedlibformw6TYPES_H_
+#define __wrappedlibformw6TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibformw6TYPES_H_
diff --git a/src/wrapped/generated/wrappedlibformw6undefs.h b/src/wrapped/generated/wrappedlibformw6undefs.h
new file mode 100644
index 00000000..f5a56aeb
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformw6undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.2.0.18) *
+ *******************************************************************/
+#ifndef __wrappedlibformw6UNDEFS_H_
+#define __wrappedlibformw6UNDEFS_H_
+
+
+#endif // __wrappedlibformw6UNDEFS_H_
diff --git a/src/wrapped/wrappedlibformw.c b/src/wrapped/wrappedlibformw.c
index b06620c9..686aacdf 100644
--- a/src/wrapped/wrappedlibformw.c
+++ b/src/wrapped/wrappedlibformw.c
@@ -14,4 +14,7 @@
 const char* libformwName = "libformw.so.5";
 #define LIBNAME libformw
 
+#define CUSTOM_INIT \
+    SETALT(myw_);   \
+
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibformw6.c b/src/wrapped/wrappedlibformw6.c
new file mode 100644
index 00000000..92e80699
--- /dev/null
+++ b/src/wrapped/wrappedlibformw6.c
@@ -0,0 +1,20 @@
+#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/library_private.h"
+#include "x64emu.h"
+
+const char* libformw6Name = "libformw.so.6";
+#define LIBNAME libformw6
+
+#define CUSTOM_INIT \
+    SETALT(my6_);   \
+
+#include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibformw6_private.h b/src/wrapped/wrappedlibformw6_private.h
new file mode 100644
index 00000000..d204dffc
--- /dev/null
+++ b/src/wrapped/wrappedlibformw6_private.h
@@ -0,0 +1,80 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh....
+#endif
+
+//GOM(new_fieldtype, pFPP)
+GO(link_fieldtype, pFpp)
+GO(free_fieldtype, iFp)
+//GOM(set_fieldtype_arg, iFpPPP)
+//GOM(set_fieldtype_choice, iFpPP)
+GO(new_field, pFiiiiii)
+GO(dup_field, pFpii)
+GO(link_field, pFpii)
+GO(free_field, iFp)
+GO(field_info, iFppppppp)
+GO(dynamic_field_info, iFpppp)
+GO(set_max_field, iFpi)
+GO(move_field, iFpii)
+//GO(set_field_type, iFpp,...)
+GO(set_new_page, iFpi)
+GO(set_field_just, iFpi)
+GO(field_just, iFp)
+GO(set_field_fore, iFpL)
+GO(set_field_back, iFpL)
+GO(set_field_pad, iFpi)
+GO(field_pad, iFp)
+GO(set_field_buffer, iFpip)
+GO(set_field_status, iFpi)
+GO(set_field_userptr, iFpp)
+GO(set_field_opts, iFpi)
+GO(field_opts_on, iFpi)
+GO(field_opts_off, iFpi)
+GO(field_fore, LFp)
+GO(field_back, LFp)
+GO(new_page, iFp)
+GO(field_status, iFp)
+GO(field_arg, pFp)
+GO(field_userptr, pFp)
+GO(field_type, pFp)
+GO(field_buffer, pFpi)
+GO(field_opts, iFp)
+GO(new_form, pFp)
+GO(form_fields, pFp)
+GO(current_field, pFp)
+GO(form_win, pFp)
+GO(form_sub, pFp)
+//GOM(form_init, PFp)
+//GOM(form_term, PFp)
+//GOM(field_init, PFp)
+//GOM(field_term, PFp)
+GO(free_form, iFp)
+GO(set_form_fields, iFpp)
+GO(field_count, iFp)
+GO(set_form_win, iFpp)
+GO(set_form_sub, iFpp)
+GO(set_current_field, iFpp)
+GO(unfocus_current_field, iFp)
+GO(field_index, iFp)
+GO(set_form_page, iFpi)
+GO(form_page, iFp)
+GO(scale_form, iFppp)
+//GOM(set_form_init, iFpP)
+//GOM(set_form_term, iFpP)
+//GOM(set_field_init, iFpP)
+//GOM(set_field_term, iFpP)
+GO(post_form, iFp)
+GO(unpost_form, iFp)
+GO(pos_form_cursor, iFp)
+GO(form_driver, iFpi)
+GO(form_driver_w, iFpiu)
+GO(set_form_userptr, iFpp)
+GO(set_form_opts, iFpi)
+GO(form_opts_on, iFpi)
+GO(form_opts_off, iFpi)
+GO(form_request_by_name, iFp)
+GO(form_request_name, pFi)
+GO(form_userptr, pFp)
+GO(form_opts, iFp)
+GO(data_ahead, iFp)
+GO(data_behind, iFp)
+GO(new_form_sp, pFpp)