From 5399d490f74045133a0aeb1bd619c5fee8221c8a Mon Sep 17 00:00:00 2001 From: midipix Date: Jul 21 2016 07:47:27 +0000 Subject: threaded loop, debug threads: fix linkage of entry points (for i686/nt32). --- diff --git a/src/console/ptyc_console_alloc.c b/src/console/ptyc_console_alloc.c index 16fb139..b1fee77 100644 --- a/src/console/ptyc_console_alloc.c +++ b/src/console/ptyc_console_alloc.c @@ -13,16 +13,16 @@ #include "ptycon_driver_impl.h" #include "ptycon_status_impl.h" -int ptyc_console_ctrl(uint32_t); +int __stdcall ptyc_console_ctrl(uint32_t); -int ptyc_console_reader(void *); -int ptyc_console_writer(void *);; -int ptyc_console_poller(void *); +int __stdcall ptyc_console_reader(void *); +int __stdcall ptyc_console_writer(void *);; +int __stdcall ptyc_console_poller(void *); -int ptyc_dbg_cat(struct ptyc_driver_ctx *); -int ptyc_dbg_event(void *); -int ptyc_dbg_oven(void *); -int ptyc_dbg_raw(void *); +int __stdcall ptyc_dbg_cat(struct ptyc_driver_ctx *); +int __stdcall ptyc_dbg_event(void *); +int __stdcall ptyc_dbg_oven(void *); +int __stdcall ptyc_dbg_raw(void *); struct ptyc_loop_thread_ctx { diff --git a/src/console/ptyc_console_ctrl.c b/src/console/ptyc_console_ctrl.c index d20ef12..68e1da7 100644 --- a/src/console/ptyc_console_ctrl.c +++ b/src/console/ptyc_console_ctrl.c @@ -12,7 +12,7 @@ #include #include "ptycon_driver_impl.h" -int ptyc_console_ctrl(uint32_t type) +int __stdcall ptyc_console_ctrl(uint32_t type) { return type; } diff --git a/src/console/ptyc_console_poller.c b/src/console/ptyc_console_poller.c index 60e3d8b..1c029cb 100644 --- a/src/console/ptyc_console_poller.c +++ b/src/console/ptyc_console_poller.c @@ -12,7 +12,7 @@ #include #include "ptycon_driver_impl.h" -int ptyc_console_poller(struct ptyc_driver_ctx_impl * ictx) +int __stdcall ptyc_console_poller(struct ptyc_driver_ctx_impl * ictx) { (void)ictx; return ntapi->tt_wait_for_dummy_event(); diff --git a/src/console/ptyc_console_reader.c b/src/console/ptyc_console_reader.c index 0ce4900..75547b5 100644 --- a/src/console/ptyc_console_reader.c +++ b/src/console/ptyc_console_reader.c @@ -114,7 +114,7 @@ static size_t ptyc_translate_event( return 0; } -int ptyc_console_reader(struct ptyc_driver_ctx_impl * ictx) +int __stdcall ptyc_console_reader(struct ptyc_driver_ctx_impl * ictx) { int32_t status; void * hwait; diff --git a/src/console/ptyc_console_writer.c b/src/console/ptyc_console_writer.c index 046e675..63384c0 100644 --- a/src/console/ptyc_console_writer.c +++ b/src/console/ptyc_console_writer.c @@ -16,7 +16,7 @@ static ptyc_term_handler ptyc_screen_handler; static ptyc_term_handler ptyc_ctrl_handler; static ptyc_term_handler ptyc_flush_screen_buffer; -int ptyc_console_writer(struct ptyc_driver_ctx_impl * ictx) +int __stdcall ptyc_console_writer(struct ptyc_driver_ctx_impl * ictx) { int32_t status; nt_iosb iosb; diff --git a/src/debug/ptyc_dbg_cat.c b/src/debug/ptyc_dbg_cat.c index 4e5e63b..9cb54f6 100644 --- a/src/debug/ptyc_dbg_cat.c +++ b/src/debug/ptyc_dbg_cat.c @@ -125,7 +125,7 @@ static int32_t ptyc_cat( : status; } -int ptyc_dbg_cat(struct ptyc_driver_ctx * dctx) +int __stdcall ptyc_dbg_cat(struct ptyc_driver_ctx * dctx) { int32_t status; void * hevent; diff --git a/src/debug/ptyc_dbg_event.c b/src/debug/ptyc_dbg_event.c index 1398408..2577389 100644 --- a/src/debug/ptyc_dbg_event.c +++ b/src/debug/ptyc_dbg_event.c @@ -92,7 +92,7 @@ static int ptyc_dbg_input_record(void * hout, nt_input_record * rec) } -int ptyc_dbg_event(struct ptyc_driver_ctx_impl * ictx) +int __stdcall ptyc_dbg_event(struct ptyc_driver_ctx_impl * ictx) { nt_input_record conevt[64]; uint32_t nread; diff --git a/src/debug/ptyc_dbg_oven.c b/src/debug/ptyc_dbg_oven.c index 393076d..7357f57 100644 --- a/src/debug/ptyc_dbg_oven.c +++ b/src/debug/ptyc_dbg_oven.c @@ -12,7 +12,7 @@ #include #include "ptycon_driver_impl.h" -int ptyc_dbg_oven(struct ptyc_driver_ctx_impl * ictx) +int __stdcall ptyc_dbg_oven(struct ptyc_driver_ctx_impl * ictx) { (void)ictx; return ntapi->tt_wait_for_dummy_event(); diff --git a/src/debug/ptyc_dbg_raw.c b/src/debug/ptyc_dbg_raw.c index 8804ca6..0e5814f 100644 --- a/src/debug/ptyc_dbg_raw.c +++ b/src/debug/ptyc_dbg_raw.c @@ -12,7 +12,7 @@ #include #include "ptycon_driver_impl.h" -int ptyc_dbg_raw(struct ptyc_driver_ctx_impl * ictx) +int __stdcall ptyc_dbg_raw(struct ptyc_driver_ctx_impl * ictx) { (void)ictx; return ntapi->tt_wait_for_dummy_event();