Some fixes to ncurses / tinfo wrapped lib (for dialog shell helper, used in some installer)

6 files changed, 8 insertions, 4 deletions

diff --git a/src/wrapped/wrappedlibncurses.c b/src/wrapped/wrappedlibncurses.c
index d602cf16..ffca6188 100644
--- a/src/wrapped/wrappedlibncurses.c
+++ b/src/wrapped/wrappedlibncurses.c
@@ -83,6 +83,7 @@ EXPORT int my_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* my_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibncurses6.c b/src/wrapped/wrappedlibncurses6.c
index 1880a267..055aa995 100644
--- a/src/wrapped/wrappedlibncurses6.c
+++ b/src/wrapped/wrappedlibncurses6.c
@@ -82,6 +82,7 @@ EXPORT int my6_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* my6_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibncursesw.c b/src/wrapped/wrappedlibncursesw.c
index 26eec25e..2dba363e 100644
--- a/src/wrapped/wrappedlibncursesw.c
+++ b/src/wrapped/wrappedlibncursesw.c
@@ -73,6 +73,7 @@ EXPORT int myw_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* myw_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibncursesw6.c b/src/wrapped/wrappedlibncursesw6.c
index c2837432..787b19f3 100644
--- a/src/wrapped/wrappedlibncursesw6.c
+++ b/src/wrapped/wrappedlibncursesw6.c
@@ -73,6 +73,7 @@ EXPORT int myw6_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* myw6_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibtinfo6_private.h b/src/wrapped/wrappedlibtinfo6_private.h
index 41ec64ff..1c1bfbe5 100644
--- a/src/wrapped/wrappedlibtinfo6_private.h
+++ b/src/wrapped/wrappedlibtinfo6_private.h
@@ -151,9 +151,9 @@ DATA(TABSIZE, sizeof(int))
 DATA(curscr, sizeof(void*))
 DATA(newscr, sizeof(void*))
 DATA(stdscr, sizeof(void*))
-DATA(acs_map, 128*sizeof(void*))
+DATA(acs_map, 64*sizeof(void*))
 DATA(UP, sizeof(void*))
 DATA(BC, sizeof(void*))
 DATA(PC, 1)
 DATA(ospeed, 2)
-DATA(ttytype, sizeof(void*))
+DATA(ttytype, 32*sizeof(void*))
diff --git a/src/wrapped/wrappedlibtinfo_private.h b/src/wrapped/wrappedlibtinfo_private.h
index 41ec64ff..1c1bfbe5 100644
--- a/src/wrapped/wrappedlibtinfo_private.h
+++ b/src/wrapped/wrappedlibtinfo_private.h
@@ -151,9 +151,9 @@ DATA(TABSIZE, sizeof(int))
 DATA(curscr, sizeof(void*))
 DATA(newscr, sizeof(void*))
 DATA(stdscr, sizeof(void*))
-DATA(acs_map, 128*sizeof(void*))
+DATA(acs_map, 64*sizeof(void*))
 DATA(UP, sizeof(void*))
 DATA(BC, sizeof(void*))
 DATA(PC, 1)
 DATA(ospeed, 2)
-DATA(ttytype, sizeof(void*))
+DATA(ttytype, 32*sizeof(void*))