diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedlibncurses6types.h | 2 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedlibncurseswtypes.h | 2 | ||||
| -rwxr-xr-x | src/wrapped/wrappedlibncurses.c | 7 | ||||
| -rwxr-xr-x | src/wrapped/wrappedlibncurses6.c | 7 | ||||
| -rwxr-xr-x | src/wrapped/wrappedlibncurses6_private.h | 2 | ||||
| -rwxr-xr-x | src/wrapped/wrappedlibncursesw_private.h | 2 |
7 files changed, 24 insertions, 2 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 8dbc8cf4..a1bfb3cc 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -3182,6 +3182,8 @@ wrappedlibncurses6: - initscr - iFpV: - printw +- iFppV: + - wprintw - iFppA: - vwprintw - iFiipV: @@ -3193,6 +3195,8 @@ wrappedlibncursesw: - initscr - iFpV: - printw +- iFppV: + - wprintw - iFppA: - vwprintw - iFiipV: diff --git a/src/wrapped/generated/wrappedlibncurses6types.h b/src/wrapped/generated/wrappedlibncurses6types.h index 429af48e..d0b3ad2a 100644 --- a/src/wrapped/generated/wrappedlibncurses6types.h +++ b/src/wrapped/generated/wrappedlibncurses6types.h @@ -13,6 +13,7 @@ typedef void* (*pFv_t)(void); typedef int64_t (*iFpV_t)(void*, ...); +typedef int64_t (*iFppV_t)(void*, void*, ...); typedef int64_t (*iFppA_t)(void*, void*, va_list); typedef int64_t (*iFiipV_t)(int64_t, int64_t, void*, ...); typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...); @@ -20,6 +21,7 @@ typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...); #define SUPER() ADDED_FUNCTIONS() \ GO(initscr, pFv_t) \ GO(printw, iFpV_t) \ + GO(wprintw, iFppV_t) \ GO(vwprintw, iFppA_t) \ GO(mvprintw, iFiipV_t) \ GO(mvwprintw, iFpiipV_t) diff --git a/src/wrapped/generated/wrappedlibncurseswtypes.h b/src/wrapped/generated/wrappedlibncurseswtypes.h index 68e44fae..b18470ca 100644 --- a/src/wrapped/generated/wrappedlibncurseswtypes.h +++ b/src/wrapped/generated/wrappedlibncurseswtypes.h @@ -13,6 +13,7 @@ typedef void* (*pFv_t)(void); typedef int64_t (*iFpV_t)(void*, ...); +typedef int64_t (*iFppV_t)(void*, void*, ...); typedef int64_t (*iFppA_t)(void*, void*, va_list); typedef int64_t (*iFiipV_t)(int64_t, int64_t, void*, ...); typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...); @@ -20,6 +21,7 @@ typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...); #define SUPER() ADDED_FUNCTIONS() \ GO(initscr, pFv_t) \ GO(printw, iFpV_t) \ + GO(wprintw, iFppV_t) \ GO(vwprintw, iFppA_t) \ GO(mvprintw, iFiipV_t) \ GO(mvwprintw, iFpiipV_t) diff --git a/src/wrapped/wrappedlibncurses.c b/src/wrapped/wrappedlibncurses.c index defcd98c..bd20f906 100755 --- a/src/wrapped/wrappedlibncurses.c +++ b/src/wrapped/wrappedlibncurses.c @@ -49,6 +49,13 @@ EXPORT int my_printw(x64emu_t* emu, void* fmt, void* b) return my->vwprintw(my->stdscr, fmt, VARARGS); } +EXPORT int my_wprintw(x64emu_t* emu, void* win, void* fmt, void* b) +{ + myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 2); + PREPARE_VALIST; + return my->vwprintw(win, fmt, VARARGS); +} + EXPORT int my_vwprintw(x64emu_t* emu, void* p, void* fmt, x64_va_list_t b) { #ifdef CONVERT_VALIST diff --git a/src/wrapped/wrappedlibncurses6.c b/src/wrapped/wrappedlibncurses6.c index 8193ec2d..4fe26c72 100755 --- a/src/wrapped/wrappedlibncurses6.c +++ b/src/wrapped/wrappedlibncurses6.c @@ -49,6 +49,13 @@ EXPORT int my6_printw(x64emu_t* emu, void* fmt, void* b) return my->vwprintw(my->stdscr, fmt, VARARGS); } +EXPORT int my6_wprintw(x64emu_t* emu, void* win, void* fmt, void* b) +{ + myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 2); + PREPARE_VALIST; + return my->vwprintw(win, fmt, VARARGS); +} + EXPORT int my6_vwprintw(x64emu_t* emu, void* p, void* fmt, x64_va_list_t b) { #ifdef CONVERT_VALIST diff --git a/src/wrapped/wrappedlibncurses6_private.h b/src/wrapped/wrappedlibncurses6_private.h index ef182ab4..b7153d29 100755 --- a/src/wrapped/wrappedlibncurses6_private.h +++ b/src/wrapped/wrappedlibncurses6_private.h @@ -453,7 +453,7 @@ GO(winwstr, iFpp) GO(wmouse_trafo, iFpppi) GO(wmove, iFpii) GO(wnoutrefresh, iFp) -//GO(wprintw, iFppV) +GOM(wprintw, iFEppV) GO(wredrawln, iFpii) GO(wrefresh, iFp) GO(wresize, iFpii) diff --git a/src/wrapped/wrappedlibncursesw_private.h b/src/wrapped/wrappedlibncursesw_private.h index ef182ab4..b7153d29 100755 --- a/src/wrapped/wrappedlibncursesw_private.h +++ b/src/wrapped/wrappedlibncursesw_private.h @@ -453,7 +453,7 @@ GO(winwstr, iFpp) GO(wmouse_trafo, iFpppi) GO(wmove, iFpii) GO(wnoutrefresh, iFp) -//GO(wprintw, iFppV) +GOM(wprintw, iFEppV) GO(wredrawln, iFpii) GO(wrefresh, iFp) GO(wresize, iFpii) |