From: Ralf Habacker <ralf.habacker@freenet.de> --- server/async.c | 7 +- server/atom.c | 7 +- server/change.c | 7 +- server/clipboard.c | 3 +- server/completion.c | 5 +- server/console.c | 7 +- server/d3dkmt.c | 9 +- server/debug.h | 4 +- server/debugger.c | 5 +- server/device.c | 7 +- server/event.c | 3 +- server/fd.c | 25 +- server/file.c | 3 +- server/handle.c | 5 +- server/hook.c | 3 +- server/inproc_sync.c | 7 +- server/mach.c | 5 +- server/mailslot.c | 7 +- server/main.c | 5 +- server/mapping.c | 7 +- server/mutex.c | 3 +- server/named_pipe.c | 9 +- server/object.c | 5 +- server/process.c | 11 +- server/ptrace.c | 11 +- server/queue.c | 7 +- server/registry.c | 23 +- server/request.c | 34 +- server/request.h | 2 - server/request_trace.h | 2002 ++++++++++++++++++++-------------------- server/semaphore.c | 3 +- server/serial.c | 3 +- server/signal.c | 9 +- server/sock.c | 45 +- server/thread.c | 19 +- server/timer.c | 3 +- server/token.c | 3 +- server/trace.c | 419 ++++----- server/unicode.c | 5 +- server/window.c | 3 +- server/winstation.c | 5 +- tools/make_requests | 4 +- 42 files changed, 1392 insertions(+), 1367 deletions(-) diff --git a/server/async.c b/server/async.c index 907d5f53346..716df35fbe6 100644 --- a/server/async.c +++ b/server/async.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdarg.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -74,7 +75,7 @@ static void async_cancel_dump( struct object *obj, int verbose ) { struct async_cancel *cancel = (struct async_cancel *)obj; assert( obj->ops == &async_cancel_ops ); - fprintf( stderr, "async_cancel %p\n", cancel ); + TRACE( "async_cancel %p\n", cancel ); } static struct object *async_cancel_get_sync( struct object *obj ) @@ -180,7 +181,7 @@ static void async_dump( struct object *obj, int verbose ) { struct async *async = (struct async *)obj; assert( obj->ops == &async_ops ); - fprintf( stderr, "Async thread=%p\n", async->thread ); + TRACE( "Async thread=%p\n", async->thread ); } static int async_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -848,7 +849,7 @@ static const struct object_ops iosb_ops = static void iosb_dump( struct object *obj, int verbose ) { assert( obj->ops == &iosb_ops ); - fprintf( stderr, "I/O status block\n" ); + TRACE( "I/O status block\n" ); } static void iosb_destroy( struct object *obj ) diff --git a/server/atom.c b/server/atom.c index 307634124f5..a65d34116f1 100644 --- a/server/atom.c +++ b/server/atom.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <string.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS @@ -225,16 +226,16 @@ static void atom_table_dump( struct object *obj, int verbose ) struct atom_table *table = (struct atom_table *)obj; assert( obj->ops == &atom_table_ops ); - fprintf( stderr, "Atom table size=%d\n", table->count ); + TRACE( "Atom table size=%d\n", table->count ); if (!verbose) return; for (i = 0; i < table->count; i++) { struct atom_entry *entry = table->atoms[i]; if (!entry) continue; - fprintf( stderr, " %04x: ref=%d hash=%d \"", + TRACE( " %04x: ref=%d hash=%d \"", entry->atom, entry->count, entry->hash ); dump_strW( entry->str, entry->len, stderr, "\"\""); - fprintf( stderr, "\"\n" ); + TRACE( "\"\n" ); } } diff --git a/server/change.c b/server/change.c index 5bcd0676e0d..723687e2931 100644 --- a/server/change.c +++ b/server/change.c @@ -37,6 +37,7 @@ #include <sys/inotify.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -288,7 +289,7 @@ static void dir_dump( struct object *obj, int verbose ) { struct dir *dir = (struct dir *)obj; assert( obj->ops == &dir_ops ); - fprintf( stderr, "Dirfile fd=%p filter=%08x\n", dir->fd, dir->filter ); + TRACE( "Dirfile fd=%p filter=%08x\n", dir->fd, dir->filter ); } /* enter here directly from SIGIO signal handler */ @@ -845,7 +846,7 @@ static void inotify_notify_all( struct inotify_event *ie ) inode = inode_from_wd( ie->wd ); if (!inode) { - fprintf( stderr, "no inode matches %d\n", ie->wd); + TRACE( "no inode matches %d\n", ie->wd); return; } @@ -905,7 +906,7 @@ static void inotify_poll_event( struct fd *fd, int event ) r = read( unix_fd, buffer, sizeof buffer ); if (r < 0) { - fprintf(stderr,"inotify_poll_event(): inotify read failed!\n"); + TRACE("inotify_poll_event(): inotify read failed!\n"); return; } diff --git a/server/clipboard.c b/server/clipboard.c index 59a50354b48..397f341de50 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <string.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "request.h" @@ -143,7 +144,7 @@ static void clipboard_dump( struct object *obj, int verbose ) { struct clipboard *clipboard = (struct clipboard *)obj; - fprintf( stderr, "Clipboard open_thread=%p open_win=%08x owner=%08x viewer=%08x seq=%u\n", + TRACE( "Clipboard open_thread=%p open_win=%08x owner=%08x viewer=%08x seq=%u\n", clipboard->open_thread, clipboard->open_win, clipboard->owner, clipboard->viewer, clipboard->seqno ); } diff --git a/server/completion.c b/server/completion.c index dbcf4e2480c..f5e5c7e15f2 100644 --- a/server/completion.c +++ b/server/completion.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -121,7 +122,7 @@ static void completion_wait_dump( struct object *obj, int verbose ) struct completion_wait *wait = (struct completion_wait *)obj; assert( obj->ops == &completion_wait_ops ); - fprintf( stderr, "Completion wait completion=%p\n", wait->completion ); + TRACE( "Completion wait completion=%p\n", wait->completion ); } static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -202,7 +203,7 @@ static void completion_dump( struct object *obj, int verbose ) struct completion *completion = (struct completion *) obj; assert( obj->ops == &completion_ops ); - fprintf( stderr, "Completion depth=%u\n", completion->depth ); + TRACE( "Completion depth=%u\n", completion->depth ); } static struct object *completion_get_sync( struct object *obj ) diff --git a/server/console.c b/server/console.c index eb849b7d239..c5c98b183b0 100644 --- a/server/console.c +++ b/server/console.c @@ -31,6 +31,7 @@ #include <sys/ioctl.h> #include <termios.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "handle.h" @@ -746,7 +747,7 @@ static void console_dump( struct object *obj, int verbose ) { struct console *console = (struct console *)obj; assert( obj->ops == &console_ops ); - fprintf( stderr, "Console input active=%p server=%p\n", + TRACE( "Console input active=%p server=%p\n", console->active, console->server ); } @@ -845,7 +846,7 @@ static void screen_buffer_dump( struct object *obj, int verbose ) struct screen_buffer *screen_buffer = (struct screen_buffer *)obj; assert( obj->ops == &screen_buffer_ops ); - fprintf(stderr, "Console screen buffer input=%p\n", screen_buffer->input ); + TRACE( "Console screen buffer input=%p\n", screen_buffer->input ); } static void screen_buffer_destroy( struct object *obj ) @@ -892,7 +893,7 @@ static struct object *screen_buffer_get_sync( struct object *obj ) static void console_server_dump( struct object *obj, int verbose ) { assert( obj->ops == &console_server_ops ); - fprintf( stderr, "Console server\n" ); + TRACE( "Console server\n" ); } static void console_server_destroy( struct object *obj ) diff --git a/server/d3dkmt.c b/server/d3dkmt.c index 6c8c971dc44..ce50d204058 100644 --- a/server/d3dkmt.c +++ b/server/d3dkmt.c @@ -24,6 +24,7 @@ #include <stdbool.h> #include <stdio.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -198,7 +199,7 @@ static void dxgk_shared_sync_dump( struct object *obj, int verbose ) { struct dxgk_shared_sync *shared = (struct dxgk_shared_sync *)obj; assert( obj->ops == &dxgk_shared_sync_ops ); - fprintf( stderr, "DxgkSync sync=%p\n", shared->sync ); + TRACE( "DxgkSync sync=%p\n", shared->sync ); } static void dxgk_shared_sync_destroy( struct object *obj ) @@ -265,7 +266,7 @@ static void dxgk_shared_resource_dump( struct object *obj, int verbose ) { struct dxgk_shared_resource *shared = (struct dxgk_shared_resource *)obj; assert( obj->ops == &dxgk_shared_resource_ops ); - fprintf( stderr, "DxgkResource resource=%p mutex=%p sync=%p\n", shared->resource, + TRACE( "DxgkResource resource=%p mutex=%p sync=%p\n", shared->resource, shared->mutex, shared->sync ); } @@ -373,7 +374,7 @@ static void d3dkmt_object_dump( struct object *obj, int verbose ) struct d3dkmt_object *object = (struct d3dkmt_object *)obj; assert( obj->ops == &d3dkmt_object_ops ); - fprintf( stderr, "type=%#x global=%#x\n", object->type, object->global ); + TRACE( "type=%#x global=%#x\n", object->type, object->global ); } static struct fd *d3dkmt_object_get_fd( struct object *obj ) @@ -422,7 +423,7 @@ static void d3dkmt_mutex_dump( struct object *obj, int verbose ) struct d3dkmt_mutex *mutex = (struct d3dkmt_mutex *)obj; assert( obj->ops == &d3dkmt_mutex_ops ); - fprintf( stderr, "d3dkmt mutex global=%#x\n", mutex->base.global ); + TRACE( "d3dkmt mutex global=%#x\n", mutex->base.global ); } static void d3dkmt_mutex_destroy( struct object *obj ) diff --git a/server/debug.h b/server/debug.h index 7a8cabf67f2..8a4f6ab95a9 100644 --- a/server/debug.h +++ b/server/debug.h @@ -28,8 +28,8 @@ extern "C" { #endif #ifndef WINE_NO_TRACE_MSGS -void _trace(const char *file, int line, const char *func, const char *fmt, ...); -void _trace_raw(const char *fmt, ...); +extern void _trace(const char *file, int line, const char *func, const char *fmt, ...); +extern void _trace_raw(const char *fmt, ...); #define TRACE(...) _trace(__FILE__, __LINE__, __func__, __VA_ARGS__) #define TRACE_RAW(...) _trace_raw(__VA_ARGS__) #else diff --git a/server/debugger.c b/server/debugger.c index c709e34078b..0d33c5f940a 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -301,7 +302,7 @@ static void debug_event_dump( struct object *obj, int verbose ) { struct debug_event *debug_event = (struct debug_event *)obj; assert( obj->ops == &debug_event_ops ); - fprintf( stderr, "Debug event sender=%p code=%d state=%d\n", + TRACE( "Debug event sender=%p code=%d state=%d\n", debug_event->sender, debug_event->data.code, debug_event->state ); } @@ -326,7 +327,7 @@ static void debug_obj_dump( struct object *obj, int verbose ) { struct debug_obj *debug_obj = (struct debug_obj *)obj; assert( obj->ops == &debug_obj_ops ); - fprintf( stderr, "Debug context head=%p tail=%p\n", + TRACE( "Debug context head=%p tail=%p\n", debug_obj->event_queue.next, debug_obj->event_queue.prev ); } diff --git a/server/device.c b/server/device.c index 3eed74343e5..0b4a31e17cb 100644 --- a/server/device.c +++ b/server/device.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <stdarg.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -336,7 +337,7 @@ static void grab_kernel_object( struct kernel_object *ptr ) static void irp_call_dump( struct object *obj, int verbose ) { struct irp_call *irp = (struct irp_call *)obj; - fprintf( stderr, "IRP call file=%p\n", irp->file ); + TRACE( "IRP call file=%p\n", irp->file ); } static void irp_call_destroy( struct object *obj ) @@ -495,7 +496,7 @@ static void device_file_dump( struct object *obj, int verbose ) { struct device_file *file = (struct device_file *)obj; - fprintf( stderr, "File on device %p\n", file->device ); + TRACE( "File on device %p\n", file->device ); } static struct fd *device_file_get_fd( struct object *obj ) @@ -788,7 +789,7 @@ static void delete_device( struct device *device ) static void device_manager_dump( struct object *obj, int verbose ) { - fprintf( stderr, "Device manager\n" ); + TRACE( "Device manager\n" ); } static struct object *device_manager_get_sync( struct object *obj ) diff --git a/server/event.c b/server/event.c index b70e9e06e2e..83ad379e198 100644 --- a/server/event.c +++ b/server/event.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <sys/types.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -121,7 +122,7 @@ static void event_sync_dump( struct object *obj, int verbose ) { struct event_sync *event = (struct event_sync *)obj; assert( obj->ops == &event_sync_ops ); - fprintf( stderr, "Event manual=%d signaled=%d\n", + TRACE( "Event manual=%d signaled=%d\n", event->manual, event->signaled ); } diff --git a/server/fd.c b/server/fd.c index f70bec354a3..32fd0f0d7aa 100644 --- a/server/fd.c +++ b/server/fd.c @@ -94,6 +94,7 @@ #include <sys/extattr.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "object.h" @@ -329,9 +330,9 @@ static file_pos_t max_unix_offset = OFF_T_MAX; #define DUMP_LONG_LONG(val) do { \ if (sizeof(val) > sizeof(unsigned long) && (val) > ~0UL) \ - fprintf( stderr, "%lx%08lx", (unsigned long)((unsigned long long)(val) >> 32), (unsigned long)(val) ); \ + TRACE( "%lx%08lx", (unsigned long)((unsigned long long)(val) >> 32), (unsigned long)(val) ); \ else \ - fprintf( stderr, "%lx", (unsigned long)(val) ); \ + TRACE( "%lx", (unsigned long)(val) ); \ } while (0) @@ -1075,9 +1076,9 @@ static struct device *get_device( dev_t dev, int unix_fd ) static void device_dump( struct object *obj, int verbose ) { struct device *device = (struct device *)obj; - fprintf( stderr, "Device dev=" ); + TRACE_RAW( "Device dev=" ); DUMP_LONG_LONG( device->dev ); - fprintf( stderr, "\n" ); + TRACE_RAW( "\n" ); } static void device_destroy( struct object *obj ) @@ -1135,9 +1136,9 @@ static void inode_close_pending( struct inode *inode, int keep_unlinks ) static void inode_dump( struct object *obj, int verbose ) { struct inode *inode = (struct inode *)obj; - fprintf( stderr, "Inode device=%p ino=", inode->device ); + TRACE( "Inode device=%p ino=", inode->device ); DUMP_LONG_LONG( inode->ino ); - fprintf( stderr, "\n" ); + TRACE( "\n" ); } static void inode_destroy( struct object *obj ) @@ -1243,12 +1244,12 @@ static void inode_add_closed_fd( struct inode *inode, struct closed_fd *fd ) static void file_lock_dump( struct object *obj, int verbose ) { struct file_lock *lock = (struct file_lock *)obj; - fprintf( stderr, "Lock %s fd=%p proc=%p start=", + TRACE( "Lock %s fd=%p proc=%p start=", lock->shared ? "shared" : "excl", lock->fd, lock->process ); DUMP_LONG_LONG( lock->start ); - fprintf( stderr, " end=" ); + TRACE( " end=" ); DUMP_LONG_LONG( lock->end ); - fprintf( stderr, "\n" ); + TRACE( "\n" ); } static struct object *file_lock_get_sync( struct object *obj ) @@ -1575,9 +1576,9 @@ void unlock_fd( struct fd *fd, file_pos_t start, file_pos_t count ) static void fd_dump( struct object *obj, int verbose ) { struct fd *fd = (struct fd *)obj; - fprintf( stderr, "Fd unix_fd=%d user=%p options=%08x", fd->unix_fd, fd->user, fd->options ); - if (fd->inode) fprintf( stderr, " inode=%p disp_flags=%x", fd->inode, fd->closed->disp_flags ); - fprintf( stderr, "\n" ); + TRACE( "Fd unix_fd=%d user=%p options=%08x", fd->unix_fd, fd->user, fd->options ); + if (fd->inode) TRACE( " inode=%p disp_flags=%x", fd->inode, fd->closed->disp_flags ); + TRACE( "\n" ); } static struct object *fd_get_sync( struct object *obj ) diff --git a/server/file.c b/server/file.c index cc5acc2aadc..59538d0ebfd 100644 --- a/server/file.c +++ b/server/file.c @@ -37,6 +37,7 @@ #endif #include <poll.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -288,7 +289,7 @@ static void file_dump( struct object *obj, int verbose ) { struct file *file = (struct file *)obj; assert( obj->ops == &file_ops ); - fprintf( stderr, "File fd=%p\n", file->fd ); + TRACE( "File fd=%p\n", file->fd ); } static enum server_fd_type file_get_fd_type( struct fd *fd ) diff --git a/server/handle.c b/server/handle.c index ddcf03accb2..4220eaef13c 100644 --- a/server/handle.c +++ b/server/handle.c @@ -28,6 +28,7 @@ #include <stdlib.h> #include <sys/types.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -152,14 +153,14 @@ static void handle_table_dump( struct object *obj, int verbose ) assert( obj->ops == &handle_table_ops ); - fprintf( stderr, "Handle table last=%d count=%d process=%p\n", + TRACE( "Handle table last=%d count=%d process=%p\n", table->last, table->count, table->process ); if (!verbose) return; entry = table->entries; for (i = 0; i <= table->last; i++, entry++) { if (!entry->ptr) continue; - fprintf( stderr, " %04x: %p %08x ", + TRACE( " %04x: %p %08x ", index_to_handle(i), entry->ptr, entry->access ); dump_object_name( entry->ptr ); entry->ptr->ops->dump( entry->ptr, 0 ); diff --git a/server/hook.c b/server/hook.c index fe3c0459651..77f2fba9f6c 100644 --- a/server/hook.c +++ b/server/hook.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -290,7 +291,7 @@ static struct hook *get_next_hook( struct thread *thread, struct hook *hook, int static void hook_table_dump( struct object *obj, int verbose ) { /* struct hook_table *table = (struct hook_table *)obj; */ - fprintf( stderr, "Hook table\n" ); + TRACE( "Hook table\n" ); } static void hook_table_destroy( struct object *obj ) diff --git a/server/inproc_sync.c b/server/inproc_sync.c index a291d10aa2a..5ab99bb2aa3 100644 --- a/server/inproc_sync.c +++ b/server/inproc_sync.c @@ -24,6 +24,7 @@ #include <stdint.h> #include <stdio.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -177,20 +178,20 @@ static void inproc_sync_dump( struct object *obj, int verbose ) { struct inproc_sync *sync = (struct inproc_sync *)obj; assert( obj->ops == &inproc_sync_ops ); - fprintf( stderr, "Inproc sync type=%d, fd=%d\n", sync->type, sync->fd ); + TRACE( "Inproc sync type=%d, fd=%d\n", sync->type, sync->fd ); } void signal_inproc_sync( struct inproc_sync *sync ) { __u32 count; - if (debug_level) fprintf( stderr, "set_inproc_event %d\n", sync->fd ); + if (debug_level) TRACE( "set_inproc_event %d\n", sync->fd ); ioctl( sync->fd, NTSYNC_IOC_EVENT_SET, &count ); } void reset_inproc_sync( struct inproc_sync *sync ) { __u32 count; - if (debug_level) fprintf( stderr, "reset_inproc_event %d\n", sync->fd ); + if (debug_level) TRACE( "reset_inproc_event %d\n", sync->fd ); ioctl( sync->fd, NTSYNC_IOC_EVENT_RESET, &count ); } diff --git a/server/mach.c b/server/mach.c index 0f75d892816..7b08e722079 100644 --- a/server/mach.c +++ b/server/mach.c @@ -32,6 +32,7 @@ #include <sys/sysctl.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -133,7 +134,7 @@ void init_process_tracing( struct process *process ) if (ret) { if (ret != MACH_RCV_TIMED_OUT && debug_level) - fprintf( stderr, "warning: mach port receive failed with %x\n", ret ); + TRACE( "warning: mach port receive failed with %x\n", ret ); return; } @@ -387,7 +388,7 @@ int send_thread_signal( struct thread *thread, int sig ) } } if (debug_level && ret != -1) - fprintf( stderr, "%04x: *sent signal* signal=%d\n", thread->id, sig ); + TRACE( "%04x: *sent signal* signal=%d\n", thread->id, sig ); return (ret != -1); } diff --git a/server/mailslot.c b/server/mailslot.c index 430566d044d..89b74026451 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -37,6 +37,7 @@ #include <sys/filio.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -303,7 +304,7 @@ static void mailslot_dump( struct object *obj, int verbose ) struct mailslot *mailslot = (struct mailslot *) obj; assert( obj->ops == &mailslot_ops ); - fprintf( stderr, "Mailslot max_msgsize=%d read_timeout=%s\n", + TRACE( "Mailslot max_msgsize=%d read_timeout=%s\n", mailslot->max_msgsize, get_timeout_str(mailslot->read_timeout) ); } @@ -534,7 +535,7 @@ static void mailslot_device_file_dump( struct object *obj, int verbose ) { struct mailslot_device_file *file = (struct mailslot_device_file *)obj; - fprintf( stderr, "File on mailslot device %p\n", file->device ); + TRACE( "File on mailslot device %p\n", file->device ); } static struct fd *mailslot_device_file_get_fd( struct object *obj ) @@ -592,7 +593,7 @@ static struct mailslot *create_mailslot( struct object *root, static void mail_writer_dump( struct object *obj, int verbose ) { - fprintf( stderr, "Mailslot writer\n" ); + TRACE( "Mailslot writer\n" ); } static void mail_writer_destroy( struct object *obj) diff --git a/server/main.c b/server/main.c index 46419a09cb4..5b5740e0549 100644 --- a/server/main.c +++ b/server/main.c @@ -40,6 +40,7 @@ #include "thread.h" #include "request.h" #include "unicode.h" +#include "debug.h" /* command-line options */ int debug_level = 0; @@ -95,7 +96,7 @@ static void option_callback( int optc, char *optarg ) master_socket_timeout = TIMEOUT_INFINITE; break; case 'v': - fprintf( stderr, "%s\n", PACKAGE_STRING ); + TRACE( "%s\n", PACKAGE_STRING ); exit(0); case 'w': wait_for_lock(); @@ -259,7 +260,7 @@ int main( int argc, char *argv[] ) sock_init(); open_master_socket(); - if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); + if (debug_level) TRACE( "wineserver: starting (pid=%ld)\n", (long) getpid() ); set_current_time(); init_signals(); init_memory(); diff --git a/server/mapping.c b/server/mapping.c index 905d528b04f..a65c57b4ede 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -30,6 +30,7 @@ #include <sys/mman.h> #include <unistd.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -278,7 +279,7 @@ void init_memory(void) static void ranges_dump( struct object *obj, int verbose ) { struct ranges *ranges = (struct ranges *)obj; - fprintf( stderr, "Memory ranges count=%u\n", ranges->count ); + TRACE( "Memory ranges count=%u\n", ranges->count ); } static void ranges_destroy( struct object *obj ) @@ -290,7 +291,7 @@ static void ranges_destroy( struct object *obj ) static void shared_map_dump( struct object *obj, int verbose ) { struct shared_map *shared = (struct shared_map *)obj; - fprintf( stderr, "Shared mapping fd=%p file=%p\n", shared->fd, shared->file ); + TRACE( "Shared mapping fd=%p file=%p\n", shared->fd, shared->file ); } static void shared_map_destroy( struct object *obj ) @@ -1243,7 +1244,7 @@ static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); - fprintf( stderr, "Mapping size=%08x%08x flags=%08x fd=%p shared=%p\n", + TRACE( "Mapping size=%08x%08x flags=%08x fd=%p shared=%p\n", (unsigned int)(mapping->size >> 32), (unsigned int)mapping->size, mapping->flags, mapping->fd, mapping->shared ); } diff --git a/server/mutex.c b/server/mutex.c index a1684536dc2..ae8b8278d99 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <sys/types.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -126,7 +127,7 @@ static void mutex_sync_dump( struct object *obj, int verbose ) { struct mutex_sync *mutex = (struct mutex_sync *)obj; assert( obj->ops == &mutex_sync_ops ); - fprintf( stderr, "Mutex count=%u owner=%p\n", mutex->count, mutex->owner ); + TRACE( "Mutex count=%u owner=%p\n", mutex->count, mutex->owner ); } static void mutex_sync_destroy( struct object *obj ) diff --git a/server/named_pipe.c b/server/named_pipe.c index e67b25bac5d..8164e9557f1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -29,6 +29,7 @@ #include <stdlib.h> #include <sys/types.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -407,7 +408,7 @@ static void pipe_server_dump( struct object *obj, int verbose ) { struct pipe_server *server = (struct pipe_server *) obj; assert( obj->ops == &pipe_server_ops ); - fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, + TRACE( "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, server->pipe_end.state ); } @@ -415,7 +416,7 @@ static void pipe_client_dump( struct object *obj, int verbose ) { struct pipe_end *client = (struct pipe_end *) obj; assert( obj->ops == &pipe_client_ops ); - fprintf( stderr, "Named pipe client server=%p\n", client->connection ); + TRACE( "Named pipe client server=%p\n", client->connection ); } static void named_pipe_destroy( struct object *obj) @@ -631,7 +632,7 @@ static void named_pipe_device_file_dump( struct object *obj, int verbose ) { struct named_pipe_device_file *file = (struct named_pipe_device_file *)obj; - fprintf( stderr, "File on named pipe device %p\n", file->device ); + TRACE( "File on named pipe device %p\n", file->device ); } static struct fd *named_pipe_device_file_get_fd( struct object *obj ) @@ -663,7 +664,7 @@ static void named_pipe_dir_dump( struct object *obj, int verbose ) { struct named_pipe_device_file *dir = (struct named_pipe_device_file *)obj; - fprintf( stderr, "Root directory of named pipe device %p\n", dir->device ); + TRACE( "Root directory of named pipe device %p\n", dir->device ); } static struct fd *named_pipe_dir_get_fd( struct object *obj ) diff --git a/server/object.c b/server/object.c index 694835a6a51..b8b61f384cc 100644 --- a/server/object.c +++ b/server/object.c @@ -32,6 +32,7 @@ #include <valgrind/memcheck.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -160,7 +161,7 @@ void dump_objects(void) LIST_FOR_EACH_ENTRY( ptr, &object_list, struct object, obj_list ) { - fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); + TRACE( "%p:%d: ", ptr, ptr->refcount ); dump_object_name( ptr ); ptr->ops->dump( ptr, 1 ); } @@ -829,7 +830,7 @@ static void dump_reserve( struct object *obj, int verbose ) struct reserve *reserve = (struct reserve *) obj; assert( obj->ops == &apc_reserve_ops || obj->ops == &completion_reserve_ops ); - fprintf( stderr, "reserve type=%d\n", reserve->type); + TRACE( "reserve type=%d\n", reserve->type); } static struct reserve *create_reserve( struct object *root, const struct unicode_str *name, diff --git a/server/process.c b/server/process.c index a06aa83166c..9b09325348d 100644 --- a/server/process.c +++ b/server/process.c @@ -52,6 +52,7 @@ # include <libprocstat.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -457,7 +458,7 @@ static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + TRACE( "Job processes=%d child_jobs=%d parent=%p\n", list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } @@ -582,7 +583,7 @@ static void server_shutdown_timeout( void *arg ) switch(++shutdown_stage) { case 1: /* signal system processes to exit */ - if (debug_level) fprintf( stderr, "wineserver: shutting down\n" ); + if (debug_level) TRACE( "wineserver: shutting down\n" ); if (shutdown_event) set_event( shutdown_event ); shutdown_timeout = add_timeout_user( 2 * -TICKS_PER_SEC, server_shutdown_timeout, NULL ); close_master_socket( 4 * -TICKS_PER_SEC ); @@ -609,7 +610,7 @@ void shutdown_master_socket(void) /* final cleanup once we are sure a process is really dead */ static void process_died( struct process *process ) { - if (debug_level) fprintf( stderr, "%04x: *process killed*\n", process->id ); + if (debug_level) TRACE( "%04x: *process killed*\n", process->id ); if (!process->is_system) { if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) @@ -810,7 +811,7 @@ static void process_dump( struct object *obj, int verbose ) struct process *process = (struct process *)obj; assert( obj->ops == &process_ops ); - fprintf( stderr, "Process id=%04x handles=%p\n", process->id, process->handles ); + TRACE( "Process id=%04x handles=%p\n", process->id, process->handles ); } static struct object *process_get_sync( struct object *obj ) @@ -900,7 +901,7 @@ static void startup_info_dump( struct object *obj, int verbose ) fputs( "Startup info", stderr ); if (info->data) - fprintf( stderr, " in=%04x out=%04x err=%04x", + TRACE( " in=%04x out=%04x err=%04x", info->data->hstdin, info->data->hstdout, info->data->hstderr ); fputc( '\n', stderr ); } diff --git a/server/ptrace.c b/server/ptrace.c index c4b71e99de3..fbdd763eda7 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -48,6 +48,7 @@ #endif #include <unistd.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -135,7 +136,7 @@ static int handle_child_status( struct thread *thread, int pid, int status, int { int sig = WSTOPSIG(status); if (debug_level && thread) - fprintf( stderr, "%04x: *signal* %s\n", thread->id, get_signal_name( sig )); + TRACE( "%04x: *signal* %s\n", thread->id, get_signal_name( sig )); if (sig != want_sig) { /* ignore other signals for now */ @@ -150,10 +151,10 @@ static int handle_child_status( struct thread *thread, int pid, int status, int if (debug_level) { if (WIFSIGNALED(status)) - fprintf( stderr, "%04x: *exited* %s\n", + TRACE( "%04x: *exited* %s\n", thread->id, get_signal_name( WTERMSIG(status) )); else - fprintf( stderr, "%04x: *exited* status=%d\n", + TRACE( "%04x: *exited* status=%d\n", thread->id, WEXITSTATUS(status) ); } } @@ -200,7 +201,7 @@ static int waitpid_thread( struct thread *thread, int signal ) if (errno == EINTR) { if (!watchdog_triggered()) continue; - if (debug_level) fprintf( stderr, "%04x: *watchdog* waitpid aborted\n", thread->id ); + if (debug_level) TRACE( "%04x: *watchdog* waitpid aborted\n", thread->id ); } else if (errno == ECHILD) /* must have died */ { @@ -267,7 +268,7 @@ int send_thread_signal( struct thread *thread, int sig ) } if (debug_level && ret != -1) - fprintf( stderr, "%04x: *sent signal* %s\n", thread->id, get_signal_name( sig )); + TRACE( "%04x: *sent signal* %s\n", thread->id, get_signal_name( sig )); return (ret != -1); } diff --git a/server/queue.c b/server/queue.c index 3e8ab2ef48a..4e1797ac7dd 100644 --- a/server/queue.c +++ b/server/queue.c @@ -28,6 +28,7 @@ #include <poll.h> #include <limits.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -1298,7 +1299,7 @@ static void msg_queue_dump( struct object *obj, int verbose ) { struct msg_queue *queue = (struct msg_queue *)obj; queue_shm_t *queue_shm = queue->shared; - fprintf( stderr, "Msg queue bits=%x mask=%x\n", + TRACE( "Msg queue bits=%x mask=%x\n", queue_shm->wake_bits, queue_shm->wake_mask ); } @@ -1362,7 +1363,7 @@ static void thread_input_dump( struct object *obj, int verbose ) { struct thread_input *input = (struct thread_input *)obj; input_shm_t *input_shm = input->shared; - fprintf( stderr, "Thread input focus=%08x capture=%08x active=%08x\n", + TRACE( "Thread input focus=%08x capture=%08x active=%08x\n", input_shm->focus, input_shm->capture, input_shm->active ); } @@ -2971,7 +2972,7 @@ void post_win_event( struct thread *thread, unsigned int event, msg->data_size = sizeof(*data) + module_size; if (debug_level > 1) - fprintf( stderr, "post_win_event: tid %04x event %04x win %08x object_id %d child_id %d\n", + TRACE( "post_win_event: tid %04x event %04x win %08x object_id %d child_id %d\n", get_thread_id(thread), event, win, object_id, child_id ); list_add_tail( &thread->queue->msg_list[SEND_MESSAGE], &msg->entry ); set_queue_bits( thread->queue, QS_SENDMESSAGE ); diff --git a/server/registry.c b/server/registry.c index bb7897ef731..969728e4336 100644 --- a/server/registry.c +++ b/server/registry.c @@ -37,6 +37,7 @@ #include <sys/types.h> #include <unistd.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "object.h" @@ -365,24 +366,24 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f static void dump_operation( const struct key *key, const struct key_value *value, const char *op ) { - fprintf( stderr, "%s key ", op ); + TRACE( "%s key ", op ); if (key) dump_path( key, NULL, stderr ); - else fprintf( stderr, "ERROR" ); + else TRACE( "ERROR" ); if (value) { - fprintf( stderr, " value "); + TRACE( " value "); dump_value( value, stderr ); } - else fprintf( stderr, "\n" ); + else TRACE( "\n" ); } static void key_dump( struct object *obj, int verbose ) { struct key *key = (struct key *)obj; assert( obj->ops == &key_ops ); - fprintf( stderr, "Key flags=%x ", key->flags ); + TRACE( "Key flags=%x ", key->flags ); dump_path( key, NULL, stderr ); - fprintf( stderr, "\n" ); + TRACE( "\n" ); } /* notify waiter and maybe delete the notification */ @@ -1409,9 +1410,9 @@ static int get_file_tmp_space( struct file_load_info *info, size_t size ) static void file_read_error( const char *err, struct file_load_info *info ) { if (info->filename) - fprintf( stderr, "%s:%d: %s '%s'\n", info->filename, info->line, err, info->buffer ); + TRACE( "%s:%d: %s '%s'\n", info->filename, info->line, err, info->buffer ); else - fprintf( stderr, "<fd>:%d: %s '%s'\n", info->line, err, info->buffer ); + TRACE( "<fd>:%d: %s '%s'\n", info->line, err, info->buffer ); } /* convert a data type tag to a value type */ @@ -1817,7 +1818,7 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) fclose( f ); if (get_error() == STATUS_NOT_REGISTRY_FILE) { - fprintf( stderr, "%s is not a valid registry file\n", filename ); + TRACE( "%s is not a valid registry file\n", filename ); return 1; } } @@ -2103,7 +2104,7 @@ static int save_branch( struct key *key, const char *filename ) if (debug_level > 1) { - fprintf( stderr, "%s: ", filename ); + TRACE( "%s: ", filename ); dump_operation( key, NULL, "saving" ); } @@ -2152,7 +2153,7 @@ void flush_registry(void) { if (!save_branch( save_branch_info[i].key, save_branch_info[i].filename )) { - fprintf( stderr, "wineserver: could not save registry branch to %s", + TRACE( "wineserver: could not save registry branch to %s", save_branch_info[i].filename ); perror( " " ); } diff --git a/server/request.c b/server/request.c index 432a5918892..768c6d7bd9c 100644 --- a/server/request.c +++ b/server/request.c @@ -48,6 +48,7 @@ # include <mach/mach_time.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -141,17 +142,6 @@ void fatal_protocol_error( struct thread *thread, const char *err, ... ) kill_thread( thread, 1 ); } -/* die on a fatal error */ -void fatal_error( const char *err, ... ) -{ - va_list args; - - va_start( args, err ); - fprintf( stderr, "wineserver: " ); - vfprintf( stderr, err, args ); - va_end( args ); - exit(1); -} /* allocate the reply data */ void *set_reply_data_size( data_size_t size ) @@ -415,14 +405,14 @@ int receive_fd( struct process *process ) if (!thread || thread->process != process || thread->state == TERMINATED) { if (debug_level) - fprintf( stderr, "%04x: *fd* %d <- %d bad thread id\n", + TRACE( "%04x: *fd* %d <- %d bad thread id\n", data.tid, data.fd, fd ); close( fd ); } else { if (debug_level) - fprintf( stderr, "%04x: *fd* %d <- %d\n", + TRACE( "%04x: *fd* %d <- %d\n", thread->id, data.fd, fd ); thread_add_inflight_fd( thread, data.fd, fd ); } @@ -436,7 +426,7 @@ int receive_fd( struct process *process ) } else if (ret > 0) { - fprintf( stderr, "Protocol error: process %04x: partial recvmsg %d for fd\n", + TRACE( "Protocol error: process %04x: partial recvmsg %d for fd\n", process->id, ret ); if (fd != -1) close( fd ); kill_process( process, 1 ); @@ -445,7 +435,7 @@ int receive_fd( struct process *process ) { if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) { - fprintf( stderr, "Protocol error: process %04x: ", process->id ); + TRACE( "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); kill_process( process, 1 ); } @@ -481,7 +471,7 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) msghdr.msg_controllen = cmsg->cmsg_len; if (debug_level) - fprintf( stderr, "%04x: *fd* %04x -> %d\n", current ? current->id : process->id, handle, fd ); + TRACE( "%04x: *fd* %04x -> %d\n", current ? current->id : process->id, handle, fd ); ret = sendmsg( get_unix_fd( process->msg_fd ), &msghdr, 0 ); @@ -489,7 +479,7 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) if (ret >= 0) { - fprintf( stderr, "Protocol error: process %04x: partial sendmsg %d\n", process->id, ret ); + TRACE( "Protocol error: process %04x: partial sendmsg %d\n", process->id, ret ); kill_process( process, 1 ); } else if (errno == EPIPE) @@ -498,7 +488,7 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) } else { - fprintf( stderr, "Protocol error: process %04x: ", process->id ); + TRACE( "Protocol error: process %04x: ", process->id ); perror( "sendmsg" ); kill_process( process, 1 ); } @@ -529,7 +519,7 @@ static void master_socket_dump( struct object *obj, int verbose ) { struct master_socket *sock = (struct master_socket *)obj; assert( obj->ops == &master_socket_ops ); - fprintf( stderr, "Master socket fd=%p\n", sock->fd ); + TRACE( "Master socket fd=%p\n", sock->fd ); } static void master_socket_destroy( struct object *obj ) @@ -550,7 +540,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) if (event & (POLLERR | POLLHUP)) { /* this is not supposed to happen */ - fprintf( stderr, "wineserver: Error on master socket\n" ); + TRACE( "wineserver: Error on master socket\n" ); set_fd_events( sock->fd, -1 ); } else if (event & POLLIN) @@ -780,7 +770,7 @@ static void acquire_lock(void) if (stat( server_socket_name, &st ) != -1 && /* there is a leftover socket */ stat( "core", &st ) != -1 && st.st_size) /* and there is a non-empty core file */ { - fprintf( stderr, + TRACE( "Warning: a previous instance of the wine server seems to have crashed.\n" "Please run 'gdb %s %s/core',\n" "type 'backtrace' at the gdb prompt and report the results. Thanks.\n\n", @@ -907,7 +897,7 @@ static void close_socket_timeout( void *arg ) { master_timeout = NULL; flush_registry(); - if (debug_level) fprintf( stderr, "wineserver: exiting (pid=%ld)\n", (long) getpid() ); + if (debug_level) TRACE( "wineserver: exiting (pid=%ld)\n", (long) getpid() ); #ifdef DEBUG_OBJECTS close_objects(); /* shut down everything properly */ diff --git a/server/request.h b/server/request.h index 13254d967ed..a3dd0a110b4 100644 --- a/server/request.h +++ b/server/request.h @@ -38,10 +38,8 @@ #ifdef __GNUC__ extern void fatal_protocol_error( struct thread *thread, const char *err, ... ) __attribute__((format (printf,2,3))); -extern void fatal_error( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); #else extern void fatal_protocol_error( struct thread *thread, const char *err, ... ); -extern void fatal_error( const char *err, ... ); #endif extern const char *get_config_dir(void); diff --git a/server/request_trace.h b/server/request_trace.h index ec36688c3b3..ca5b250f692 100644 --- a/server/request_trace.h +++ b/server/request_trace.h @@ -59,16 +59,16 @@ static data_size_t cur_size; static void dump_new_process_request( const struct new_process_request *req ) { - fprintf( stderr, " token=%04x", req->token ); - fprintf( stderr, ", debug=%04x", req->debug ); - fprintf( stderr, ", parent_process=%04x", req->parent_process ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", socket_fd=%d", req->socket_fd ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", machine=%04x", req->machine ); - fprintf( stderr, ", info_size=%u", req->info_size ); - fprintf( stderr, ", handles_size=%u", req->handles_size ); - fprintf( stderr, ", jobs_size=%u", req->jobs_size ); + TRACE_RAW( " token=%04x", req->token ); + TRACE_RAW( ", debug=%04x", req->debug ); + TRACE_RAW( ", parent_process=%04x", req->parent_process ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", socket_fd=%d", req->socket_fd ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", machine=%04x", req->machine ); + TRACE_RAW( ", info_size=%u", req->info_size ); + TRACE_RAW( ", handles_size=%u", req->handles_size ); + TRACE_RAW( ", jobs_size=%u", req->jobs_size ); dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_uints( ", handles=", min( cur_size, req->handles_size )); dump_varargs_uints( ", jobs=", min( cur_size, req->jobs_size )); @@ -78,35 +78,35 @@ static void dump_new_process_request( const struct new_process_request *req ) static void dump_new_process_reply( const struct new_process_reply *req ) { - fprintf( stderr, " info=%04x", req->info ); - fprintf( stderr, ", pid=%04x", req->pid ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " info=%04x", req->info ); + TRACE_RAW( ", pid=%04x", req->pid ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_get_new_process_info_request( const struct get_new_process_info_request *req ) { - fprintf( stderr, " info=%04x", req->info ); + TRACE_RAW( " info=%04x", req->info ); } static void dump_get_new_process_info_reply( const struct get_new_process_info_reply *req ) { - fprintf( stderr, " success=%d", req->success ); - fprintf( stderr, ", exit_code=%d", req->exit_code ); + TRACE_RAW( " success=%d", req->success ); + TRACE_RAW( ", exit_code=%d", req->exit_code ); } static void dump_new_thread_request( const struct new_thread_request *req ) { - fprintf( stderr, " process=%04x", req->process ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", request_fd=%d", req->request_fd ); + TRACE_RAW( " process=%04x", req->process ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", request_fd=%d", req->request_fd ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_new_thread_reply( const struct new_thread_reply *req ) { - fprintf( stderr, " tid=%04x", req->tid ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " tid=%04x", req->tid ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_get_startup_info_request( const struct get_startup_info_request *req ) @@ -115,8 +115,8 @@ static void dump_get_startup_info_request( const struct get_startup_info_request static void dump_get_startup_info_reply( const struct get_startup_info_reply *req ) { - fprintf( stderr, " info_size=%u", req->info_size ); - fprintf( stderr, ", machine=%04x", req->machine ); + TRACE_RAW( " info_size=%u", req->info_size ); + TRACE_RAW( ", machine=%04x", req->machine ); dump_varargs_startup_info( ", info=", min( cur_size, req->info_size )); dump_varargs_unicode_str( ", env=", cur_size ); } @@ -129,115 +129,115 @@ static void dump_init_process_done_request( const struct init_process_done_reque static void dump_init_process_done_reply( const struct init_process_done_reply *req ) { - fprintf( stderr, " suspend=%d", req->suspend ); + TRACE_RAW( " suspend=%d", req->suspend ); } static void dump_init_first_thread_request( const struct init_first_thread_request *req ) { - fprintf( stderr, " unix_pid=%d", req->unix_pid ); - fprintf( stderr, ", unix_tid=%d", req->unix_tid ); - fprintf( stderr, ", debug_level=%d", req->debug_level ); - fprintf( stderr, ", reply_fd=%d", req->reply_fd ); - fprintf( stderr, ", wait_fd=%d", req->wait_fd ); + TRACE_RAW( " unix_pid=%d", req->unix_pid ); + TRACE_RAW( ", unix_tid=%d", req->unix_tid ); + TRACE_RAW( ", debug_level=%d", req->debug_level ); + TRACE_RAW( ", reply_fd=%d", req->reply_fd ); + TRACE_RAW( ", wait_fd=%d", req->wait_fd ); } static void dump_init_first_thread_reply( const struct init_first_thread_reply *req ) { - fprintf( stderr, " pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); + TRACE_RAW( " pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); dump_timeout( ", server_start=", &req->server_start ); - fprintf( stderr, ", session_id=%08x", req->session_id ); - fprintf( stderr, ", inproc_device=%04x", req->inproc_device ); - fprintf( stderr, ", info_size=%u", req->info_size ); + TRACE_RAW( ", session_id=%08x", req->session_id ); + TRACE_RAW( ", inproc_device=%04x", req->inproc_device ); + TRACE_RAW( ", info_size=%u", req->info_size ); dump_varargs_ushorts( ", machines=", cur_size ); } static void dump_init_thread_request( const struct init_thread_request *req ) { - fprintf( stderr, " unix_tid=%d", req->unix_tid ); - fprintf( stderr, ", reply_fd=%d", req->reply_fd ); - fprintf( stderr, ", wait_fd=%d", req->wait_fd ); + TRACE_RAW( " unix_tid=%d", req->unix_tid ); + TRACE_RAW( ", reply_fd=%d", req->reply_fd ); + TRACE_RAW( ", wait_fd=%d", req->wait_fd ); dump_uint64( ", teb=", &req->teb ); dump_uint64( ", entry=", &req->entry ); } static void dump_init_thread_reply( const struct init_thread_reply *req ) { - fprintf( stderr, " suspend=%d", req->suspend ); + TRACE_RAW( " suspend=%d", req->suspend ); } static void dump_terminate_process_request( const struct terminate_process_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", exit_code=%d", req->exit_code ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", exit_code=%d", req->exit_code ); } static void dump_terminate_process_reply( const struct terminate_process_reply *req ) { - fprintf( stderr, " self=%d", req->self ); + TRACE_RAW( " self=%d", req->self ); } static void dump_terminate_thread_request( const struct terminate_thread_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", exit_code=%d", req->exit_code ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", exit_code=%d", req->exit_code ); } static void dump_terminate_thread_reply( const struct terminate_thread_reply *req ) { - fprintf( stderr, " self=%d", req->self ); + TRACE_RAW( " self=%d", req->self ); } static void dump_get_process_info_request( const struct get_process_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_process_info_reply( const struct get_process_info_reply *req ) { - fprintf( stderr, " pid=%04x", req->pid ); - fprintf( stderr, ", ppid=%04x", req->ppid ); + TRACE_RAW( " pid=%04x", req->pid ); + TRACE_RAW( ", ppid=%04x", req->ppid ); dump_uint64( ", affinity=", &req->affinity ); dump_uint64( ", peb=", &req->peb ); dump_timeout( ", start_time=", &req->start_time ); dump_timeout( ", end_time=", &req->end_time ); - fprintf( stderr, ", session_id=%08x", req->session_id ); - fprintf( stderr, ", exit_code=%d", req->exit_code ); - fprintf( stderr, ", priority=%04x", req->priority ); - fprintf( stderr, ", base_priority=%04x", req->base_priority ); - fprintf( stderr, ", disable_boost=%04x", req->disable_boost ); - fprintf( stderr, ", machine=%04x", req->machine ); + TRACE_RAW( ", session_id=%08x", req->session_id ); + TRACE_RAW( ", exit_code=%d", req->exit_code ); + TRACE_RAW( ", priority=%04x", req->priority ); + TRACE_RAW( ", base_priority=%04x", req->base_priority ); + TRACE_RAW( ", disable_boost=%04x", req->disable_boost ); + TRACE_RAW( ", machine=%04x", req->machine ); dump_varargs_pe_image_info( ", image=", cur_size ); } static void dump_get_process_debug_info_request( const struct get_process_debug_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_process_debug_info_reply( const struct get_process_debug_info_reply *req ) { - fprintf( stderr, " debug=%04x", req->debug ); - fprintf( stderr, ", debug_children=%d", req->debug_children ); + TRACE_RAW( " debug=%04x", req->debug ); + TRACE_RAW( ", debug_children=%d", req->debug_children ); dump_varargs_pe_image_info( ", image=", cur_size ); } static void dump_get_process_image_name_request( const struct get_process_image_name_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", pid=%04x", req->pid ); - fprintf( stderr, ", win32=%d", req->win32 ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", pid=%04x", req->pid ); + TRACE_RAW( ", win32=%d", req->win32 ); } static void dump_get_process_image_name_reply( const struct get_process_image_name_reply *req ) { - fprintf( stderr, " len=%u", req->len ); + TRACE_RAW( " len=%u", req->len ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_get_process_vm_counters_request( const struct get_process_vm_counters_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_process_vm_counters_reply( const struct get_process_vm_counters_reply *req ) @@ -252,99 +252,99 @@ static void dump_get_process_vm_counters_reply( const struct get_process_vm_coun static void dump_set_process_info_request( const struct set_process_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", affinity=", &req->affinity ); - fprintf( stderr, ", priority=%d", req->priority ); - fprintf( stderr, ", base_priority=%d", req->base_priority ); - fprintf( stderr, ", disable_boost=%d", req->disable_boost ); - fprintf( stderr, ", token=%04x", req->token ); - fprintf( stderr, ", mask=%d", req->mask ); + TRACE_RAW( ", priority=%d", req->priority ); + TRACE_RAW( ", base_priority=%d", req->base_priority ); + TRACE_RAW( ", disable_boost=%d", req->disable_boost ); + TRACE_RAW( ", token=%04x", req->token ); + TRACE_RAW( ", mask=%d", req->mask ); } static void dump_get_thread_info_request( const struct get_thread_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", access=%08x", req->access ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", access=%08x", req->access ); } static void dump_get_thread_info_reply( const struct get_thread_info_reply *req ) { - fprintf( stderr, " pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); + TRACE_RAW( " pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); dump_uint64( ", teb=", &req->teb ); dump_uint64( ", entry_point=", &req->entry_point ); dump_uint64( ", affinity=", &req->affinity ); - fprintf( stderr, ", exit_code=%d", req->exit_code ); - fprintf( stderr, ", priority=%d", req->priority ); - fprintf( stderr, ", base_priority=%d", req->base_priority ); - fprintf( stderr, ", suspend_count=%d", req->suspend_count ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", desc_len=%u", req->desc_len ); + TRACE_RAW( ", exit_code=%d", req->exit_code ); + TRACE_RAW( ", priority=%d", req->priority ); + TRACE_RAW( ", base_priority=%d", req->base_priority ); + TRACE_RAW( ", suspend_count=%d", req->suspend_count ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", desc_len=%u", req->desc_len ); dump_varargs_unicode_str( ", desc=", cur_size ); } static void dump_get_thread_times_request( const struct get_thread_times_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_thread_times_reply( const struct get_thread_times_reply *req ) { dump_timeout( " creation_time=", &req->creation_time ); dump_timeout( ", exit_time=", &req->exit_time ); - fprintf( stderr, ", unix_pid=%d", req->unix_pid ); - fprintf( stderr, ", unix_tid=%d", req->unix_tid ); + TRACE_RAW( ", unix_pid=%d", req->unix_pid ); + TRACE_RAW( ", unix_tid=%d", req->unix_tid ); } static void dump_set_thread_info_request( const struct set_thread_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", priority=%d", req->priority ); - fprintf( stderr, ", base_priority=%d", req->base_priority ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", priority=%d", req->priority ); + TRACE_RAW( ", base_priority=%d", req->base_priority ); dump_uint64( ", affinity=", &req->affinity ); dump_uint64( ", entry_point=", &req->entry_point ); - fprintf( stderr, ", token=%04x", req->token ); - fprintf( stderr, ", disable_boost=%d", req->disable_boost ); - fprintf( stderr, ", mask=%08x", req->mask ); + TRACE_RAW( ", token=%04x", req->token ); + TRACE_RAW( ", disable_boost=%d", req->disable_boost ); + TRACE_RAW( ", mask=%08x", req->mask ); dump_varargs_unicode_str( ", desc=", cur_size ); } static void dump_suspend_thread_request( const struct suspend_thread_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_suspend_thread_reply( const struct suspend_thread_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); } static void dump_resume_thread_request( const struct resume_thread_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_resume_thread_reply( const struct resume_thread_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); } static void dump_queue_apc_request( const struct queue_apc_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", reserve_handle=%04x", req->reserve_handle ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", reserve_handle=%04x", req->reserve_handle ); dump_varargs_apc_call( ", call=", cur_size ); } static void dump_queue_apc_reply( const struct queue_apc_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", self=%d", req->self ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", self=%d", req->self ); } static void dump_get_apc_result_request( const struct get_apc_result_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_apc_result_reply( const struct get_apc_result_reply *req ) @@ -354,90 +354,90 @@ static void dump_get_apc_result_reply( const struct get_apc_result_reply *req ) static void dump_close_handle_request( const struct close_handle_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_handle_info_request( const struct set_handle_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%d", req->flags ); - fprintf( stderr, ", mask=%d", req->mask ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%d", req->flags ); + TRACE_RAW( ", mask=%d", req->mask ); } static void dump_set_handle_info_reply( const struct set_handle_info_reply *req ) { - fprintf( stderr, " old_flags=%d", req->old_flags ); + TRACE_RAW( " old_flags=%d", req->old_flags ); } static void dump_dup_handle_request( const struct dup_handle_request *req ) { - fprintf( stderr, " src_process=%04x", req->src_process ); - fprintf( stderr, ", src_handle=%04x", req->src_handle ); - fprintf( stderr, ", dst_process=%04x", req->dst_process ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " src_process=%04x", req->src_process ); + TRACE_RAW( ", src_handle=%04x", req->src_handle ); + TRACE_RAW( ", dst_process=%04x", req->dst_process ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", options=%08x", req->options ); } static void dump_dup_handle_reply( const struct dup_handle_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_allocate_reserve_object_request( const struct allocate_reserve_object_request *req ) { - fprintf( stderr, " type=%d", req->type ); + TRACE_RAW( " type=%d", req->type ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_allocate_reserve_object_reply( const struct allocate_reserve_object_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_compare_objects_request( const struct compare_objects_request *req ) { - fprintf( stderr, " first=%04x", req->first ); - fprintf( stderr, ", second=%04x", req->second ); + TRACE_RAW( " first=%04x", req->first ); + TRACE_RAW( ", second=%04x", req->second ); } static void dump_set_object_permanence_request( const struct set_object_permanence_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", permanent=%d", req->permanent ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", permanent=%d", req->permanent ); } static void dump_open_process_request( const struct open_process_request *req ) { - fprintf( stderr, " pid=%04x", req->pid ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " pid=%04x", req->pid ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); } static void dump_open_process_reply( const struct open_process_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_thread_request( const struct open_thread_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " tid=%04x", req->tid ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); } static void dump_open_thread_reply( const struct open_thread_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_select_request( const struct select_request *req ) { - fprintf( stderr, " flags=%d", req->flags ); + TRACE_RAW( " flags=%d", req->flags ); dump_uint64( ", cookie=", &req->cookie ); dump_abstime( ", timeout=", &req->timeout ); - fprintf( stderr, ", size=%u", req->size ); - fprintf( stderr, ", prev_apc=%04x", req->prev_apc ); + TRACE_RAW( ", size=%u", req->size ); + TRACE_RAW( ", prev_apc=%04x", req->prev_apc ); dump_varargs_apc_result( ", result=", cur_size ); dump_varargs_select_op( ", data=", min( cur_size, req->size )); dump_varargs_contexts( ", contexts=", cur_size ); @@ -445,254 +445,254 @@ static void dump_select_request( const struct select_request *req ) static void dump_select_reply( const struct select_reply *req ) { - fprintf( stderr, " apc_handle=%04x", req->apc_handle ); - fprintf( stderr, ", signaled=%d", req->signaled ); + TRACE_RAW( " apc_handle=%04x", req->apc_handle ); + TRACE_RAW( ", signaled=%d", req->signaled ); dump_varargs_apc_call( ", call=", cur_size ); dump_varargs_contexts( ", contexts=", cur_size ); } static void dump_create_event_request( const struct create_event_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", manual_reset=%d", req->manual_reset ); - fprintf( stderr, ", initial_state=%d", req->initial_state ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", manual_reset=%d", req->manual_reset ); + TRACE_RAW( ", initial_state=%d", req->initial_state ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_event_reply( const struct create_event_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_event_op_request( const struct event_op_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", op=%d", req->op ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", op=%d", req->op ); } static void dump_event_op_reply( const struct event_op_reply *req ) { - fprintf( stderr, " state=%d", req->state ); + TRACE_RAW( " state=%d", req->state ); } static void dump_query_event_request( const struct query_event_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_event_reply( const struct query_event_reply *req ) { - fprintf( stderr, " manual_reset=%d", req->manual_reset ); - fprintf( stderr, ", state=%d", req->state ); + TRACE_RAW( " manual_reset=%d", req->manual_reset ); + TRACE_RAW( ", state=%d", req->state ); } static void dump_open_event_request( const struct open_event_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_event_reply( const struct open_event_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_create_keyed_event_request( const struct create_keyed_event_request *req ) { - fprintf( stderr, " access=%08x", req->access ); + TRACE_RAW( " access=%08x", req->access ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_keyed_event_reply( const struct create_keyed_event_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_keyed_event_request( const struct open_keyed_event_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_keyed_event_reply( const struct open_keyed_event_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_create_mutex_request( const struct create_mutex_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", owned=%d", req->owned ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", owned=%d", req->owned ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_mutex_reply( const struct create_mutex_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_release_mutex_request( const struct release_mutex_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_release_mutex_reply( const struct release_mutex_reply *req ) { - fprintf( stderr, " prev_count=%08x", req->prev_count ); + TRACE_RAW( " prev_count=%08x", req->prev_count ); } static void dump_open_mutex_request( const struct open_mutex_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_mutex_reply( const struct open_mutex_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_mutex_request( const struct query_mutex_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_mutex_reply( const struct query_mutex_reply *req ) { - fprintf( stderr, " count=%08x", req->count ); - fprintf( stderr, ", owned=%d", req->owned ); - fprintf( stderr, ", abandoned=%d", req->abandoned ); + TRACE_RAW( " count=%08x", req->count ); + TRACE_RAW( ", owned=%d", req->owned ); + TRACE_RAW( ", abandoned=%d", req->abandoned ); } static void dump_create_semaphore_request( const struct create_semaphore_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", initial=%08x", req->initial ); - fprintf( stderr, ", max=%08x", req->max ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", initial=%08x", req->initial ); + TRACE_RAW( ", max=%08x", req->max ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_semaphore_reply( const struct create_semaphore_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_release_semaphore_request( const struct release_semaphore_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", count=%08x", req->count ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", count=%08x", req->count ); } static void dump_release_semaphore_reply( const struct release_semaphore_reply *req ) { - fprintf( stderr, " prev_count=%08x", req->prev_count ); + TRACE_RAW( " prev_count=%08x", req->prev_count ); } static void dump_query_semaphore_request( const struct query_semaphore_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_semaphore_reply( const struct query_semaphore_reply *req ) { - fprintf( stderr, " current=%08x", req->current ); - fprintf( stderr, ", max=%08x", req->max ); + TRACE_RAW( " current=%08x", req->current ); + TRACE_RAW( ", max=%08x", req->max ); } static void dump_open_semaphore_request( const struct open_semaphore_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_semaphore_reply( const struct open_semaphore_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_create_file_request( const struct create_file_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", sharing=%08x", req->sharing ); - fprintf( stderr, ", create=%d", req->create ); - fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", attrs=%08x", req->attrs ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", sharing=%08x", req->sharing ); + TRACE_RAW( ", create=%d", req->create ); + TRACE_RAW( ", options=%08x", req->options ); + TRACE_RAW( ", attrs=%08x", req->attrs ); dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_string( ", filename=", cur_size ); } static void dump_create_file_reply( const struct create_file_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_file_object_request( const struct open_file_object_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); - fprintf( stderr, ", sharing=%08x", req->sharing ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); + TRACE_RAW( ", sharing=%08x", req->sharing ); + TRACE_RAW( ", options=%08x", req->options ); dump_varargs_unicode_str( ", filename=", cur_size ); } static void dump_open_file_object_reply( const struct open_file_object_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_alloc_file_handle_request( const struct alloc_file_handle_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", fd=%d", req->fd ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", fd=%d", req->fd ); } static void dump_alloc_file_handle_reply( const struct alloc_file_handle_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_handle_unix_name_request( const struct get_handle_unix_name_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_handle_unix_name_reply( const struct get_handle_unix_name_reply *req ) { - fprintf( stderr, " name_len=%u", req->name_len ); + TRACE_RAW( " name_len=%u", req->name_len ); dump_varargs_string( ", name=", cur_size ); } static void dump_get_handle_fd_request( const struct get_handle_fd_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_handle_fd_reply( const struct get_handle_fd_reply *req ) { - fprintf( stderr, " type=%d", req->type ); - fprintf( stderr, ", cacheable=%d", req->cacheable ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " type=%d", req->type ); + TRACE_RAW( ", cacheable=%d", req->cacheable ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", options=%08x", req->options ); } static void dump_get_directory_cache_entry_request( const struct get_directory_cache_entry_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_directory_cache_entry_reply( const struct get_directory_cache_entry_reply *req ) { - fprintf( stderr, " entry=%d", req->entry ); + TRACE_RAW( " entry=%d", req->entry ); dump_varargs_ints( ", free=", cur_size ); } @@ -703,13 +703,13 @@ static void dump_flush_request( const struct flush_request *req ) static void dump_flush_reply( const struct flush_reply *req ) { - fprintf( stderr, " event=%04x", req->event ); + TRACE_RAW( " event=%04x", req->event ); } static void dump_get_file_info_request( const struct get_file_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", info_class=%08x", req->info_class ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", info_class=%08x", req->info_class ); } static void dump_get_file_info_reply( const struct get_file_info_reply *req ) @@ -719,124 +719,124 @@ static void dump_get_file_info_reply( const struct get_file_info_reply *req ) static void dump_get_volume_info_request( const struct get_volume_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_async_data( ", async=", &req->async ); - fprintf( stderr, ", info_class=%08x", req->info_class ); + TRACE_RAW( ", info_class=%08x", req->info_class ); } static void dump_get_volume_info_reply( const struct get_volume_info_reply *req ) { - fprintf( stderr, " wait=%04x", req->wait ); + TRACE_RAW( " wait=%04x", req->wait ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_lock_file_request( const struct lock_file_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", offset=", &req->offset ); dump_uint64( ", count=", &req->count ); - fprintf( stderr, ", shared=%d", req->shared ); - fprintf( stderr, ", wait=%d", req->wait ); + TRACE_RAW( ", shared=%d", req->shared ); + TRACE_RAW( ", wait=%d", req->wait ); } static void dump_lock_file_reply( const struct lock_file_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", overlapped=%d", req->overlapped ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", overlapped=%d", req->overlapped ); } static void dump_unlock_file_request( const struct unlock_file_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", offset=", &req->offset ); dump_uint64( ", count=", &req->count ); } static void dump_recv_socket_request( const struct recv_socket_request *req ) { - fprintf( stderr, " oob=%d", req->oob ); + TRACE_RAW( " oob=%d", req->oob ); dump_async_data( ", async=", &req->async ); - fprintf( stderr, ", force_async=%d", req->force_async ); + TRACE_RAW( ", force_async=%d", req->force_async ); } static void dump_recv_socket_reply( const struct recv_socket_reply *req ) { - fprintf( stderr, " wait=%04x", req->wait ); - fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", nonblocking=%d", req->nonblocking ); + TRACE_RAW( " wait=%04x", req->wait ); + TRACE_RAW( ", options=%08x", req->options ); + TRACE_RAW( ", nonblocking=%d", req->nonblocking ); } static void dump_send_socket_request( const struct send_socket_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); + TRACE_RAW( " flags=%08x", req->flags ); dump_async_data( ", async=", &req->async ); } static void dump_send_socket_reply( const struct send_socket_reply *req ) { - fprintf( stderr, " wait=%04x", req->wait ); - fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", nonblocking=%d", req->nonblocking ); + TRACE_RAW( " wait=%04x", req->wait ); + TRACE_RAW( ", options=%08x", req->options ); + TRACE_RAW( ", nonblocking=%d", req->nonblocking ); } static void dump_socket_get_events_request( const struct socket_get_events_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", event=%04x", req->event ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", event=%04x", req->event ); } static void dump_socket_get_events_reply( const struct socket_get_events_reply *req ) { - fprintf( stderr, " flags=%08x", req->flags ); + TRACE_RAW( " flags=%08x", req->flags ); dump_varargs_uints( ", status=", cur_size ); } static void dump_socket_send_icmp_id_request( const struct socket_send_icmp_id_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", icmp_id=%04x", req->icmp_id ); - fprintf( stderr, ", icmp_seq=%04x", req->icmp_seq ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", icmp_id=%04x", req->icmp_id ); + TRACE_RAW( ", icmp_seq=%04x", req->icmp_seq ); } static void dump_socket_get_icmp_id_request( const struct socket_get_icmp_id_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", icmp_seq=%04x", req->icmp_seq ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", icmp_seq=%04x", req->icmp_seq ); } static void dump_socket_get_icmp_id_reply( const struct socket_get_icmp_id_reply *req ) { - fprintf( stderr, " icmp_id=%04x", req->icmp_id ); + TRACE_RAW( " icmp_id=%04x", req->icmp_id ); } static void dump_get_next_console_request_request( const struct get_next_console_request_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", signal=%d", req->signal ); - fprintf( stderr, ", read=%d", req->read ); - fprintf( stderr, ", status=%08x", req->status ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", signal=%d", req->signal ); + TRACE_RAW( ", read=%d", req->read ); + TRACE_RAW( ", status=%08x", req->status ); dump_varargs_bytes( ", out_data=", cur_size ); } static void dump_get_next_console_request_reply( const struct get_next_console_request_reply *req ) { - fprintf( stderr, " code=%08x", req->code ); - fprintf( stderr, ", output=%08x", req->output ); - fprintf( stderr, ", out_size=%u", req->out_size ); + TRACE_RAW( " code=%08x", req->code ); + TRACE_RAW( ", output=%08x", req->output ); + TRACE_RAW( ", out_size=%u", req->out_size ); dump_varargs_bytes( ", in_data=", cur_size ); } static void dump_read_directory_changes_request( const struct read_directory_changes_request *req ) { - fprintf( stderr, " filter=%08x", req->filter ); - fprintf( stderr, ", subtree=%d", req->subtree ); - fprintf( stderr, ", want_data=%d", req->want_data ); + TRACE_RAW( " filter=%08x", req->filter ); + TRACE_RAW( ", subtree=%d", req->subtree ); + TRACE_RAW( ", want_data=%d", req->want_data ); dump_async_data( ", async=", &req->async ); } static void dump_read_change_request( const struct read_change_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_read_change_reply( const struct read_change_reply *req ) @@ -846,45 +846,45 @@ static void dump_read_change_reply( const struct read_change_reply *req ) static void dump_create_mapping_request( const struct create_mapping_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", file_access=%08x", req->file_access ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", file_access=%08x", req->file_access ); dump_uint64( ", size=", &req->size ); - fprintf( stderr, ", file_handle=%04x", req->file_handle ); + TRACE_RAW( ", file_handle=%04x", req->file_handle ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_mapping_reply( const struct create_mapping_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_mapping_request( const struct open_mapping_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_mapping_reply( const struct open_mapping_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_mapping_info_request( const struct get_mapping_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", access=%08x", req->access ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", access=%08x", req->access ); } static void dump_get_mapping_info_reply( const struct get_mapping_info_reply *req ) { dump_uint64( " size=", &req->size ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", shared_file=%04x", req->shared_file ); - fprintf( stderr, ", name_len=%u", req->name_len ); - fprintf( stderr, ", total=%u", req->total ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", shared_file=%04x", req->shared_file ); + TRACE_RAW( ", name_len=%u", req->name_len ); + TRACE_RAW( ", total=%u", req->total ); dump_varargs_pe_image_info( ", image=", cur_size ); dump_varargs_unicode_str( ", name=", min( cur_size, req->name_len )); dump_varargs_string( ", exp_name=", cur_size ); @@ -892,7 +892,7 @@ static void dump_get_mapping_info_reply( const struct get_mapping_info_reply *re static void dump_get_image_map_address_request( const struct get_image_map_address_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_image_map_address_reply( const struct get_image_map_address_reply *req ) @@ -902,8 +902,8 @@ static void dump_get_image_map_address_reply( const struct get_image_map_address static void dump_map_view_request( const struct map_view_request *req ) { - fprintf( stderr, " mapping=%04x", req->mapping ); - fprintf( stderr, ", access=%08x", req->access ); + TRACE_RAW( " mapping=%04x", req->mapping ); + TRACE_RAW( ", access=%08x", req->access ); dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); dump_uint64( ", start=", &req->start ); @@ -911,12 +911,12 @@ static void dump_map_view_request( const struct map_view_request *req ) static void dump_map_image_view_request( const struct map_image_view_request *req ) { - fprintf( stderr, " mapping=%04x", req->mapping ); + TRACE_RAW( " mapping=%04x", req->mapping ); dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); dump_uint64( ", offset=", &req->offset ); - fprintf( stderr, ", entry=%08x", req->entry ); - fprintf( stderr, ", machine=%04x", req->machine ); + TRACE_RAW( ", entry=%08x", req->entry ); + TRACE_RAW( ", machine=%04x", req->machine ); } static void dump_map_builtin_view_request( const struct map_builtin_view_request *req ) @@ -927,7 +927,7 @@ static void dump_map_builtin_view_request( const struct map_builtin_view_request static void dump_get_image_view_info_request( const struct get_image_view_info_request *req ) { - fprintf( stderr, " process=%04x", req->process ); + TRACE_RAW( " process=%04x", req->process ); dump_uint64( ", addr=", &req->addr ); } @@ -951,7 +951,7 @@ static void dump_get_mapping_committed_range_request( const struct get_mapping_c static void dump_get_mapping_committed_range_reply( const struct get_mapping_committed_range_reply *req ) { dump_uint64( " size=", &req->size ); - fprintf( stderr, ", committed=%d", req->committed ); + TRACE_RAW( ", committed=%d", req->committed ); } static void dump_add_mapping_committed_range_request( const struct add_mapping_committed_range_request *req ) @@ -969,13 +969,13 @@ static void dump_is_same_mapping_request( const struct is_same_mapping_request * static void dump_get_mapping_filename_request( const struct get_mapping_filename_request *req ) { - fprintf( stderr, " process=%04x", req->process ); + TRACE_RAW( " process=%04x", req->process ); dump_uint64( ", addr=", &req->addr ); } static void dump_get_mapping_filename_reply( const struct get_mapping_filename_reply *req ) { - fprintf( stderr, " len=%u", req->len ); + TRACE_RAW( " len=%u", req->len ); dump_varargs_unicode_str( ", filename=", cur_size ); } @@ -985,82 +985,82 @@ static void dump_list_processes_request( const struct list_processes_request *re static void dump_list_processes_reply( const struct list_processes_reply *req ) { - fprintf( stderr, " info_size=%u", req->info_size ); - fprintf( stderr, ", process_count=%d", req->process_count ); - fprintf( stderr, ", total_thread_count=%d", req->total_thread_count ); - fprintf( stderr, ", total_name_len=%u", req->total_name_len ); + TRACE_RAW( " info_size=%u", req->info_size ); + TRACE_RAW( ", process_count=%d", req->process_count ); + TRACE_RAW( ", total_thread_count=%d", req->total_thread_count ); + TRACE_RAW( ", total_name_len=%u", req->total_name_len ); dump_varargs_process_info( ", data=", min( cur_size, req->info_size )); } static void dump_create_debug_obj_request( const struct create_debug_obj_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", flags=%08x", req->flags ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_debug_obj_reply( const struct create_debug_obj_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_wait_debug_event_request( const struct wait_debug_event_request *req ) { - fprintf( stderr, " debug=%04x", req->debug ); + TRACE_RAW( " debug=%04x", req->debug ); } static void dump_wait_debug_event_reply( const struct wait_debug_event_reply *req ) { - fprintf( stderr, " pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); + TRACE_RAW( " pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); dump_varargs_debug_event( ", event=", cur_size ); } static void dump_queue_exception_event_request( const struct queue_exception_event_request *req ) { - fprintf( stderr, " first=%d", req->first ); - fprintf( stderr, ", code=%08x", req->code ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " first=%d", req->first ); + TRACE_RAW( ", code=%08x", req->code ); + TRACE_RAW( ", flags=%08x", req->flags ); dump_uint64( ", record=", &req->record ); dump_uint64( ", address=", &req->address ); - fprintf( stderr, ", len=%u", req->len ); + TRACE_RAW( ", len=%u", req->len ); dump_varargs_uints64( ", params=", min( cur_size, req->len )); } static void dump_queue_exception_event_reply( const struct queue_exception_event_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_exception_status_request( const struct get_exception_status_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_continue_debug_event_request( const struct continue_debug_event_request *req ) { - fprintf( stderr, " debug=%04x", req->debug ); - fprintf( stderr, ", pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); - fprintf( stderr, ", status=%08x", req->status ); + TRACE_RAW( " debug=%04x", req->debug ); + TRACE_RAW( ", pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); + TRACE_RAW( ", status=%08x", req->status ); } static void dump_debug_process_request( const struct debug_process_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", debug=%04x", req->debug ); - fprintf( stderr, ", attach=%d", req->attach ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", debug=%04x", req->debug ); + TRACE_RAW( ", attach=%d", req->attach ); } static void dump_set_debug_obj_info_request( const struct set_debug_obj_info_request *req ) { - fprintf( stderr, " debug=%04x", req->debug ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " debug=%04x", req->debug ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_read_process_memory_request( const struct read_process_memory_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", addr=", &req->addr ); } @@ -1071,237 +1071,237 @@ static void dump_read_process_memory_reply( const struct read_process_memory_rep static void dump_write_process_memory_request( const struct write_process_memory_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", addr=", &req->addr ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_write_process_memory_reply( const struct write_process_memory_reply *req ) { - fprintf( stderr, " written=%u", req->written ); + TRACE_RAW( " written=%u", req->written ); } static void dump_create_key_request( const struct create_key_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", options=%08x", req->options ); dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_unicode_str( ", class=", cur_size ); } static void dump_create_key_reply( const struct create_key_reply *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); } static void dump_open_key_request( const struct open_key_request *req ) { - fprintf( stderr, " parent=%04x", req->parent ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " parent=%04x", req->parent ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_key_reply( const struct open_key_reply *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); } static void dump_delete_key_request( const struct delete_key_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); } static void dump_flush_key_request( const struct flush_key_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); } static void dump_enum_key_request( const struct enum_key_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", index=%d", req->index ); - fprintf( stderr, ", info_class=%d", req->info_class ); + TRACE_RAW( " hkey=%04x", req->hkey ); + TRACE_RAW( ", index=%d", req->index ); + TRACE_RAW( ", info_class=%d", req->info_class ); } static void dump_enum_key_reply( const struct enum_key_reply *req ) { - fprintf( stderr, " subkeys=%d", req->subkeys ); - fprintf( stderr, ", max_subkey=%d", req->max_subkey ); - fprintf( stderr, ", max_class=%d", req->max_class ); - fprintf( stderr, ", values=%d", req->values ); - fprintf( stderr, ", max_value=%d", req->max_value ); - fprintf( stderr, ", max_data=%d", req->max_data ); + TRACE_RAW( " subkeys=%d", req->subkeys ); + TRACE_RAW( ", max_subkey=%d", req->max_subkey ); + TRACE_RAW( ", max_class=%d", req->max_class ); + TRACE_RAW( ", values=%d", req->values ); + TRACE_RAW( ", max_value=%d", req->max_value ); + TRACE_RAW( ", max_data=%d", req->max_data ); dump_timeout( ", modif=", &req->modif ); - fprintf( stderr, ", total=%u", req->total ); - fprintf( stderr, ", namelen=%u", req->namelen ); + TRACE_RAW( ", total=%u", req->total ); + TRACE_RAW( ", namelen=%u", req->namelen ); dump_varargs_unicode_str( ", name=", min( cur_size, req->namelen )); dump_varargs_unicode_str( ", class=", cur_size ); } static void dump_set_key_value_request( const struct set_key_value_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", type=%d", req->type ); - fprintf( stderr, ", namelen=%u", req->namelen ); + TRACE_RAW( " hkey=%04x", req->hkey ); + TRACE_RAW( ", type=%d", req->type ); + TRACE_RAW( ", namelen=%u", req->namelen ); dump_varargs_unicode_str( ", name=", min( cur_size, req->namelen )); dump_varargs_bytes( ", data=", cur_size ); } static void dump_get_key_value_request( const struct get_key_value_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_get_key_value_reply( const struct get_key_value_reply *req ) { - fprintf( stderr, " type=%d", req->type ); - fprintf( stderr, ", total=%u", req->total ); + TRACE_RAW( " type=%d", req->type ); + TRACE_RAW( ", total=%u", req->total ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_enum_key_value_request( const struct enum_key_value_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", index=%d", req->index ); - fprintf( stderr, ", info_class=%d", req->info_class ); + TRACE_RAW( " hkey=%04x", req->hkey ); + TRACE_RAW( ", index=%d", req->index ); + TRACE_RAW( ", info_class=%d", req->info_class ); } static void dump_enum_key_value_reply( const struct enum_key_value_reply *req ) { - fprintf( stderr, " type=%d", req->type ); - fprintf( stderr, ", total=%u", req->total ); - fprintf( stderr, ", namelen=%u", req->namelen ); + TRACE_RAW( " type=%d", req->type ); + TRACE_RAW( ", total=%u", req->total ); + TRACE_RAW( ", namelen=%u", req->namelen ); dump_varargs_unicode_str( ", name=", min( cur_size, req->namelen )); dump_varargs_bytes( ", data=", cur_size ); } static void dump_delete_key_value_request( const struct delete_key_value_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_load_registry_request( const struct load_registry_request *req ) { - fprintf( stderr, " file=%04x", req->file ); + TRACE_RAW( " file=%04x", req->file ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_unload_registry_request( const struct unload_registry_request *req ) { - fprintf( stderr, " parent=%04x", req->parent ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " parent=%04x", req->parent ); + TRACE_RAW( ", attributes=%08x", req->attributes ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_save_registry_request( const struct save_registry_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", file=%04x", req->file ); + TRACE_RAW( " hkey=%04x", req->hkey ); + TRACE_RAW( ", file=%04x", req->file ); } static void dump_set_registry_notification_request( const struct set_registry_notification_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", event=%04x", req->event ); - fprintf( stderr, ", subtree=%d", req->subtree ); - fprintf( stderr, ", filter=%08x", req->filter ); + TRACE_RAW( " hkey=%04x", req->hkey ); + TRACE_RAW( ", event=%04x", req->event ); + TRACE_RAW( ", subtree=%d", req->subtree ); + TRACE_RAW( ", filter=%08x", req->filter ); } static void dump_rename_key_request( const struct rename_key_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + TRACE_RAW( " hkey=%04x", req->hkey ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_create_timer_request( const struct create_timer_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", manual=%d", req->manual ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", manual=%d", req->manual ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_timer_reply( const struct create_timer_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_timer_request( const struct open_timer_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_timer_reply( const struct open_timer_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_timer_request( const struct set_timer_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_timeout( ", expire=", &req->expire ); dump_uint64( ", callback=", &req->callback ); dump_uint64( ", arg=", &req->arg ); - fprintf( stderr, ", period=%d", req->period ); + TRACE_RAW( ", period=%d", req->period ); } static void dump_set_timer_reply( const struct set_timer_reply *req ) { - fprintf( stderr, " signaled=%d", req->signaled ); + TRACE_RAW( " signaled=%d", req->signaled ); } static void dump_cancel_timer_request( const struct cancel_timer_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_cancel_timer_reply( const struct cancel_timer_reply *req ) { - fprintf( stderr, " signaled=%d", req->signaled ); + TRACE_RAW( " signaled=%d", req->signaled ); } static void dump_get_timer_info_request( const struct get_timer_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_timer_info_reply( const struct get_timer_info_reply *req ) { dump_timeout( " when=", &req->when ); - fprintf( stderr, ", signaled=%d", req->signaled ); + TRACE_RAW( ", signaled=%d", req->signaled ); } static void dump_get_thread_context_request( const struct get_thread_context_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", context=%04x", req->context ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", native_flags=%08x", req->native_flags ); - fprintf( stderr, ", machine=%04x", req->machine ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", context=%04x", req->context ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", native_flags=%08x", req->native_flags ); + TRACE_RAW( ", machine=%04x", req->machine ); } static void dump_get_thread_context_reply( const struct get_thread_context_reply *req ) { - fprintf( stderr, " self=%d", req->self ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " self=%d", req->self ); + TRACE_RAW( ", handle=%04x", req->handle ); dump_varargs_contexts( ", contexts=", cur_size ); } static void dump_set_thread_context_request( const struct set_thread_context_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", native_flags=%08x", req->native_flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", native_flags=%08x", req->native_flags ); dump_varargs_contexts( ", contexts=", cur_size ); } static void dump_set_thread_context_reply( const struct set_thread_context_reply *req ) { - fprintf( stderr, " self=%d", req->self ); + TRACE_RAW( " self=%d", req->self ); } static void dump_add_atom_request( const struct add_atom_request *req ) @@ -1311,12 +1311,12 @@ static void dump_add_atom_request( const struct add_atom_request *req ) static void dump_add_atom_reply( const struct add_atom_reply *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); } static void dump_delete_atom_request( const struct delete_atom_request *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); } static void dump_find_atom_request( const struct find_atom_request *req ) @@ -1326,19 +1326,19 @@ static void dump_find_atom_request( const struct find_atom_request *req ) static void dump_find_atom_reply( const struct find_atom_reply *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); } static void dump_get_atom_information_request( const struct get_atom_information_request *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); } static void dump_get_atom_information_reply( const struct get_atom_information_reply *req ) { - fprintf( stderr, " count=%d", req->count ); - fprintf( stderr, ", pinned=%d", req->pinned ); - fprintf( stderr, ", total=%u", req->total ); + TRACE_RAW( " count=%d", req->count ); + TRACE_RAW( ", pinned=%d", req->pinned ); + TRACE_RAW( ", total=%u", req->total ); dump_varargs_unicode_str( ", name=", cur_size ); } @@ -1349,17 +1349,17 @@ static void dump_add_user_atom_request( const struct add_user_atom_request *req static void dump_add_user_atom_reply( const struct add_user_atom_reply *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); } static void dump_get_user_atom_name_request( const struct get_user_atom_name_request *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); } static void dump_get_user_atom_name_reply( const struct get_user_atom_name_reply *req ) { - fprintf( stderr, " total=%u", req->total ); + TRACE_RAW( " total=%u", req->total ); dump_varargs_unicode_str( ", name=", cur_size ); } @@ -1369,8 +1369,8 @@ static void dump_get_msg_queue_handle_request( const struct get_msg_queue_handle static void dump_get_msg_queue_handle_reply( const struct get_msg_queue_handle_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", idle_event=%04x", req->idle_event ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", idle_event=%04x", req->idle_event ); } static void dump_get_msg_queue_request( const struct get_msg_queue_request *req ) @@ -1384,50 +1384,50 @@ static void dump_get_msg_queue_reply( const struct get_msg_queue_reply *req ) static void dump_set_queue_fd_request( const struct set_queue_fd_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_queue_mask_request( const struct set_queue_mask_request *req ) { - fprintf( stderr, " wake_mask=%08x", req->wake_mask ); - fprintf( stderr, ", changed_mask=%08x", req->changed_mask ); - fprintf( stderr, ", poll_events=%d", req->poll_events ); + TRACE_RAW( " wake_mask=%08x", req->wake_mask ); + TRACE_RAW( ", changed_mask=%08x", req->changed_mask ); + TRACE_RAW( ", poll_events=%d", req->poll_events ); } static void dump_set_queue_mask_reply( const struct set_queue_mask_reply *req ) { - fprintf( stderr, " wake_bits=%08x", req->wake_bits ); - fprintf( stderr, ", changed_bits=%08x", req->changed_bits ); + TRACE_RAW( " wake_bits=%08x", req->wake_bits ); + TRACE_RAW( ", changed_bits=%08x", req->changed_bits ); } static void dump_get_queue_status_request( const struct get_queue_status_request *req ) { - fprintf( stderr, " clear_bits=%08x", req->clear_bits ); + TRACE_RAW( " clear_bits=%08x", req->clear_bits ); } static void dump_get_queue_status_reply( const struct get_queue_status_reply *req ) { - fprintf( stderr, " wake_bits=%08x", req->wake_bits ); - fprintf( stderr, ", changed_bits=%08x", req->changed_bits ); + TRACE_RAW( " wake_bits=%08x", req->wake_bits ); + TRACE_RAW( ", changed_bits=%08x", req->changed_bits ); } static void dump_get_process_idle_event_request( const struct get_process_idle_event_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_process_idle_event_reply( const struct get_process_idle_event_reply *req ) { - fprintf( stderr, " event=%04x", req->event ); + TRACE_RAW( " event=%04x", req->event ); } static void dump_send_message_request( const struct send_message_request *req ) { - fprintf( stderr, " id=%04x", req->id ); - fprintf( stderr, ", type=%d", req->type ); - fprintf( stderr, ", flags=%d", req->flags ); - fprintf( stderr, ", win=%08x", req->win ); - fprintf( stderr, ", msg=%08x", req->msg ); + TRACE_RAW( " id=%04x", req->id ); + TRACE_RAW( ", type=%d", req->type ); + TRACE_RAW( ", flags=%d", req->flags ); + TRACE_RAW( ", win=%08x", req->win ); + TRACE_RAW( ", msg=%08x", req->msg ); dump_uint64( ", wparam=", &req->wparam ); dump_uint64( ", lparam=", &req->lparam ); dump_timeout( ", timeout=", &req->timeout ); @@ -1436,67 +1436,67 @@ static void dump_send_message_request( const struct send_message_request *req ) static void dump_post_quit_message_request( const struct post_quit_message_request *req ) { - fprintf( stderr, " exit_code=%d", req->exit_code ); + TRACE_RAW( " exit_code=%d", req->exit_code ); } static void dump_send_hardware_message_request( const struct send_hardware_message_request *req ) { - fprintf( stderr, " win=%08x", req->win ); + TRACE_RAW( " win=%08x", req->win ); dump_hw_input( ", input=", &req->input ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( ", flags=%08x", req->flags ); dump_varargs_bytes( ", report=", cur_size ); } static void dump_send_hardware_message_reply( const struct send_hardware_message_reply *req ) { - fprintf( stderr, " wait=%d", req->wait ); - fprintf( stderr, ", prev_x=%d", req->prev_x ); - fprintf( stderr, ", prev_y=%d", req->prev_y ); - fprintf( stderr, ", new_x=%d", req->new_x ); - fprintf( stderr, ", new_y=%d", req->new_y ); + TRACE_RAW( " wait=%d", req->wait ); + TRACE_RAW( ", prev_x=%d", req->prev_x ); + TRACE_RAW( ", prev_y=%d", req->prev_y ); + TRACE_RAW( ", new_x=%d", req->new_x ); + TRACE_RAW( ", new_y=%d", req->new_y ); } static void dump_get_message_request( const struct get_message_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", get_win=%08x", req->get_win ); - fprintf( stderr, ", get_first=%08x", req->get_first ); - fprintf( stderr, ", get_last=%08x", req->get_last ); - fprintf( stderr, ", hw_id=%08x", req->hw_id ); - fprintf( stderr, ", wake_mask=%08x", req->wake_mask ); - fprintf( stderr, ", changed_mask=%08x", req->changed_mask ); - fprintf( stderr, ", internal=%08x", req->internal ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", get_win=%08x", req->get_win ); + TRACE_RAW( ", get_first=%08x", req->get_first ); + TRACE_RAW( ", get_last=%08x", req->get_last ); + TRACE_RAW( ", hw_id=%08x", req->hw_id ); + TRACE_RAW( ", wake_mask=%08x", req->wake_mask ); + TRACE_RAW( ", changed_mask=%08x", req->changed_mask ); + TRACE_RAW( ", internal=%08x", req->internal ); } static void dump_get_message_reply( const struct get_message_reply *req ) { - fprintf( stderr, " win=%08x", req->win ); - fprintf( stderr, ", msg=%08x", req->msg ); + TRACE_RAW( " win=%08x", req->win ); + TRACE_RAW( ", msg=%08x", req->msg ); dump_uint64( ", wparam=", &req->wparam ); dump_uint64( ", lparam=", &req->lparam ); - fprintf( stderr, ", type=%d", req->type ); - fprintf( stderr, ", x=%d", req->x ); - fprintf( stderr, ", y=%d", req->y ); - fprintf( stderr, ", time=%08x", req->time ); - fprintf( stderr, ", total=%u", req->total ); + TRACE_RAW( ", type=%d", req->type ); + TRACE_RAW( ", x=%d", req->x ); + TRACE_RAW( ", y=%d", req->y ); + TRACE_RAW( ", time=%08x", req->time ); + TRACE_RAW( ", total=%u", req->total ); dump_varargs_message_data( ", data=", cur_size ); } static void dump_reply_message_request( const struct reply_message_request *req ) { - fprintf( stderr, " remove=%d", req->remove ); + TRACE_RAW( " remove=%d", req->remove ); dump_uint64( ", result=", &req->result ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_accept_hardware_message_request( const struct accept_hardware_message_request *req ) { - fprintf( stderr, " hw_id=%08x", req->hw_id ); + TRACE_RAW( " hw_id=%08x", req->hw_id ); } static void dump_get_message_reply_request( const struct get_message_reply_request *req ) { - fprintf( stderr, " cancel=%d", req->cancel ); + TRACE_RAW( " cancel=%d", req->cancel ); } static void dump_get_message_reply_reply( const struct get_message_reply_reply *req ) @@ -1507,9 +1507,9 @@ static void dump_get_message_reply_reply( const struct get_message_reply_reply * static void dump_set_win_timer_request( const struct set_win_timer_request *req ) { - fprintf( stderr, " win=%08x", req->win ); - fprintf( stderr, ", msg=%08x", req->msg ); - fprintf( stderr, ", rate=%08x", req->rate ); + TRACE_RAW( " win=%08x", req->win ); + TRACE_RAW( ", msg=%08x", req->msg ); + TRACE_RAW( ", rate=%08x", req->rate ); dump_uint64( ", id=", &req->id ); dump_uint64( ", lparam=", &req->lparam ); } @@ -1521,62 +1521,62 @@ static void dump_set_win_timer_reply( const struct set_win_timer_reply *req ) static void dump_kill_win_timer_request( const struct kill_win_timer_request *req ) { - fprintf( stderr, " win=%08x", req->win ); + TRACE_RAW( " win=%08x", req->win ); dump_uint64( ", id=", &req->id ); - fprintf( stderr, ", msg=%08x", req->msg ); + TRACE_RAW( ", msg=%08x", req->msg ); } static void dump_is_window_hung_request( const struct is_window_hung_request *req ) { - fprintf( stderr, " win=%08x", req->win ); + TRACE_RAW( " win=%08x", req->win ); } static void dump_is_window_hung_reply( const struct is_window_hung_reply *req ) { - fprintf( stderr, " is_hung=%d", req->is_hung ); + TRACE_RAW( " is_hung=%d", req->is_hung ); } static void dump_get_serial_info_request( const struct get_serial_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%d", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%d", req->flags ); } static void dump_get_serial_info_reply( const struct get_serial_info_reply *req ) { - fprintf( stderr, " eventmask=%08x", req->eventmask ); - fprintf( stderr, ", pending_write=%08x", req->pending_write ); + TRACE_RAW( " eventmask=%08x", req->eventmask ); + TRACE_RAW( ", pending_write=%08x", req->pending_write ); } static void dump_set_serial_info_request( const struct set_serial_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%d", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%d", req->flags ); } static void dump_cancel_sync_request( const struct cancel_sync_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", iosb=", &req->iosb ); } static void dump_register_async_request( const struct register_async_request *req ) { - fprintf( stderr, " type=%d", req->type ); + TRACE_RAW( " type=%d", req->type ); dump_async_data( ", async=", &req->async ); - fprintf( stderr, ", count=%d", req->count ); + TRACE_RAW( ", count=%d", req->count ); } static void dump_cancel_async_request( const struct cancel_async_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", iosb=", &req->iosb ); - fprintf( stderr, ", only_thread=%d", req->only_thread ); + TRACE_RAW( ", only_thread=%d", req->only_thread ); } static void dump_cancel_async_reply( const struct cancel_async_reply *req ) { - fprintf( stderr, " cancel_handle=%04x", req->cancel_handle ); + TRACE_RAW( " cancel_handle=%04x", req->cancel_handle ); } static void dump_get_async_result_request( const struct get_async_result_request *req ) @@ -1591,15 +1591,15 @@ static void dump_get_async_result_reply( const struct get_async_result_reply *re static void dump_set_async_direct_result_request( const struct set_async_direct_result_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", information=", &req->information ); - fprintf( stderr, ", status=%08x", req->status ); - fprintf( stderr, ", mark_pending=%d", req->mark_pending ); + TRACE_RAW( ", status=%08x", req->status ); + TRACE_RAW( ", mark_pending=%d", req->mark_pending ); } static void dump_set_async_direct_result_reply( const struct set_async_direct_result_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_read_request( const struct read_request *req ) @@ -1610,8 +1610,8 @@ static void dump_read_request( const struct read_request *req ) static void dump_read_reply( const struct read_reply *req ) { - fprintf( stderr, " wait=%04x", req->wait ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " wait=%04x", req->wait ); + TRACE_RAW( ", options=%08x", req->options ); dump_varargs_bytes( ", data=", cur_size ); } @@ -1624,9 +1624,9 @@ static void dump_write_request( const struct write_request *req ) static void dump_write_reply( const struct write_reply *req ) { - fprintf( stderr, " wait=%04x", req->wait ); - fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", size=%u", req->size ); + TRACE_RAW( " wait=%04x", req->wait ); + TRACE_RAW( ", options=%08x", req->options ); + TRACE_RAW( ", size=%u", req->size ); } static void dump_ioctl_request( const struct ioctl_request *req ) @@ -1638,122 +1638,122 @@ static void dump_ioctl_request( const struct ioctl_request *req ) static void dump_ioctl_reply( const struct ioctl_reply *req ) { - fprintf( stderr, " wait=%04x", req->wait ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " wait=%04x", req->wait ); + TRACE_RAW( ", options=%08x", req->options ); dump_varargs_bytes( ", out_data=", cur_size ); } static void dump_set_irp_result_request( const struct set_irp_result_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", status=%08x", req->status ); - fprintf( stderr, ", size=%u", req->size ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", status=%08x", req->status ); + TRACE_RAW( ", size=%u", req->size ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_create_named_pipe_request( const struct create_named_pipe_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", sharing=%08x", req->sharing ); - fprintf( stderr, ", disposition=%08x", req->disposition ); - fprintf( stderr, ", maxinstances=%08x", req->maxinstances ); - fprintf( stderr, ", outsize=%08x", req->outsize ); - fprintf( stderr, ", insize=%08x", req->insize ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", options=%08x", req->options ); + TRACE_RAW( ", sharing=%08x", req->sharing ); + TRACE_RAW( ", disposition=%08x", req->disposition ); + TRACE_RAW( ", maxinstances=%08x", req->maxinstances ); + TRACE_RAW( ", outsize=%08x", req->outsize ); + TRACE_RAW( ", insize=%08x", req->insize ); dump_timeout( ", timeout=", &req->timeout ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( ", flags=%08x", req->flags ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_named_pipe_reply( const struct create_named_pipe_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", created=%d", req->created ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", created=%d", req->created ); } static void dump_set_named_pipe_info_request( const struct set_named_pipe_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_create_window_request( const struct create_window_request *req ) { - fprintf( stderr, " parent=%08x", req->parent ); - fprintf( stderr, ", owner=%08x", req->owner ); - fprintf( stderr, ", atom=%04x", req->atom ); + TRACE_RAW( " parent=%08x", req->parent ); + TRACE_RAW( ", owner=%08x", req->owner ); + TRACE_RAW( ", atom=%04x", req->atom ); dump_uint64( ", class_instance=", &req->class_instance ); dump_uint64( ", instance=", &req->instance ); - fprintf( stderr, ", dpi_context=%08x", req->dpi_context ); - fprintf( stderr, ", style=%08x", req->style ); - fprintf( stderr, ", ex_style=%08x", req->ex_style ); + TRACE_RAW( ", dpi_context=%08x", req->dpi_context ); + TRACE_RAW( ", style=%08x", req->style ); + TRACE_RAW( ", ex_style=%08x", req->ex_style ); dump_varargs_unicode_str( ", class=", cur_size ); } static void dump_create_window_reply( const struct create_window_reply *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", parent=%08x", req->parent ); - fprintf( stderr, ", owner=%08x", req->owner ); - fprintf( stderr, ", extra=%d", req->extra ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", parent=%08x", req->parent ); + TRACE_RAW( ", owner=%08x", req->owner ); + TRACE_RAW( ", extra=%d", req->extra ); dump_uint64( ", class_ptr=", &req->class_ptr ); } static void dump_destroy_window_request( const struct destroy_window_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_get_desktop_window_request( const struct get_desktop_window_request *req ) { - fprintf( stderr, " force=%d", req->force ); + TRACE_RAW( " force=%d", req->force ); } static void dump_get_desktop_window_reply( const struct get_desktop_window_reply *req ) { - fprintf( stderr, " top_window=%08x", req->top_window ); - fprintf( stderr, ", msg_window=%08x", req->msg_window ); + TRACE_RAW( " top_window=%08x", req->top_window ); + TRACE_RAW( ", msg_window=%08x", req->msg_window ); } static void dump_set_window_owner_request( const struct set_window_owner_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", owner=%08x", req->owner ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", owner=%08x", req->owner ); } static void dump_set_window_owner_reply( const struct set_window_owner_reply *req ) { - fprintf( stderr, " full_owner=%08x", req->full_owner ); - fprintf( stderr, ", prev_owner=%08x", req->prev_owner ); + TRACE_RAW( " full_owner=%08x", req->full_owner ); + TRACE_RAW( ", prev_owner=%08x", req->prev_owner ); } static void dump_get_window_info_request( const struct get_window_info_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", offset=%d", req->offset ); - fprintf( stderr, ", size=%u", req->size ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", offset=%d", req->offset ); + TRACE_RAW( ", size=%u", req->size ); } static void dump_get_window_info_reply( const struct get_window_info_reply *req ) { - fprintf( stderr, " last_active=%08x", req->last_active ); - fprintf( stderr, ", is_unicode=%d", req->is_unicode ); + TRACE_RAW( " last_active=%08x", req->last_active ); + TRACE_RAW( ", is_unicode=%d", req->is_unicode ); dump_uint64( ", info=", &req->info ); } static void dump_init_window_info_request( const struct init_window_info_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", style=%08x", req->style ); - fprintf( stderr, ", ex_style=%08x", req->ex_style ); - fprintf( stderr, ", is_unicode=%d", req->is_unicode ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", style=%08x", req->style ); + TRACE_RAW( ", ex_style=%08x", req->ex_style ); + TRACE_RAW( ", is_unicode=%d", req->is_unicode ); } static void dump_set_window_info_request( const struct set_window_info_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", offset=%d", req->offset ); - fprintf( stderr, ", size=%u", req->size ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", offset=%d", req->offset ); + TRACE_RAW( ", size=%u", req->size ); dump_uint64( ", new_info=", &req->new_info ); } @@ -1764,93 +1764,93 @@ static void dump_set_window_info_reply( const struct set_window_info_reply *req static void dump_set_parent_request( const struct set_parent_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", parent=%08x", req->parent ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", parent=%08x", req->parent ); } static void dump_set_parent_reply( const struct set_parent_reply *req ) { - fprintf( stderr, " old_parent=%08x", req->old_parent ); - fprintf( stderr, ", full_parent=%08x", req->full_parent ); + TRACE_RAW( " old_parent=%08x", req->old_parent ); + TRACE_RAW( ", full_parent=%08x", req->full_parent ); } static void dump_get_window_parents_request( const struct get_window_parents_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_get_window_parents_reply( const struct get_window_parents_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); dump_varargs_user_handles( ", parents=", cur_size ); } static void dump_get_window_list_request( const struct get_window_list_request *req ) { - fprintf( stderr, " desktop=%04x", req->desktop ); - fprintf( stderr, ", handle=%08x", req->handle ); - fprintf( stderr, ", tid=%04x", req->tid ); - fprintf( stderr, ", children=%d", req->children ); + TRACE_RAW( " desktop=%04x", req->desktop ); + TRACE_RAW( ", handle=%08x", req->handle ); + TRACE_RAW( ", tid=%04x", req->tid ); + TRACE_RAW( ", children=%d", req->children ); } static void dump_get_window_list_reply( const struct get_window_list_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); dump_varargs_user_handles( ", windows=", cur_size ); } static void dump_get_class_windows_request( const struct get_class_windows_request *req ) { - fprintf( stderr, " parent=%08x", req->parent ); - fprintf( stderr, ", child=%08x", req->child ); - fprintf( stderr, ", atom=%04x", req->atom ); + TRACE_RAW( " parent=%08x", req->parent ); + TRACE_RAW( ", child=%08x", req->child ); + TRACE_RAW( ", atom=%04x", req->atom ); dump_varargs_unicode_str( ", class=", cur_size ); } static void dump_get_class_windows_reply( const struct get_class_windows_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); dump_varargs_user_handles( ", children=", cur_size ); } static void dump_get_window_children_from_point_request( const struct get_window_children_from_point_request *req ) { - fprintf( stderr, " parent=%08x", req->parent ); - fprintf( stderr, ", x=%d", req->x ); - fprintf( stderr, ", y=%d", req->y ); - fprintf( stderr, ", dpi=%d", req->dpi ); + TRACE_RAW( " parent=%08x", req->parent ); + TRACE_RAW( ", x=%d", req->x ); + TRACE_RAW( ", y=%d", req->y ); + TRACE_RAW( ", dpi=%d", req->dpi ); } static void dump_get_window_children_from_point_reply( const struct get_window_children_from_point_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); dump_varargs_user_handles( ", children=", cur_size ); } static void dump_get_window_tree_request( const struct get_window_tree_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_get_window_tree_reply( const struct get_window_tree_reply *req ) { - fprintf( stderr, " parent=%08x", req->parent ); - fprintf( stderr, ", owner=%08x", req->owner ); - fprintf( stderr, ", next_sibling=%08x", req->next_sibling ); - fprintf( stderr, ", prev_sibling=%08x", req->prev_sibling ); - fprintf( stderr, ", first_sibling=%08x", req->first_sibling ); - fprintf( stderr, ", last_sibling=%08x", req->last_sibling ); - fprintf( stderr, ", first_child=%08x", req->first_child ); - fprintf( stderr, ", last_child=%08x", req->last_child ); + TRACE_RAW( " parent=%08x", req->parent ); + TRACE_RAW( ", owner=%08x", req->owner ); + TRACE_RAW( ", next_sibling=%08x", req->next_sibling ); + TRACE_RAW( ", prev_sibling=%08x", req->prev_sibling ); + TRACE_RAW( ", first_sibling=%08x", req->first_sibling ); + TRACE_RAW( ", last_sibling=%08x", req->last_sibling ); + TRACE_RAW( ", first_child=%08x", req->first_child ); + TRACE_RAW( ", last_child=%08x", req->last_child ); } static void dump_set_window_pos_request( const struct set_window_pos_request *req ) { - fprintf( stderr, " swp_flags=%04x", req->swp_flags ); - fprintf( stderr, ", paint_flags=%04x", req->paint_flags ); - fprintf( stderr, ", monitor_dpi=%08x", req->monitor_dpi ); - fprintf( stderr, ", handle=%08x", req->handle ); - fprintf( stderr, ", previous=%08x", req->previous ); + TRACE_RAW( " swp_flags=%04x", req->swp_flags ); + TRACE_RAW( ", paint_flags=%04x", req->paint_flags ); + TRACE_RAW( ", monitor_dpi=%08x", req->monitor_dpi ); + TRACE_RAW( ", handle=%08x", req->handle ); + TRACE_RAW( ", previous=%08x", req->previous ); dump_rectangle( ", window=", &req->window ); dump_rectangle( ", client=", &req->client ); dump_varargs_rectangles( ", valid=", cur_size ); @@ -1858,16 +1858,16 @@ static void dump_set_window_pos_request( const struct set_window_pos_request *re static void dump_set_window_pos_reply( const struct set_window_pos_reply *req ) { - fprintf( stderr, " new_style=%08x", req->new_style ); - fprintf( stderr, ", new_ex_style=%08x", req->new_ex_style ); - fprintf( stderr, ", surface_win=%08x", req->surface_win ); + TRACE_RAW( " new_style=%08x", req->new_style ); + TRACE_RAW( ", new_ex_style=%08x", req->new_ex_style ); + TRACE_RAW( ", surface_win=%08x", req->surface_win ); } static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", relative=%d", req->relative ); - fprintf( stderr, ", dpi=%d", req->dpi ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", relative=%d", req->relative ); + TRACE_RAW( ", dpi=%d", req->dpi ); } static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req ) @@ -1878,111 +1878,111 @@ static void dump_get_window_rectangles_reply( const struct get_window_rectangles static void dump_get_window_text_request( const struct get_window_text_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_get_window_text_reply( const struct get_window_text_reply *req ) { - fprintf( stderr, " length=%u", req->length ); + TRACE_RAW( " length=%u", req->length ); dump_varargs_unicode_str( ", text=", cur_size ); } static void dump_set_window_text_request( const struct set_window_text_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); dump_varargs_unicode_str( ", text=", cur_size ); } static void dump_get_windows_offset_request( const struct get_windows_offset_request *req ) { - fprintf( stderr, " from=%08x", req->from ); - fprintf( stderr, ", to=%08x", req->to ); - fprintf( stderr, ", dpi=%d", req->dpi ); + TRACE_RAW( " from=%08x", req->from ); + TRACE_RAW( ", to=%08x", req->to ); + TRACE_RAW( ", dpi=%d", req->dpi ); } static void dump_get_windows_offset_reply( const struct get_windows_offset_reply *req ) { - fprintf( stderr, " x=%d", req->x ); - fprintf( stderr, ", y=%d", req->y ); - fprintf( stderr, ", mirror=%d", req->mirror ); + TRACE_RAW( " x=%d", req->x ); + TRACE_RAW( ", y=%d", req->y ); + TRACE_RAW( ", mirror=%d", req->mirror ); } static void dump_get_visible_region_request( const struct get_visible_region_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_get_visible_region_reply( const struct get_visible_region_reply *req ) { - fprintf( stderr, " top_win=%08x", req->top_win ); + TRACE_RAW( " top_win=%08x", req->top_win ); dump_rectangle( ", top_rect=", &req->top_rect ); dump_rectangle( ", win_rect=", &req->win_rect ); - fprintf( stderr, ", paint_flags=%08x", req->paint_flags ); - fprintf( stderr, ", total_size=%u", req->total_size ); + TRACE_RAW( ", paint_flags=%08x", req->paint_flags ); + TRACE_RAW( ", total_size=%u", req->total_size ); dump_varargs_rectangles( ", region=", cur_size ); } static void dump_get_window_region_request( const struct get_window_region_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", surface=%d", req->surface ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", surface=%d", req->surface ); } static void dump_get_window_region_reply( const struct get_window_region_reply *req ) { dump_rectangle( " visible_rect=", &req->visible_rect ); - fprintf( stderr, ", total_size=%u", req->total_size ); + TRACE_RAW( ", total_size=%u", req->total_size ); dump_varargs_rectangles( ", region=", cur_size ); } static void dump_set_window_region_request( const struct set_window_region_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", redraw=%d", req->redraw ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", redraw=%d", req->redraw ); dump_varargs_rectangles( ", region=", cur_size ); } static void dump_get_update_region_request( const struct get_update_region_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", from_child=%08x", req->from_child ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", from_child=%08x", req->from_child ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_get_update_region_reply( const struct get_update_region_reply *req ) { - fprintf( stderr, " child=%08x", req->child ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", total_size=%u", req->total_size ); + TRACE_RAW( " child=%08x", req->child ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", total_size=%u", req->total_size ); dump_varargs_rectangles( ", region=", cur_size ); } static void dump_update_window_zorder_request( const struct update_window_zorder_request *req ) { - fprintf( stderr, " window=%08x", req->window ); + TRACE_RAW( " window=%08x", req->window ); dump_rectangle( ", rect=", &req->rect ); } static void dump_redraw_window_request( const struct redraw_window_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", flags=%08x", req->flags ); dump_varargs_rectangles( ", region=", cur_size ); } static void dump_set_window_property_request( const struct set_window_property_request *req ) { - fprintf( stderr, " window=%08x", req->window ); + TRACE_RAW( " window=%08x", req->window ); dump_uint64( ", data=", &req->data ); - fprintf( stderr, ", atom=%04x", req->atom ); + TRACE_RAW( ", atom=%04x", req->atom ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_remove_window_property_request( const struct remove_window_property_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", atom=%04x", req->atom ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", atom=%04x", req->atom ); dump_varargs_unicode_str( ", name=", cur_size ); } @@ -1993,8 +1993,8 @@ static void dump_remove_window_property_reply( const struct remove_window_proper static void dump_get_window_property_request( const struct get_window_property_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", atom=%04x", req->atom ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", atom=%04x", req->atom ); dump_varargs_unicode_str( ", name=", cur_size ); } @@ -2005,50 +2005,50 @@ static void dump_get_window_property_reply( const struct get_window_property_rep static void dump_get_window_properties_request( const struct get_window_properties_request *req ) { - fprintf( stderr, " window=%08x", req->window ); + TRACE_RAW( " window=%08x", req->window ); } static void dump_get_window_properties_reply( const struct get_window_properties_reply *req ) { - fprintf( stderr, " total=%d", req->total ); + TRACE_RAW( " total=%d", req->total ); dump_varargs_properties( ", props=", cur_size ); } static void dump_create_winstation_request( const struct create_winstation_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_create_winstation_reply( const struct create_winstation_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_winstation_request( const struct open_winstation_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_winstation_reply( const struct open_winstation_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_close_winstation_request( const struct close_winstation_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_winstation_monitors_request( const struct set_winstation_monitors_request *req ) { - fprintf( stderr, " increment=%d", req->increment ); + TRACE_RAW( " increment=%d", req->increment ); dump_varargs_monitor_infos( ", infos=", cur_size ); } @@ -2063,89 +2063,89 @@ static void dump_get_process_winstation_request( const struct get_process_winsta static void dump_get_process_winstation_reply( const struct get_process_winstation_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_process_winstation_request( const struct set_process_winstation_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_enum_winstation_request( const struct enum_winstation_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_enum_winstation_reply( const struct enum_winstation_reply *req ) { - fprintf( stderr, " count=%u", req->count ); - fprintf( stderr, ", total=%u", req->total ); + TRACE_RAW( " count=%u", req->count ); + TRACE_RAW( ", total=%u", req->total ); dump_varargs_unicode_strings( ", names=", cur_size ); } static void dump_create_desktop_request( const struct create_desktop_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_create_desktop_reply( const struct create_desktop_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_desktop_request( const struct open_desktop_request *req ) { - fprintf( stderr, " winsta=%04x", req->winsta ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " winsta=%04x", req->winsta ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_desktop_reply( const struct open_desktop_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_input_desktop_request( const struct open_input_desktop_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); } static void dump_open_input_desktop_reply( const struct open_input_desktop_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_input_desktop_request( const struct set_input_desktop_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_close_desktop_request( const struct close_desktop_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_thread_desktop_request( const struct get_thread_desktop_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); + TRACE_RAW( " tid=%04x", req->tid ); } static void dump_get_thread_desktop_reply( const struct get_thread_desktop_reply *req ) { dump_obj_locator( " locator=", &req->locator ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_set_thread_desktop_request( const struct set_thread_desktop_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_thread_desktop_reply( const struct set_thread_desktop_reply *req ) @@ -2155,55 +2155,55 @@ static void dump_set_thread_desktop_reply( const struct set_thread_desktop_reply static void dump_set_user_object_info_request( const struct set_user_object_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", obj_flags=%08x", req->obj_flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", obj_flags=%08x", req->obj_flags ); } static void dump_set_user_object_info_reply( const struct set_user_object_info_reply *req ) { - fprintf( stderr, " is_desktop=%d", req->is_desktop ); - fprintf( stderr, ", old_obj_flags=%08x", req->old_obj_flags ); + TRACE_RAW( " is_desktop=%d", req->is_desktop ); + TRACE_RAW( ", old_obj_flags=%08x", req->old_obj_flags ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_register_hotkey_request( const struct register_hotkey_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", id=%d", req->id ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", vkey=%08x", req->vkey ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", id=%d", req->id ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", vkey=%08x", req->vkey ); } static void dump_register_hotkey_reply( const struct register_hotkey_reply *req ) { - fprintf( stderr, " replaced=%d", req->replaced ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", vkey=%08x", req->vkey ); + TRACE_RAW( " replaced=%d", req->replaced ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", vkey=%08x", req->vkey ); } static void dump_unregister_hotkey_request( const struct unregister_hotkey_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", id=%d", req->id ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", id=%d", req->id ); } static void dump_unregister_hotkey_reply( const struct unregister_hotkey_reply *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", vkey=%08x", req->vkey ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", vkey=%08x", req->vkey ); } static void dump_attach_thread_input_request( const struct attach_thread_input_request *req ) { - fprintf( stderr, " tid_from=%04x", req->tid_from ); - fprintf( stderr, ", tid_to=%04x", req->tid_to ); - fprintf( stderr, ", attach=%d", req->attach ); + TRACE_RAW( " tid_from=%04x", req->tid_from ); + TRACE_RAW( ", tid_to=%04x", req->tid_to ); + TRACE_RAW( ", attach=%d", req->attach ); } static void dump_get_thread_input_request( const struct get_thread_input_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); + TRACE_RAW( " tid=%04x", req->tid ); } static void dump_get_thread_input_reply( const struct get_thread_input_reply *req ) @@ -2217,196 +2217,196 @@ static void dump_get_last_input_time_request( const struct get_last_input_time_r static void dump_get_last_input_time_reply( const struct get_last_input_time_reply *req ) { - fprintf( stderr, " time=%08x", req->time ); + TRACE_RAW( " time=%08x", req->time ); } static void dump_get_key_state_request( const struct get_key_state_request *req ) { - fprintf( stderr, " async=%d", req->async ); - fprintf( stderr, ", key=%d", req->key ); + TRACE_RAW( " async=%d", req->async ); + TRACE_RAW( ", key=%d", req->key ); } static void dump_get_key_state_reply( const struct get_key_state_reply *req ) { - fprintf( stderr, " state=%02x", req->state ); + TRACE_RAW( " state=%02x", req->state ); } static void dump_set_key_state_request( const struct set_key_state_request *req ) { - fprintf( stderr, " async=%d", req->async ); + TRACE_RAW( " async=%d", req->async ); dump_varargs_bytes( ", keystate=", cur_size ); } static void dump_set_foreground_window_request( const struct set_foreground_window_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", internal=%d", req->internal ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", internal=%d", req->internal ); } static void dump_set_foreground_window_reply( const struct set_foreground_window_reply *req ) { - fprintf( stderr, " previous=%08x", req->previous ); - fprintf( stderr, ", send_msg_old=%d", req->send_msg_old ); - fprintf( stderr, ", send_msg_new=%d", req->send_msg_new ); + TRACE_RAW( " previous=%08x", req->previous ); + TRACE_RAW( ", send_msg_old=%d", req->send_msg_old ); + TRACE_RAW( ", send_msg_new=%d", req->send_msg_new ); } static void dump_set_focus_window_request( const struct set_focus_window_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_set_focus_window_reply( const struct set_focus_window_reply *req ) { - fprintf( stderr, " previous=%08x", req->previous ); + TRACE_RAW( " previous=%08x", req->previous ); } static void dump_set_active_window_request( const struct set_active_window_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_set_active_window_reply( const struct set_active_window_reply *req ) { - fprintf( stderr, " previous=%08x", req->previous ); + TRACE_RAW( " previous=%08x", req->previous ); } static void dump_set_capture_window_request( const struct set_capture_window_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_set_capture_window_reply( const struct set_capture_window_reply *req ) { - fprintf( stderr, " previous=%08x", req->previous ); - fprintf( stderr, ", full_handle=%08x", req->full_handle ); + TRACE_RAW( " previous=%08x", req->previous ); + TRACE_RAW( ", full_handle=%08x", req->full_handle ); } static void dump_set_caret_window_request( const struct set_caret_window_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", width=%d", req->width ); - fprintf( stderr, ", height=%d", req->height ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", width=%d", req->width ); + TRACE_RAW( ", height=%d", req->height ); } static void dump_set_caret_window_reply( const struct set_caret_window_reply *req ) { - fprintf( stderr, " previous=%08x", req->previous ); + TRACE_RAW( " previous=%08x", req->previous ); dump_rectangle( ", old_rect=", &req->old_rect ); - fprintf( stderr, ", old_hide=%d", req->old_hide ); - fprintf( stderr, ", old_state=%d", req->old_state ); + TRACE_RAW( ", old_hide=%d", req->old_hide ); + TRACE_RAW( ", old_state=%d", req->old_state ); } static void dump_set_caret_info_request( const struct set_caret_info_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", handle=%08x", req->handle ); - fprintf( stderr, ", x=%d", req->x ); - fprintf( stderr, ", y=%d", req->y ); - fprintf( stderr, ", hide=%d", req->hide ); - fprintf( stderr, ", state=%d", req->state ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", handle=%08x", req->handle ); + TRACE_RAW( ", x=%d", req->x ); + TRACE_RAW( ", y=%d", req->y ); + TRACE_RAW( ", hide=%d", req->hide ); + TRACE_RAW( ", state=%d", req->state ); } static void dump_set_caret_info_reply( const struct set_caret_info_reply *req ) { - fprintf( stderr, " full_handle=%08x", req->full_handle ); + TRACE_RAW( " full_handle=%08x", req->full_handle ); dump_rectangle( ", old_rect=", &req->old_rect ); - fprintf( stderr, ", old_hide=%d", req->old_hide ); - fprintf( stderr, ", old_state=%d", req->old_state ); + TRACE_RAW( ", old_hide=%d", req->old_hide ); + TRACE_RAW( ", old_state=%d", req->old_state ); } static void dump_set_hook_request( const struct set_hook_request *req ) { - fprintf( stderr, " id=%d", req->id ); - fprintf( stderr, ", pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); - fprintf( stderr, ", event_min=%d", req->event_min ); - fprintf( stderr, ", event_max=%d", req->event_max ); + TRACE_RAW( " id=%d", req->id ); + TRACE_RAW( ", pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); + TRACE_RAW( ", event_min=%d", req->event_min ); + TRACE_RAW( ", event_max=%d", req->event_max ); dump_uint64( ", proc=", &req->proc ); - fprintf( stderr, ", flags=%d", req->flags ); - fprintf( stderr, ", unicode=%d", req->unicode ); + TRACE_RAW( ", flags=%d", req->flags ); + TRACE_RAW( ", unicode=%d", req->unicode ); dump_varargs_unicode_str( ", module=", cur_size ); } static void dump_set_hook_reply( const struct set_hook_reply *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_remove_hook_request( const struct remove_hook_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); dump_uint64( ", proc=", &req->proc ); - fprintf( stderr, ", id=%d", req->id ); + TRACE_RAW( ", id=%d", req->id ); } static void dump_start_hook_chain_request( const struct start_hook_chain_request *req ) { - fprintf( stderr, " id=%d", req->id ); - fprintf( stderr, ", event=%d", req->event ); - fprintf( stderr, ", window=%08x", req->window ); - fprintf( stderr, ", object_id=%d", req->object_id ); - fprintf( stderr, ", child_id=%d", req->child_id ); + TRACE_RAW( " id=%d", req->id ); + TRACE_RAW( ", event=%d", req->event ); + TRACE_RAW( ", window=%08x", req->window ); + TRACE_RAW( ", object_id=%d", req->object_id ); + TRACE_RAW( ", child_id=%d", req->child_id ); } static void dump_start_hook_chain_reply( const struct start_hook_chain_reply *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); - fprintf( stderr, ", unicode=%d", req->unicode ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); + TRACE_RAW( ", unicode=%d", req->unicode ); dump_uint64( ", proc=", &req->proc ); dump_varargs_unicode_str( ", module=", cur_size ); } static void dump_finish_hook_chain_request( const struct finish_hook_chain_request *req ) { - fprintf( stderr, " id=%d", req->id ); + TRACE_RAW( " id=%d", req->id ); } static void dump_get_hook_info_request( const struct get_hook_info_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", get_next=%d", req->get_next ); - fprintf( stderr, ", event=%d", req->event ); - fprintf( stderr, ", window=%08x", req->window ); - fprintf( stderr, ", object_id=%d", req->object_id ); - fprintf( stderr, ", child_id=%d", req->child_id ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", get_next=%d", req->get_next ); + TRACE_RAW( ", event=%d", req->event ); + TRACE_RAW( ", window=%08x", req->window ); + TRACE_RAW( ", object_id=%d", req->object_id ); + TRACE_RAW( ", child_id=%d", req->child_id ); } static void dump_get_hook_info_reply( const struct get_hook_info_reply *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", id=%d", req->id ); - fprintf( stderr, ", pid=%04x", req->pid ); - fprintf( stderr, ", tid=%04x", req->tid ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", id=%d", req->id ); + TRACE_RAW( ", pid=%04x", req->pid ); + TRACE_RAW( ", tid=%04x", req->tid ); dump_uint64( ", proc=", &req->proc ); - fprintf( stderr, ", unicode=%d", req->unicode ); + TRACE_RAW( ", unicode=%d", req->unicode ); dump_varargs_unicode_str( ", module=", cur_size ); } static void dump_create_class_request( const struct create_class_request *req ) { - fprintf( stderr, " local=%d", req->local ); - fprintf( stderr, ", atom=%04x", req->atom ); - fprintf( stderr, ", style=%08x", req->style ); + TRACE_RAW( " local=%d", req->local ); + TRACE_RAW( ", atom=%04x", req->atom ); + TRACE_RAW( ", style=%08x", req->style ); dump_uint64( ", instance=", &req->instance ); dump_uint64( ", client_ptr=", &req->client_ptr ); - fprintf( stderr, ", cls_extra=%d", req->cls_extra ); - fprintf( stderr, ", win_extra=%d", req->win_extra ); - fprintf( stderr, ", name_offset=%u", req->name_offset ); + TRACE_RAW( ", cls_extra=%d", req->cls_extra ); + TRACE_RAW( ", win_extra=%d", req->win_extra ); + TRACE_RAW( ", name_offset=%u", req->name_offset ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_create_class_reply( const struct create_class_reply *req ) { dump_obj_locator( " locator=", &req->locator ); - fprintf( stderr, ", atom=%04x", req->atom ); + TRACE_RAW( ", atom=%04x", req->atom ); } static void dump_destroy_class_request( const struct destroy_class_request *req ) { - fprintf( stderr, " atom=%04x", req->atom ); + TRACE_RAW( " atom=%04x", req->atom ); dump_uint64( ", instance=", &req->instance ); dump_varargs_unicode_str( ", name=", cur_size ); } @@ -2418,9 +2418,9 @@ static void dump_destroy_class_reply( const struct destroy_class_reply *req ) static void dump_set_class_info_request( const struct set_class_info_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", offset=%d", req->offset ); - fprintf( stderr, ", size=%u", req->size ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", offset=%d", req->offset ); + TRACE_RAW( ", size=%u", req->size ); dump_uint64( ", new_info=", &req->new_info ); } @@ -2431,9 +2431,9 @@ static void dump_set_class_info_reply( const struct set_class_info_reply *req ) static void dump_get_class_info_request( const struct get_class_info_request *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", offset=%d", req->offset ); - fprintf( stderr, ", size=%u", req->size ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", offset=%d", req->offset ); + TRACE_RAW( ", size=%u", req->size ); } static void dump_get_class_info_reply( const struct get_class_info_reply *req ) @@ -2443,12 +2443,12 @@ static void dump_get_class_info_reply( const struct get_class_info_reply *req ) static void dump_open_clipboard_request( const struct open_clipboard_request *req ) { - fprintf( stderr, " window=%08x", req->window ); + TRACE_RAW( " window=%08x", req->window ); } static void dump_open_clipboard_reply( const struct open_clipboard_reply *req ) { - fprintf( stderr, " owner=%08x", req->owner ); + TRACE_RAW( " owner=%08x", req->owner ); } static void dump_close_clipboard_request( const struct close_clipboard_request *req ) @@ -2457,8 +2457,8 @@ static void dump_close_clipboard_request( const struct close_clipboard_request * static void dump_close_clipboard_reply( const struct close_clipboard_reply *req ) { - fprintf( stderr, " viewer=%08x", req->viewer ); - fprintf( stderr, ", owner=%08x", req->owner ); + TRACE_RAW( " viewer=%08x", req->viewer ); + TRACE_RAW( ", owner=%08x", req->owner ); } static void dump_empty_clipboard_request( const struct empty_clipboard_request *req ) @@ -2467,63 +2467,63 @@ static void dump_empty_clipboard_request( const struct empty_clipboard_request * static void dump_set_clipboard_data_request( const struct set_clipboard_data_request *req ) { - fprintf( stderr, " format=%08x", req->format ); - fprintf( stderr, ", lcid=%08x", req->lcid ); + TRACE_RAW( " format=%08x", req->format ); + TRACE_RAW( ", lcid=%08x", req->lcid ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_set_clipboard_data_reply( const struct set_clipboard_data_reply *req ) { - fprintf( stderr, " seqno=%08x", req->seqno ); + TRACE_RAW( " seqno=%08x", req->seqno ); } static void dump_get_clipboard_data_request( const struct get_clipboard_data_request *req ) { - fprintf( stderr, " format=%08x", req->format ); - fprintf( stderr, ", render=%d", req->render ); - fprintf( stderr, ", cached=%d", req->cached ); - fprintf( stderr, ", seqno=%08x", req->seqno ); + TRACE_RAW( " format=%08x", req->format ); + TRACE_RAW( ", render=%d", req->render ); + TRACE_RAW( ", cached=%d", req->cached ); + TRACE_RAW( ", seqno=%08x", req->seqno ); } static void dump_get_clipboard_data_reply( const struct get_clipboard_data_reply *req ) { - fprintf( stderr, " from=%08x", req->from ); - fprintf( stderr, ", owner=%08x", req->owner ); - fprintf( stderr, ", seqno=%08x", req->seqno ); - fprintf( stderr, ", total=%u", req->total ); + TRACE_RAW( " from=%08x", req->from ); + TRACE_RAW( ", owner=%08x", req->owner ); + TRACE_RAW( ", seqno=%08x", req->seqno ); + TRACE_RAW( ", total=%u", req->total ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_get_clipboard_formats_request( const struct get_clipboard_formats_request *req ) { - fprintf( stderr, " format=%08x", req->format ); + TRACE_RAW( " format=%08x", req->format ); } static void dump_get_clipboard_formats_reply( const struct get_clipboard_formats_reply *req ) { - fprintf( stderr, " count=%08x", req->count ); + TRACE_RAW( " count=%08x", req->count ); dump_varargs_uints( ", formats=", cur_size ); } static void dump_enum_clipboard_formats_request( const struct enum_clipboard_formats_request *req ) { - fprintf( stderr, " previous=%08x", req->previous ); + TRACE_RAW( " previous=%08x", req->previous ); } static void dump_enum_clipboard_formats_reply( const struct enum_clipboard_formats_reply *req ) { - fprintf( stderr, " format=%08x", req->format ); + TRACE_RAW( " format=%08x", req->format ); } static void dump_release_clipboard_request( const struct release_clipboard_request *req ) { - fprintf( stderr, " owner=%08x", req->owner ); + TRACE_RAW( " owner=%08x", req->owner ); } static void dump_release_clipboard_reply( const struct release_clipboard_reply *req ) { - fprintf( stderr, " viewer=%08x", req->viewer ); - fprintf( stderr, ", owner=%08x", req->owner ); + TRACE_RAW( " viewer=%08x", req->viewer ); + TRACE_RAW( ", owner=%08x", req->owner ); } static void dump_get_clipboard_info_request( const struct get_clipboard_info_request *req ) @@ -2532,222 +2532,222 @@ static void dump_get_clipboard_info_request( const struct get_clipboard_info_req static void dump_get_clipboard_info_reply( const struct get_clipboard_info_reply *req ) { - fprintf( stderr, " window=%08x", req->window ); - fprintf( stderr, ", owner=%08x", req->owner ); - fprintf( stderr, ", viewer=%08x", req->viewer ); - fprintf( stderr, ", seqno=%08x", req->seqno ); + TRACE_RAW( " window=%08x", req->window ); + TRACE_RAW( ", owner=%08x", req->owner ); + TRACE_RAW( ", viewer=%08x", req->viewer ); + TRACE_RAW( ", seqno=%08x", req->seqno ); } static void dump_set_clipboard_viewer_request( const struct set_clipboard_viewer_request *req ) { - fprintf( stderr, " viewer=%08x", req->viewer ); - fprintf( stderr, ", previous=%08x", req->previous ); + TRACE_RAW( " viewer=%08x", req->viewer ); + TRACE_RAW( ", previous=%08x", req->previous ); } static void dump_set_clipboard_viewer_reply( const struct set_clipboard_viewer_reply *req ) { - fprintf( stderr, " old_viewer=%08x", req->old_viewer ); - fprintf( stderr, ", owner=%08x", req->owner ); + TRACE_RAW( " old_viewer=%08x", req->old_viewer ); + TRACE_RAW( ", owner=%08x", req->owner ); } static void dump_add_clipboard_listener_request( const struct add_clipboard_listener_request *req ) { - fprintf( stderr, " window=%08x", req->window ); + TRACE_RAW( " window=%08x", req->window ); } static void dump_remove_clipboard_listener_request( const struct remove_clipboard_listener_request *req ) { - fprintf( stderr, " window=%08x", req->window ); + TRACE_RAW( " window=%08x", req->window ); } static void dump_create_token_request( const struct create_token_request *req ) { dump_luid( " token_id=", &req->token_id ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", primary=%d", req->primary ); - fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", primary=%d", req->primary ); + TRACE_RAW( ", impersonation_level=%d", req->impersonation_level ); dump_abstime( ", expire=", &req->expire ); - fprintf( stderr, ", group_count=%d", req->group_count ); - fprintf( stderr, ", primary_group=%d", req->primary_group ); - fprintf( stderr, ", priv_count=%d", req->priv_count ); + TRACE_RAW( ", group_count=%d", req->group_count ); + TRACE_RAW( ", primary_group=%d", req->primary_group ); + TRACE_RAW( ", priv_count=%d", req->priv_count ); } static void dump_create_token_reply( const struct create_token_reply *req ) { - fprintf( stderr, " token=%04x", req->token ); + TRACE_RAW( " token=%04x", req->token ); } static void dump_open_token_request( const struct open_token_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_open_token_reply( const struct open_token_reply *req ) { - fprintf( stderr, " token=%04x", req->token ); + TRACE_RAW( " token=%04x", req->token ); } static void dump_set_desktop_shell_windows_request( const struct set_desktop_shell_windows_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", shell_window=%08x", req->shell_window ); - fprintf( stderr, ", shell_listview=%08x", req->shell_listview ); - fprintf( stderr, ", progman_window=%08x", req->progman_window ); - fprintf( stderr, ", taskman_window=%08x", req->taskman_window ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", shell_window=%08x", req->shell_window ); + TRACE_RAW( ", shell_listview=%08x", req->shell_listview ); + TRACE_RAW( ", progman_window=%08x", req->progman_window ); + TRACE_RAW( ", taskman_window=%08x", req->taskman_window ); } static void dump_set_desktop_shell_windows_reply( const struct set_desktop_shell_windows_reply *req ) { - fprintf( stderr, " old_shell_window=%08x", req->old_shell_window ); - fprintf( stderr, ", old_shell_listview=%08x", req->old_shell_listview ); - fprintf( stderr, ", old_progman_window=%08x", req->old_progman_window ); - fprintf( stderr, ", old_taskman_window=%08x", req->old_taskman_window ); + TRACE_RAW( " old_shell_window=%08x", req->old_shell_window ); + TRACE_RAW( ", old_shell_listview=%08x", req->old_shell_listview ); + TRACE_RAW( ", old_progman_window=%08x", req->old_progman_window ); + TRACE_RAW( ", old_taskman_window=%08x", req->old_taskman_window ); } static void dump_adjust_token_privileges_request( const struct adjust_token_privileges_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", disable_all=%d", req->disable_all ); - fprintf( stderr, ", get_modified_state=%d", req->get_modified_state ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", disable_all=%d", req->disable_all ); + TRACE_RAW( ", get_modified_state=%d", req->get_modified_state ); dump_varargs_luid_attr( ", privileges=", cur_size ); } static void dump_adjust_token_privileges_reply( const struct adjust_token_privileges_reply *req ) { - fprintf( stderr, " len=%08x", req->len ); + TRACE_RAW( " len=%08x", req->len ); dump_varargs_luid_attr( ", privileges=", cur_size ); } static void dump_get_token_privileges_request( const struct get_token_privileges_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_token_privileges_reply( const struct get_token_privileges_reply *req ) { - fprintf( stderr, " len=%08x", req->len ); + TRACE_RAW( " len=%08x", req->len ); dump_varargs_luid_attr( ", privileges=", cur_size ); } static void dump_check_token_privileges_request( const struct check_token_privileges_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", all_required=%d", req->all_required ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", all_required=%d", req->all_required ); dump_varargs_luid_attr( ", privileges=", cur_size ); } static void dump_check_token_privileges_reply( const struct check_token_privileges_reply *req ) { - fprintf( stderr, " has_privileges=%d", req->has_privileges ); + TRACE_RAW( " has_privileges=%d", req->has_privileges ); dump_varargs_luid_attr( ", privileges=", cur_size ); } static void dump_duplicate_token_request( const struct duplicate_token_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", primary=%d", req->primary ); - fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", primary=%d", req->primary ); + TRACE_RAW( ", impersonation_level=%d", req->impersonation_level ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_duplicate_token_reply( const struct duplicate_token_reply *req ) { - fprintf( stderr, " new_handle=%04x", req->new_handle ); + TRACE_RAW( " new_handle=%04x", req->new_handle ); } static void dump_filter_token_request( const struct filter_token_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%08x", req->flags ); - fprintf( stderr, ", privileges_size=%u", req->privileges_size ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%08x", req->flags ); + TRACE_RAW( ", privileges_size=%u", req->privileges_size ); dump_varargs_luid_attr( ", privileges=", min( cur_size, req->privileges_size )); dump_varargs_sid( ", disable_sids=", cur_size ); } static void dump_filter_token_reply( const struct filter_token_reply *req ) { - fprintf( stderr, " new_handle=%04x", req->new_handle ); + TRACE_RAW( " new_handle=%04x", req->new_handle ); } static void dump_access_check_request( const struct access_check_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", desired_access=%08x", req->desired_access ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", desired_access=%08x", req->desired_access ); dump_generic_map( ", mapping=", &req->mapping ); dump_varargs_security_descriptor( ", sd=", cur_size ); } static void dump_access_check_reply( const struct access_check_reply *req ) { - fprintf( stderr, " access_granted=%08x", req->access_granted ); - fprintf( stderr, ", access_status=%08x", req->access_status ); - fprintf( stderr, ", privileges_len=%08x", req->privileges_len ); + TRACE_RAW( " access_granted=%08x", req->access_granted ); + TRACE_RAW( ", access_status=%08x", req->access_status ); + TRACE_RAW( ", privileges_len=%08x", req->privileges_len ); dump_varargs_luid_attr( ", privileges=", cur_size ); } static void dump_get_token_sid_request( const struct get_token_sid_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", which_sid=%08x", req->which_sid ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", which_sid=%08x", req->which_sid ); } static void dump_get_token_sid_reply( const struct get_token_sid_reply *req ) { - fprintf( stderr, " sid_len=%u", req->sid_len ); + TRACE_RAW( " sid_len=%u", req->sid_len ); dump_varargs_sid( ", sid=", cur_size ); } static void dump_get_token_groups_request( const struct get_token_groups_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", attr_mask=%08x", req->attr_mask ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", attr_mask=%08x", req->attr_mask ); } static void dump_get_token_groups_reply( const struct get_token_groups_reply *req ) { - fprintf( stderr, " attr_len=%u", req->attr_len ); - fprintf( stderr, ", sid_len=%u", req->sid_len ); + TRACE_RAW( " attr_len=%u", req->attr_len ); + TRACE_RAW( ", sid_len=%u", req->sid_len ); dump_varargs_uints( ", attrs=", min( cur_size, req->attr_len )); dump_varargs_sids( ", sids=", cur_size ); } static void dump_get_token_default_dacl_request( const struct get_token_default_dacl_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_token_default_dacl_reply( const struct get_token_default_dacl_reply *req ) { - fprintf( stderr, " acl_len=%u", req->acl_len ); + TRACE_RAW( " acl_len=%u", req->acl_len ); dump_varargs_acl( ", acl=", cur_size ); } static void dump_set_token_default_dacl_request( const struct set_token_default_dacl_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_varargs_acl( ", acl=", cur_size ); } static void dump_set_security_object_request( const struct set_security_object_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", security_info=%08x", req->security_info ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", security_info=%08x", req->security_info ); dump_varargs_security_descriptor( ", sd=", cur_size ); } static void dump_get_security_object_request( const struct get_security_object_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", security_info=%08x", req->security_info ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", security_info=%08x", req->security_info ); } static void dump_get_security_object_reply( const struct get_security_object_reply *req ) { - fprintf( stderr, " sd_len=%08x", req->sd_len ); + TRACE_RAW( " sd_len=%08x", req->sd_len ); dump_varargs_security_descriptor( ", sd=", cur_size ); } @@ -2757,18 +2757,18 @@ static void dump_get_system_handles_request( const struct get_system_handles_req static void dump_get_system_handles_reply( const struct get_system_handles_reply *req ) { - fprintf( stderr, " count=%08x", req->count ); + TRACE_RAW( " count=%08x", req->count ); dump_varargs_handle_infos( ", data=", cur_size ); } static void dump_get_tcp_connections_request( const struct get_tcp_connections_request *req ) { - fprintf( stderr, " state_filter=%08x", req->state_filter ); + TRACE_RAW( " state_filter=%08x", req->state_filter ); } static void dump_get_tcp_connections_reply( const struct get_tcp_connections_reply *req ) { - fprintf( stderr, " count=%08x", req->count ); + TRACE_RAW( " count=%08x", req->count ); dump_varargs_tcp_connections( ", connections=", cur_size ); } @@ -2778,137 +2778,137 @@ static void dump_get_udp_endpoints_request( const struct get_udp_endpoints_reque static void dump_get_udp_endpoints_reply( const struct get_udp_endpoints_reply *req ) { - fprintf( stderr, " count=%08x", req->count ); + TRACE_RAW( " count=%08x", req->count ); dump_varargs_udp_endpoints( ", endpoints=", cur_size ); } static void dump_create_mailslot_request( const struct create_mailslot_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", options=%08x", req->options ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", options=%08x", req->options ); dump_timeout( ", read_timeout=", &req->read_timeout ); - fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize ); + TRACE_RAW( ", max_msgsize=%08x", req->max_msgsize ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_mailslot_reply( const struct create_mailslot_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_mailslot_info_request( const struct set_mailslot_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_timeout( ", read_timeout=", &req->read_timeout ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_set_mailslot_info_reply( const struct set_mailslot_info_reply *req ) { dump_timeout( " read_timeout=", &req->read_timeout ); - fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize ); + TRACE_RAW( ", max_msgsize=%08x", req->max_msgsize ); } static void dump_create_directory_request( const struct create_directory_request *req ) { - fprintf( stderr, " access=%08x", req->access ); + TRACE_RAW( " access=%08x", req->access ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_directory_reply( const struct create_directory_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_directory_request( const struct open_directory_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", directory_name=", cur_size ); } static void dump_open_directory_reply( const struct open_directory_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_directory_entries_request( const struct get_directory_entries_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", index=%08x", req->index ); - fprintf( stderr, ", max_count=%08x", req->max_count ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", index=%08x", req->index ); + TRACE_RAW( ", max_count=%08x", req->max_count ); } static void dump_get_directory_entries_reply( const struct get_directory_entries_reply *req ) { - fprintf( stderr, " total_len=%u", req->total_len ); - fprintf( stderr, ", count=%08x", req->count ); + TRACE_RAW( " total_len=%u", req->total_len ); + TRACE_RAW( ", count=%08x", req->count ); dump_varargs_directory_entries( ", entries=", cur_size ); } static void dump_create_symlink_request( const struct create_symlink_request *req ) { - fprintf( stderr, " access=%08x", req->access ); + TRACE_RAW( " access=%08x", req->access ); dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_unicode_str( ", target_name=", cur_size ); } static void dump_create_symlink_reply( const struct create_symlink_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_symlink_request( const struct open_symlink_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_symlink_reply( const struct open_symlink_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_symlink_request( const struct query_symlink_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_symlink_reply( const struct query_symlink_reply *req ) { - fprintf( stderr, " total=%u", req->total ); + TRACE_RAW( " total=%u", req->total ); dump_varargs_unicode_str( ", target_name=", cur_size ); } static void dump_get_object_info_request( const struct get_object_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_object_info_reply( const struct get_object_info_reply *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", ref_count=%08x", req->ref_count ); - fprintf( stderr, ", handle_count=%08x", req->handle_count ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", ref_count=%08x", req->ref_count ); + TRACE_RAW( ", handle_count=%08x", req->handle_count ); } static void dump_get_object_name_request( const struct get_object_name_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_object_name_reply( const struct get_object_name_reply *req ) { - fprintf( stderr, " total=%u", req->total ); + TRACE_RAW( " total=%u", req->total ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_get_object_type_request( const struct get_object_type_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_object_type_reply( const struct get_object_type_reply *req ) @@ -2922,7 +2922,7 @@ static void dump_get_object_types_request( const struct get_object_types_request static void dump_get_object_types_reply( const struct get_object_types_reply *req ) { - fprintf( stderr, " count=%d", req->count ); + TRACE_RAW( " count=%d", req->count ); dump_varargs_object_types_info( ", info=", cur_size ); } @@ -2937,55 +2937,55 @@ static void dump_allocate_locally_unique_id_reply( const struct allocate_locally static void dump_create_device_manager_request( const struct create_device_manager_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); } static void dump_create_device_manager_reply( const struct create_device_manager_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_create_device_request( const struct create_device_request *req ) { - fprintf( stderr, " rootdir=%04x", req->rootdir ); + TRACE_RAW( " rootdir=%04x", req->rootdir ); dump_uint64( ", user_ptr=", &req->user_ptr ); - fprintf( stderr, ", manager=%04x", req->manager ); + TRACE_RAW( ", manager=%04x", req->manager ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_delete_device_request( const struct delete_device_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); + TRACE_RAW( " manager=%04x", req->manager ); dump_uint64( ", device=", &req->device ); } static void dump_get_next_device_request_request( const struct get_next_device_request_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); - fprintf( stderr, ", prev=%04x", req->prev ); - fprintf( stderr, ", status=%08x", req->status ); + TRACE_RAW( " manager=%04x", req->manager ); + TRACE_RAW( ", prev=%04x", req->prev ); + TRACE_RAW( ", status=%08x", req->status ); dump_uint64( ", user_ptr=", &req->user_ptr ); - fprintf( stderr, ", pending=%d", req->pending ); - fprintf( stderr, ", iosb_status=%08x", req->iosb_status ); - fprintf( stderr, ", result=%u", req->result ); + TRACE_RAW( ", pending=%d", req->pending ); + TRACE_RAW( ", iosb_status=%08x", req->iosb_status ); + TRACE_RAW( ", result=%u", req->result ); dump_varargs_bytes( ", data=", cur_size ); } static void dump_get_next_device_request_reply( const struct get_next_device_request_reply *req ) { dump_irp_params( " params=", &req->params ); - fprintf( stderr, ", next=%04x", req->next ); - fprintf( stderr, ", client_tid=%04x", req->client_tid ); + TRACE_RAW( ", next=%04x", req->next ); + TRACE_RAW( ", client_tid=%04x", req->client_tid ); dump_uint64( ", client_thread=", &req->client_thread ); - fprintf( stderr, ", in_size=%u", req->in_size ); + TRACE_RAW( ", in_size=%u", req->in_size ); dump_varargs_bytes( ", next_data=", cur_size ); } static void dump_get_kernel_object_ptr_request( const struct get_kernel_object_ptr_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " manager=%04x", req->manager ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_get_kernel_object_ptr_reply( const struct get_kernel_object_ptr_reply *req ) @@ -2995,117 +2995,117 @@ static void dump_get_kernel_object_ptr_reply( const struct get_kernel_object_ptr static void dump_set_kernel_object_ptr_request( const struct set_kernel_object_ptr_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " manager=%04x", req->manager ); + TRACE_RAW( ", handle=%04x", req->handle ); dump_uint64( ", user_ptr=", &req->user_ptr ); } static void dump_grab_kernel_object_request( const struct grab_kernel_object_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); + TRACE_RAW( " manager=%04x", req->manager ); dump_uint64( ", user_ptr=", &req->user_ptr ); } static void dump_release_kernel_object_request( const struct release_kernel_object_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); + TRACE_RAW( " manager=%04x", req->manager ); dump_uint64( ", user_ptr=", &req->user_ptr ); } static void dump_get_kernel_object_handle_request( const struct get_kernel_object_handle_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); + TRACE_RAW( " manager=%04x", req->manager ); dump_uint64( ", user_ptr=", &req->user_ptr ); - fprintf( stderr, ", access=%08x", req->access ); + TRACE_RAW( ", access=%08x", req->access ); } static void dump_get_kernel_object_handle_reply( const struct get_kernel_object_handle_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_make_process_system_request( const struct make_process_system_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_make_process_system_reply( const struct make_process_system_reply *req ) { - fprintf( stderr, " event=%04x", req->event ); + TRACE_RAW( " event=%04x", req->event ); } static void dump_grant_process_admin_token_request( const struct grant_process_admin_token_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_token_info_request( const struct get_token_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_token_info_reply( const struct get_token_info_reply *req ) { dump_luid( " token_id=", &req->token_id ); dump_luid( ", modified_id=", &req->modified_id ); - fprintf( stderr, ", session_id=%08x", req->session_id ); - fprintf( stderr, ", primary=%d", req->primary ); - fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); - fprintf( stderr, ", elevation_type=%d", req->elevation_type ); - fprintf( stderr, ", is_elevated=%d", req->is_elevated ); - fprintf( stderr, ", group_count=%d", req->group_count ); - fprintf( stderr, ", privilege_count=%d", req->privilege_count ); + TRACE_RAW( ", session_id=%08x", req->session_id ); + TRACE_RAW( ", primary=%d", req->primary ); + TRACE_RAW( ", impersonation_level=%d", req->impersonation_level ); + TRACE_RAW( ", elevation_type=%d", req->elevation_type ); + TRACE_RAW( ", is_elevated=%d", req->is_elevated ); + TRACE_RAW( ", group_count=%d", req->group_count ); + TRACE_RAW( ", privilege_count=%d", req->privilege_count ); } static void dump_create_linked_token_request( const struct create_linked_token_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_create_linked_token_reply( const struct create_linked_token_reply *req ) { - fprintf( stderr, " linked=%04x", req->linked ); + TRACE_RAW( " linked=%04x", req->linked ); } static void dump_create_completion_request( const struct create_completion_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", concurrent=%08x", req->concurrent ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", concurrent=%08x", req->concurrent ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_completion_reply( const struct create_completion_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_completion_request( const struct open_completion_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", filename=", cur_size ); } static void dump_open_completion_reply( const struct open_completion_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_add_completion_request( const struct add_completion_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", ckey=", &req->ckey ); dump_uint64( ", cvalue=", &req->cvalue ); dump_uint64( ", information=", &req->information ); - fprintf( stderr, ", reserve_handle=%04x", req->reserve_handle ); - fprintf( stderr, ", status=%08x", req->status ); + TRACE_RAW( ", reserve_handle=%04x", req->reserve_handle ); + TRACE_RAW( ", status=%08x", req->status ); } static void dump_remove_completion_request( const struct remove_completion_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", alertable=%d", req->alertable ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", alertable=%d", req->alertable ); } static void dump_remove_completion_reply( const struct remove_completion_reply *req ) @@ -3113,8 +3113,8 @@ static void dump_remove_completion_reply( const struct remove_completion_reply * dump_uint64( " ckey=", &req->ckey ); dump_uint64( ", cvalue=", &req->cvalue ); dump_uint64( ", information=", &req->information ); - fprintf( stderr, ", status=%08x", req->status ); - fprintf( stderr, ", wait_handle=%04x", req->wait_handle ); + TRACE_RAW( ", status=%08x", req->status ); + TRACE_RAW( ", wait_handle=%04x", req->wait_handle ); } static void dump_get_thread_completion_request( const struct get_thread_completion_request *req ) @@ -3126,120 +3126,120 @@ static void dump_get_thread_completion_reply( const struct get_thread_completion dump_uint64( " ckey=", &req->ckey ); dump_uint64( ", cvalue=", &req->cvalue ); dump_uint64( ", information=", &req->information ); - fprintf( stderr, ", status=%08x", req->status ); + TRACE_RAW( ", status=%08x", req->status ); } static void dump_query_completion_request( const struct query_completion_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_query_completion_reply( const struct query_completion_reply *req ) { - fprintf( stderr, " depth=%08x", req->depth ); + TRACE_RAW( " depth=%08x", req->depth ); } static void dump_set_completion_info_request( const struct set_completion_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", ckey=", &req->ckey ); - fprintf( stderr, ", chandle=%04x", req->chandle ); + TRACE_RAW( ", chandle=%04x", req->chandle ); } static void dump_add_fd_completion_request( const struct add_fd_completion_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", cvalue=", &req->cvalue ); dump_uint64( ", information=", &req->information ); - fprintf( stderr, ", status=%08x", req->status ); - fprintf( stderr, ", async=%d", req->async ); + TRACE_RAW( ", status=%08x", req->status ); + TRACE_RAW( ", async=%d", req->async ); } static void dump_set_fd_completion_mode_request( const struct set_fd_completion_mode_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_set_fd_disp_info_request( const struct set_fd_disp_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_set_fd_name_info_request( const struct set_fd_name_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); - fprintf( stderr, ", namelen=%u", req->namelen ); - fprintf( stderr, ", link=%d", req->link ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); + TRACE_RAW( ", namelen=%u", req->namelen ); + TRACE_RAW( ", link=%d", req->link ); + TRACE_RAW( ", flags=%08x", req->flags ); dump_varargs_unicode_str( ", name=", min( cur_size, req->namelen )); dump_varargs_string( ", filename=", cur_size ); } static void dump_set_fd_eof_info_request( const struct set_fd_eof_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); dump_uint64( ", eof=", &req->eof ); } static void dump_get_window_layered_info_request( const struct get_window_layered_info_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_get_window_layered_info_reply( const struct get_window_layered_info_reply *req ) { - fprintf( stderr, " color_key=%08x", req->color_key ); - fprintf( stderr, ", alpha=%08x", req->alpha ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " color_key=%08x", req->color_key ); + TRACE_RAW( ", alpha=%08x", req->alpha ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_set_window_layered_info_request( const struct set_window_layered_info_request *req ) { - fprintf( stderr, " handle=%08x", req->handle ); - fprintf( stderr, ", color_key=%08x", req->color_key ); - fprintf( stderr, ", alpha=%08x", req->alpha ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " handle=%08x", req->handle ); + TRACE_RAW( ", color_key=%08x", req->color_key ); + TRACE_RAW( ", alpha=%08x", req->alpha ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_alloc_user_handle_request( const struct alloc_user_handle_request *req ) { - fprintf( stderr, " type=%04x", req->type ); + TRACE_RAW( " type=%04x", req->type ); } static void dump_alloc_user_handle_reply( const struct alloc_user_handle_reply *req ) { - fprintf( stderr, " handle=%08x", req->handle ); + TRACE_RAW( " handle=%08x", req->handle ); } static void dump_free_user_handle_request( const struct free_user_handle_request *req ) { - fprintf( stderr, " type=%04x", req->type ); - fprintf( stderr, ", handle=%08x", req->handle ); + TRACE_RAW( " type=%04x", req->type ); + TRACE_RAW( ", handle=%08x", req->handle ); } static void dump_set_cursor_request( const struct set_cursor_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", handle=%08x", req->handle ); - fprintf( stderr, ", show_count=%d", req->show_count ); - fprintf( stderr, ", x=%d", req->x ); - fprintf( stderr, ", y=%d", req->y ); + TRACE_RAW( " flags=%08x", req->flags ); + TRACE_RAW( ", handle=%08x", req->handle ); + TRACE_RAW( ", show_count=%d", req->show_count ); + TRACE_RAW( ", x=%d", req->x ); + TRACE_RAW( ", y=%d", req->y ); dump_rectangle( ", clip=", &req->clip ); } static void dump_set_cursor_reply( const struct set_cursor_reply *req ) { - fprintf( stderr, " prev_handle=%08x", req->prev_handle ); - fprintf( stderr, ", prev_count=%d", req->prev_count ); - fprintf( stderr, ", prev_x=%d", req->prev_x ); - fprintf( stderr, ", prev_y=%d", req->prev_y ); - fprintf( stderr, ", new_x=%d", req->new_x ); - fprintf( stderr, ", new_y=%d", req->new_y ); + TRACE_RAW( " prev_handle=%08x", req->prev_handle ); + TRACE_RAW( ", prev_count=%d", req->prev_count ); + TRACE_RAW( ", prev_x=%d", req->prev_x ); + TRACE_RAW( ", prev_y=%d", req->prev_y ); + TRACE_RAW( ", new_x=%d", req->new_x ); + TRACE_RAW( ", new_y=%d", req->new_y ); dump_rectangle( ", new_clip=", &req->new_clip ); - fprintf( stderr, ", last_change=%08x", req->last_change ); + TRACE_RAW( ", last_change=%08x", req->last_change ); } static void dump_get_cursor_history_request( const struct get_cursor_history_request *req ) @@ -3253,15 +3253,15 @@ static void dump_get_cursor_history_reply( const struct get_cursor_history_reply static void dump_get_rawinput_buffer_request( const struct get_rawinput_buffer_request *req ) { - fprintf( stderr, " header_size=%u", req->header_size ); - fprintf( stderr, ", read_data=%d", req->read_data ); + TRACE_RAW( " header_size=%u", req->header_size ); + TRACE_RAW( ", read_data=%d", req->read_data ); } static void dump_get_rawinput_buffer_reply( const struct get_rawinput_buffer_reply *req ) { - fprintf( stderr, " next_size=%u", req->next_size ); - fprintf( stderr, ", time=%08x", req->time ); - fprintf( stderr, ", count=%08x", req->count ); + TRACE_RAW( " next_size=%u", req->next_size ); + TRACE_RAW( ", time=%08x", req->time ); + TRACE_RAW( ", count=%08x", req->count ); dump_varargs_bytes( ", data=", cur_size ); } @@ -3272,129 +3272,129 @@ static void dump_update_rawinput_devices_request( const struct update_rawinput_d static void dump_create_job_request( const struct create_job_request *req ) { - fprintf( stderr, " access=%08x", req->access ); + TRACE_RAW( " access=%08x", req->access ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_job_reply( const struct create_job_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_open_job_request( const struct open_job_request *req ) { - fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_open_job_reply( const struct open_job_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_assign_job_request( const struct assign_job_request *req ) { - fprintf( stderr, " job=%04x", req->job ); - fprintf( stderr, ", process=%04x", req->process ); + TRACE_RAW( " job=%04x", req->job ); + TRACE_RAW( ", process=%04x", req->process ); } static void dump_process_in_job_request( const struct process_in_job_request *req ) { - fprintf( stderr, " job=%04x", req->job ); - fprintf( stderr, ", process=%04x", req->process ); + TRACE_RAW( " job=%04x", req->job ); + TRACE_RAW( ", process=%04x", req->process ); } static void dump_set_job_limits_request( const struct set_job_limits_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", limit_flags=%08x", req->limit_flags ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", limit_flags=%08x", req->limit_flags ); } static void dump_set_job_completion_port_request( const struct set_job_completion_port_request *req ) { - fprintf( stderr, " job=%04x", req->job ); - fprintf( stderr, ", port=%04x", req->port ); + TRACE_RAW( " job=%04x", req->job ); + TRACE_RAW( ", port=%04x", req->port ); dump_uint64( ", key=", &req->key ); } static void dump_get_job_info_request( const struct get_job_info_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_job_info_reply( const struct get_job_info_reply *req ) { - fprintf( stderr, " total_processes=%d", req->total_processes ); - fprintf( stderr, ", active_processes=%d", req->active_processes ); + TRACE_RAW( " total_processes=%d", req->total_processes ); + TRACE_RAW( ", active_processes=%d", req->active_processes ); dump_varargs_uints( ", pids=", cur_size ); } static void dump_terminate_job_request( const struct terminate_job_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", status=%d", req->status ); + TRACE_RAW( " handle=%04x", req->handle ); + TRACE_RAW( ", status=%d", req->status ); } static void dump_suspend_process_request( const struct suspend_process_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_resume_process_request( const struct resume_process_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_next_process_request( const struct get_next_process_request *req ) { - fprintf( stderr, " last=%04x", req->last ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " last=%04x", req->last ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_get_next_process_reply( const struct get_next_process_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_next_thread_request( const struct get_next_thread_request *req ) { - fprintf( stderr, " process=%04x", req->process ); - fprintf( stderr, ", last=%04x", req->last ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", flags=%08x", req->flags ); + TRACE_RAW( " process=%04x", req->process ); + TRACE_RAW( ", last=%04x", req->last ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", flags=%08x", req->flags ); } static void dump_get_next_thread_reply( const struct get_next_thread_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_set_keyboard_repeat_request( const struct set_keyboard_repeat_request *req ) { - fprintf( stderr, " enable=%d", req->enable ); - fprintf( stderr, ", delay=%d", req->delay ); - fprintf( stderr, ", period=%d", req->period ); + TRACE_RAW( " enable=%d", req->enable ); + TRACE_RAW( ", delay=%d", req->delay ); + TRACE_RAW( ", period=%d", req->period ); } static void dump_set_keyboard_repeat_reply( const struct set_keyboard_repeat_reply *req ) { - fprintf( stderr, " enable=%d", req->enable ); + TRACE_RAW( " enable=%d", req->enable ); } static void dump_get_inproc_sync_fd_request( const struct get_inproc_sync_fd_request *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_get_inproc_sync_fd_reply( const struct get_inproc_sync_fd_reply *req ) { - fprintf( stderr, " type=%d", req->type ); - fprintf( stderr, ", access=%08x", req->access ); + TRACE_RAW( " type=%d", req->type ); + TRACE_RAW( ", access=%08x", req->access ); } static void dump_get_inproc_alert_fd_request( const struct get_inproc_alert_fd_request *req ) @@ -3403,108 +3403,108 @@ static void dump_get_inproc_alert_fd_request( const struct get_inproc_alert_fd_r static void dump_get_inproc_alert_fd_reply( const struct get_inproc_alert_fd_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_d3dkmt_object_create_request( const struct d3dkmt_object_create_request *req ) { - fprintf( stderr, " type=%08x", req->type ); - fprintf( stderr, ", fd=%d", req->fd ); - fprintf( stderr, ", value=%08x", req->value ); + TRACE_RAW( " type=%08x", req->type ); + TRACE_RAW( ", fd=%d", req->fd ); + TRACE_RAW( ", value=%08x", req->value ); dump_varargs_bytes( ", runtime=", cur_size ); } static void dump_d3dkmt_object_create_reply( const struct d3dkmt_object_create_reply *req ) { - fprintf( stderr, " global=%08x", req->global ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " global=%08x", req->global ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_d3dkmt_object_update_request( const struct d3dkmt_object_update_request *req ) { - fprintf( stderr, " type=%08x", req->type ); - fprintf( stderr, ", global=%08x", req->global ); + TRACE_RAW( " type=%08x", req->type ); + TRACE_RAW( ", global=%08x", req->global ); dump_varargs_bytes( ", runtime=", cur_size ); } static void dump_d3dkmt_object_query_request( const struct d3dkmt_object_query_request *req ) { - fprintf( stderr, " type=%08x", req->type ); - fprintf( stderr, ", global=%08x", req->global ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " type=%08x", req->type ); + TRACE_RAW( ", global=%08x", req->global ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_d3dkmt_object_query_reply( const struct d3dkmt_object_query_reply *req ) { - fprintf( stderr, " runtime_size=%u", req->runtime_size ); + TRACE_RAW( " runtime_size=%u", req->runtime_size ); } static void dump_d3dkmt_object_open_request( const struct d3dkmt_object_open_request *req ) { - fprintf( stderr, " type=%08x", req->type ); - fprintf( stderr, ", global=%08x", req->global ); - fprintf( stderr, ", handle=%04x", req->handle ); + TRACE_RAW( " type=%08x", req->type ); + TRACE_RAW( ", global=%08x", req->global ); + TRACE_RAW( ", handle=%04x", req->handle ); } static void dump_d3dkmt_object_open_reply( const struct d3dkmt_object_open_reply *req ) { - fprintf( stderr, " global=%08x", req->global ); - fprintf( stderr, ", handle=%04x", req->handle ); - fprintf( stderr, ", runtime_size=%u", req->runtime_size ); + TRACE_RAW( " global=%08x", req->global ); + TRACE_RAW( ", handle=%04x", req->handle ); + TRACE_RAW( ", runtime_size=%u", req->runtime_size ); dump_varargs_bytes( ", runtime=", cur_size ); } static void dump_d3dkmt_share_objects_request( const struct d3dkmt_share_objects_request *req ) { - fprintf( stderr, " resource=%08x", req->resource ); - fprintf( stderr, ", mutex=%08x", req->mutex ); - fprintf( stderr, ", sync=%08x", req->sync ); - fprintf( stderr, ", access=%08x", req->access ); + TRACE_RAW( " resource=%08x", req->resource ); + TRACE_RAW( ", mutex=%08x", req->mutex ); + TRACE_RAW( ", sync=%08x", req->sync ); + TRACE_RAW( ", access=%08x", req->access ); dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_d3dkmt_share_objects_reply( const struct d3dkmt_share_objects_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_d3dkmt_object_open_name_request( const struct d3dkmt_object_open_name_request *req ) { - fprintf( stderr, " type=%08x", req->type ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); + TRACE_RAW( " type=%08x", req->type ); + TRACE_RAW( ", access=%08x", req->access ); + TRACE_RAW( ", attributes=%08x", req->attributes ); + TRACE_RAW( ", rootdir=%04x", req->rootdir ); dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_d3dkmt_object_open_name_reply( const struct d3dkmt_object_open_name_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + TRACE_RAW( " handle=%04x", req->handle ); } static void dump_d3dkmt_mutex_acquire_request( const struct d3dkmt_mutex_acquire_request *req ) { - fprintf( stderr, " mutex=%08x", req->mutex ); - fprintf( stderr, ", key_value=%08x", req->key_value ); - fprintf( stderr, ", wait_handle=%04x", req->wait_handle ); - fprintf( stderr, ", wait_status=%08x", req->wait_status ); + TRACE_RAW( " mutex=%08x", req->mutex ); + TRACE_RAW( ", key_value=%08x", req->key_value ); + TRACE_RAW( ", wait_handle=%04x", req->wait_handle ); + TRACE_RAW( ", wait_status=%08x", req->wait_status ); } static void dump_d3dkmt_mutex_acquire_reply( const struct d3dkmt_mutex_acquire_reply *req ) { dump_uint64( " fence_value=", &req->fence_value ); - fprintf( stderr, ", runtime_size=%u", req->runtime_size ); - fprintf( stderr, ", wait_handle=%04x", req->wait_handle ); + TRACE_RAW( ", runtime_size=%u", req->runtime_size ); + TRACE_RAW( ", wait_handle=%04x", req->wait_handle ); dump_varargs_bytes( ", runtime=", cur_size ); } static void dump_d3dkmt_mutex_release_request( const struct d3dkmt_mutex_release_request *req ) { - fprintf( stderr, " mutex=%08x", req->mutex ); - fprintf( stderr, ", abandon=%d", req->abandon ); - fprintf( stderr, ", key_value=%08x", req->key_value ); + TRACE_RAW( " mutex=%08x", req->mutex ); + TRACE_RAW( ", abandon=%d", req->abandon ); + TRACE_RAW( ", key_value=%08x", req->key_value ); dump_uint64( ", fence_value=", &req->fence_value ); - fprintf( stderr, ", runtime_size=%u", req->runtime_size ); + TRACE_RAW( ", runtime_size=%u", req->runtime_size ); dump_varargs_bytes( ", runtime=", cur_size ); } diff --git a/server/semaphore.c b/server/semaphore.c index 69e4cef987e..b7dc47aca21 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <sys/types.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -112,7 +113,7 @@ static void semaphore_sync_dump( struct object *obj, int verbose ) { struct semaphore_sync *sem = (struct semaphore_sync *)obj; assert( obj->ops == &semaphore_sync_ops ); - fprintf( stderr, "Semaphore count=%d max=%d\n", sem->count, sem->max ); + TRACE( "Semaphore count=%d max=%d\n", sem->count, sem->max ); } static int semaphore_sync_signaled( struct object *obj, struct wait_queue_entry *entry ) diff --git a/server/serial.c b/server/serial.c index 66cb4aabfbc..c9192573a88 100644 --- a/server/serial.c +++ b/server/serial.c @@ -39,6 +39,7 @@ #include <utime.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -167,7 +168,7 @@ static void serial_dump( struct object *obj, int verbose ) { struct serial *serial = (struct serial *)obj; assert( obj->ops == &serial_ops ); - fprintf( stderr, "Port fd=%p mask=%x\n", serial->fd, serial->eventmask ); + TRACE( "Port fd=%p mask=%x\n", serial->fd, serial->eventmask ); } static struct serial *get_serial_obj( struct process *process, obj_handle_t handle, unsigned int access ) diff --git a/server/signal.c b/server/signal.c index 078951af6e4..0ed0a04b732 100644 --- a/server/signal.c +++ b/server/signal.c @@ -29,6 +29,7 @@ #endif #include <unistd.h> +#include "debug.h" #include "file.h" #include "object.h" #include "process.h" @@ -141,7 +142,7 @@ static void do_signal( struct handler *handler ) static void handler_dump( struct object *obj, int verbose ) { struct handler *handler = (struct handler *)obj; - fprintf( stderr, "Signal handler fd=%p\n", handler->fd ); + TRACE( "Signal handler fd=%p\n", handler->fd ); } static void handler_destroy( struct object *obj ) @@ -158,7 +159,7 @@ static void handler_poll_event( struct fd *fd, int event ) if (event & (POLLERR | POLLHUP)) { /* this is not supposed to happen */ - fprintf( stderr, "wineserver: Error on signal handler pipe\n" ); + TRACE( "wineserver: Error on signal handler pipe\n" ); release_object( handler ); } else if (event & POLLIN) @@ -225,7 +226,7 @@ static void do_sigchld( int signum ) /* SIGSEGV handler */ static void do_sigsegv( int signum ) { - fprintf( stderr, "wineserver crashed, please enable coredumps (ulimit -c unlimited) and restart.\n"); + TRACE( "wineserver crashed, please enable coredumps (ulimit -c unlimited) and restart.\n"); abort(); } @@ -320,6 +321,6 @@ void init_signals(void) return; error: - fprintf( stderr, "failed to initialize signal handlers\n" ); + TRACE( "failed to initialize signal handlers\n" ); exit(1); } diff --git a/server/sock.c b/server/sock.c index 7785d3c7706..188c20ba975 100644 --- a/server/sock.c +++ b/server/sock.c @@ -113,6 +113,7 @@ #include "wine/afd.h" #include "wine/rbtree.h" +#include "debug.h" #include "process.h" #include "file.h" #include "handle.h" @@ -428,7 +429,7 @@ static struct bound_addr *register_bound_address( struct sock *sock, const union if (bound_addr->reuse_count == -1) { if (debug_level) - fprintf( stderr, "register_bound_address: address being updated is already exclusively bound\n" ); + TRACE( "register_bound_address: address being updated is already exclusively bound\n" ); return NULL; } ++bound_addr->reuse_count; @@ -808,13 +809,13 @@ void sock_init(void) switch ( sock_shutdown_type ) { case SOCK_SHUTDOWN_EOF: - if (debug_level) fprintf( stderr, "sock_init: shutdown() causes EOF\n" ); + if (debug_level) TRACE( "sock_init: shutdown() causes EOF\n" ); break; case SOCK_SHUTDOWN_POLLHUP: - if (debug_level) fprintf( stderr, "sock_init: shutdown() causes POLLHUP\n" ); + if (debug_level) TRACE( "sock_init: shutdown() causes POLLHUP\n" ); break; default: - fprintf( stderr, "sock_init: ERROR in sock_check_pollhup()\n" ); + TRACE( "sock_init: ERROR in sock_check_pollhup()\n" ); sock_shutdown_type = SOCK_SHUTDOWN_EOF; } } @@ -824,7 +825,7 @@ static void sock_reselect( struct sock *sock ) int ev = sock_get_poll_events( sock->fd ); if (debug_level) - fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); + TRACE("sock_reselect(%p): new mask %x\n", sock, ev); set_fd_events( sock->fd, ev ); } @@ -861,7 +862,7 @@ static void post_sock_messages( struct sock *sock ) if (sock->window) { - if (debug_level) fprintf(stderr, "signalling events %x win %08x\n", events, sock->window ); + if (debug_level) TRACE( "signalling events %x win %08x\n", events, sock->window ); for (i = 0; i < ARRAY_SIZE(event_bitorder); i++) { enum afd_poll_bit event = event_bitorder[i]; @@ -1019,7 +1020,7 @@ static void complete_async_accept( struct sock *sock, struct accept_req *req ) struct sock *acceptsock = req->acceptsock; struct async *async = req->async; - if (debug_level) fprintf( stderr, "completing accept request for socket %p\n", sock ); + if (debug_level) TRACE( "completing accept request for socket %p\n", sock ); if (acceptsock) { @@ -1056,7 +1057,7 @@ static void complete_async_accept( struct sock *sock, struct accept_req *req ) static void complete_async_accept_recv( struct accept_req *req ) { - if (debug_level) fprintf( stderr, "completing accept recv request for socket %p\n", req->acceptsock ); + if (debug_level) TRACE( "completing accept recv request for socket %p\n", req->acceptsock ); assert( req->recv_len ); @@ -1081,7 +1082,7 @@ static void complete_async_connect( struct sock *sock ) size_t len; int ret; - if (debug_level) fprintf( stderr, "completing connect request for socket %p\n", sock ); + if (debug_level) TRACE( "completing connect request for socket %p\n", sock ); if (!req->send_len) { @@ -1245,7 +1246,7 @@ static void complete_async_polls( struct sock *sock, int event, int error ) if (!(req->sockets[i].mask & flags)) continue; if (debug_level) - fprintf( stderr, "completing poll for socket %p, wanted %#x got %#x\n", + TRACE( "completing poll for socket %p, wanted %#x got %#x\n", sock, req->sockets[i].mask, flags ); req->sockets[i].flags = req->sockets[i].mask & flags; @@ -1298,7 +1299,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if (async_waiting( &sock->read_q )) { - if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); + if (debug_level) TRACE( "activating read queue for socket %p\n", sock ); async_wake_up( &sock->read_q, STATUS_ALERTED ); } event &= ~(POLLIN | POLLPRI); @@ -1308,7 +1309,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if (async_waiting( &sock->write_q )) { - if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); + if (debug_level) TRACE( "activating write queue for socket %p\n", sock ); async_wake_up( &sock->write_q, STATUS_ALERTED ); } event &= ~POLLOUT; @@ -1416,7 +1417,7 @@ static void sock_poll_event( struct fd *fd, int event ) grab_object( sock ); if (debug_level) - fprintf(stderr, "socket %p select event: %x\n", sock, event); + TRACE( "socket %p select event: %x\n", sock, event); if (event & (POLLERR | POLLHUP)) error = sock_error( sock, &event ); @@ -1476,7 +1477,7 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLERR; sock->errors[AFD_POLL_BIT_HUP] = error; if ( debug_level ) - fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); + TRACE( "recv error on socket %p: %d\n", sock, errno ); } } } @@ -1490,7 +1491,7 @@ static void sock_poll_event( struct fd *fd, int event ) sock->aborted = 1; if (debug_level) - fprintf( stderr, "socket %p aborted by error %d, event %#x\n", sock, error, event ); + TRACE( "socket %p aborted by error %d, event %#x\n", sock, error, event ); } if (hangup_seen) @@ -1510,7 +1511,7 @@ static void sock_dump( struct object *obj, int verbose ) { struct sock *sock = (struct sock *)obj; assert( obj->ops == &sock_ops ); - fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, reported=%x\n", + TRACE( "Socket fd=%p, state=%x, mask=%x, pending=%x, reported=%x\n", sock->fd, sock->state, sock->mask, sock->pending_events, sock->reported_events ); } @@ -2281,7 +2282,7 @@ static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) /* SO_BINDTODEVICE requires NET_CAP_RAW until Linux 5.7. */ if (debug_level) - fprintf( stderr, "setsockopt SO_BINDTODEVICE fd %d, name %s failed: %s, falling back to SO_REUSE_ADDR\n", + TRACE( "setsockopt SO_BINDTODEVICE fd %d, name %s failed: %s, falling back to SO_REUSE_ADDR\n", fd, name, strerror( errno )); if (!(index = if_nametoindex( name ))) @@ -2347,7 +2348,7 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr if ((err = bind_to_iface_name( fd, bind_addr, ifaddr->ifa_name )) < 0) { if (debug_level) - fprintf( stderr, "failed to bind to interface: %s\n", strerror( errno ) ); + TRACE( "failed to bind to interface: %s\n", strerror( errno ) ); } break; } @@ -2373,7 +2374,7 @@ static unsigned int get_ipv6_interface_index( const struct in6_addr *addr ) if (!index) { if (debug_level) - fprintf( stderr, "Unable to look up interface index for %s: %s\n", + TRACE( "Unable to look up interface index for %s: %s\n", ifaddr->ifa_name, strerror( errno ) ); continue; } @@ -2989,7 +2990,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (event && (sock->pending_events & mask)) { - if (debug_level) fprintf( stderr, "signalling pending events %#x due to event select\n", + if (debug_level) TRACE( "signalling pending events %#x due to event select\n", sock->pending_events & mask ); set_event( event ); } @@ -3742,7 +3743,7 @@ static const struct fd_ops ifchange_fd_ops = static void ifchange_dump( struct object *obj, int verbose ) { assert( obj->ops == &ifchange_ops ); - fprintf( stderr, "Interface change\n" ); + TRACE( "Interface change\n" ); } static struct fd *ifchange_get_fd( struct object *obj ) @@ -4290,7 +4291,7 @@ static MIB_TCP_STATE get_tcp_socket_state( int fd ) return tcp_state_to_mib_state( info.tcpi_state ); if (debug_level) - fprintf( stderr, "getsockopt TCP_INFO failed: %s\n", strerror( errno ) ); + TRACE( "getsockopt TCP_INFO failed: %s\n", strerror( errno ) ); return MIB_TCP_STATE_ESTAB; } diff --git a/server/thread.c b/server/thread.c index 3aed496450a..608a2743aa1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -47,6 +47,7 @@ #include <mach/thread_act.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -250,9 +251,9 @@ void init_threading(void) setrlimit( RLIMIT_NICE, &rlimit ); if (rlimit.rlim_max <= 40) nice_limit = 20 - rlimit.rlim_max; else if (rlimit.rlim_max == -1) nice_limit = -20; - if (nice_limit >= 0 && debug_level) fprintf(stderr, "wine: RLIMIT_NICE is <= 20, unable to use setpriority safely\n"); + if (nice_limit >= 0 && debug_level) TRACE( "wine: RLIMIT_NICE is <= 20, unable to use setpriority safely\n"); } - if (nice_limit < 0 && debug_level) fprintf(stderr, "wine: Using setpriority to control niceness in the [%d,%d] range\n", nice_limit, -nice_limit ); + if (nice_limit < 0 && debug_level) TRACE( "wine: Using setpriority to control niceness in the [%d,%d] range\n", nice_limit, -nice_limit ); } static void apply_thread_priority( struct thread *thread ) @@ -462,7 +463,7 @@ static void dump_context( struct object *obj, int verbose ) struct context *context = (struct context *)obj; assert( obj->ops == &context_ops ); - fprintf( stderr, "context flags=%x/%x\n", + TRACE( "context flags=%x/%x\n", context->regs[CTX_NATIVE].flags, context->regs[CTX_WOW].flags ); } @@ -669,7 +670,7 @@ static void dump_thread( struct object *obj, int verbose ) struct thread *thread = (struct thread *)obj; assert( obj->ops == &thread_ops ); - fprintf( stderr, "Thread id=%04x unix pid=%d unix tid=%d state=%d\n", + TRACE( "Thread id=%04x unix pid=%d unix tid=%d state=%d\n", thread->id, thread->unix_pid, thread->unix_tid, thread->state ); } @@ -693,7 +694,7 @@ static void dump_thread_apc( struct object *obj, int verbose ) struct thread_apc *apc = (struct thread_apc *)obj; assert( obj->ops == &thread_apc_ops ); - fprintf( stderr, "APC owner=%p type=%u\n", apc->owner, apc->call.type ); + TRACE( "APC owner=%p type=%u\n", apc->owner, apc->call.type ); } static struct object *thread_apc_get_sync( struct object *obj ) @@ -1237,7 +1238,7 @@ int wake_thread( struct thread *thread ) cookie = thread->wait->cookie; signaled = end_wait( thread, signaled ); - if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); + if (debug_level) TRACE( "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); if (cookie && send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ { if (!count) count = -1; @@ -1262,7 +1263,7 @@ int wake_thread_queue_entry( struct wait_queue_entry *entry ) cookie = wait->cookie; signaled = end_wait( thread, entry - wait->queues ); - if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); + if (debug_level) TRACE( "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); if (!cookie || send_thread_wakeup( thread, cookie, signaled ) != -1) wake_thread( thread ); /* check other waits too */ @@ -1281,7 +1282,7 @@ static void thread_timeout( void *ptr ) if (thread->wait != wait) return; /* not the top-level wait, ignore it */ if (is_thread_suspended( thread )) return; /* suspended, ignore it */ - if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=TIMEOUT\n", thread->id ); + if (debug_level) TRACE( "%04x: *wakeup* signaled=TIMEOUT\n", thread->id ); end_wait( thread, STATUS_TIMEOUT ); assert( cookie ); @@ -1612,7 +1613,7 @@ void kill_thread( struct thread *thread, int violent_death ) thread->exit_time = current_time; if (current == thread) current = NULL; if (debug_level) - fprintf( stderr,"%04x: *killed* exit_code=%d\n", + TRACE("%04x: *killed* exit_code=%d\n", thread->id, thread->exit_code ); if (thread->wait) { diff --git a/server/timer.c b/server/timer.c index a4309d54045..88e03474219 100644 --- a/server/timer.c +++ b/server/timer.c @@ -27,6 +27,7 @@ #include <sys/types.h> #include <stdarg.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -206,7 +207,7 @@ static void timer_dump( struct object *obj, int verbose ) struct timer *timer = (struct timer *)obj; timeout_t timeout = abstime_to_timeout( timer->when ); assert( obj->ops == &timer_ops ); - fprintf( stderr, "Timer manual=%d when=%s period=%u\n", + TRACE( "Timer manual=%d when=%s period=%u\n", timer->manual, get_timeout_str(timeout), timer->period ); } diff --git a/server/token.c b/server/token.c index 5ce7298211e..120dceb61a3 100644 --- a/server/token.c +++ b/server/token.c @@ -29,6 +29,7 @@ #include <sys/types.h> #include <unistd.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -166,7 +167,7 @@ static void token_dump( struct object *obj, int verbose ) { struct token *token = (struct token *)obj; assert( obj->ops == &token_ops ); - fprintf( stderr, "Token id=%d.%u primary=%u impersonation level=%d\n", token->token_id.high_part, + TRACE( "Token id=%d.%u primary=%u impersonation level=%d\n", token->token_id.high_part, token->token_id.low_part, token->primary, token->impersonation_level ); } diff --git a/server/trace.c b/server/trace.c index 8f0f622fb48..4b9a56e88f3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -40,6 +40,7 @@ #include <sys/uio.h> #endif +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -85,10 +86,10 @@ static const char *get_status_name( unsigned int status ) static void dump_uints( const char *prefix, const unsigned int *ptr, int len ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (len > 0) { - fprintf( stderr, "%08x", *ptr++ ); + TRACE_RAW( "%08x", *ptr++ ); if (--len) fputc( ',', stderr ); } fputc( '}', stderr ); @@ -98,10 +99,10 @@ static void dump_handles( const char *prefix, const obj_handle_t *data, data_siz { data_size_t len = size / sizeof(*data); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { - fprintf( stderr, "%04x", *data++ ); + TRACE_RAW( "%04x", *data++ ); if (--len) fputc( ',', stderr ); } fputc( '}', stderr ); @@ -109,7 +110,7 @@ static void dump_handles( const char *prefix, const obj_handle_t *data, data_siz static void dump_timeout( const char *prefix, const timeout_t *time ) { - fprintf( stderr, "%s%s", prefix, get_timeout_str(*time) ); + TRACE_RAW( "%s%s", prefix, get_timeout_str(*time) ); } static void dump_abstime( const char *prefix, const abstime_t *when ) @@ -121,9 +122,9 @@ static void dump_abstime( const char *prefix, const abstime_t *when ) static void dump_uint64( const char *prefix, const unsigned __int64 *val ) { if ((unsigned int)*val != *val) - fprintf( stderr, "%s%x%08x", prefix, (unsigned int)(*val >> 32), (unsigned int)*val ); + TRACE_RAW( "%s%x%08x", prefix, (unsigned int)(*val >> 32), (unsigned int)*val ); else - fprintf( stderr, "%s%08x", prefix, (unsigned int)*val ); + TRACE_RAW( "%s%08x", prefix, (unsigned int)*val ); } static void dump_uint128( const char *prefix, const unsigned __int64 val[2] ) @@ -131,20 +132,20 @@ static void dump_uint128( const char *prefix, const unsigned __int64 val[2] ) unsigned __int64 low = val[0], high = val[1]; if ((unsigned int)high != high) - fprintf( stderr, "%s%x%08x%08x%08x", prefix, (unsigned int)(high >> 32), (unsigned int)high, + TRACE_RAW( "%s%x%08x%08x%08x", prefix, (unsigned int)(high >> 32), (unsigned int)high, (unsigned int)(low >> 32), (unsigned int)low ); else if (high) - fprintf( stderr, "%s%x%08x%08x", prefix, (unsigned int)high, + TRACE_RAW( "%s%x%08x%08x", prefix, (unsigned int)high, (unsigned int)(low >> 32), (unsigned int)low ); else if ((unsigned int)low != low) - fprintf( stderr, "%s%x%08x", prefix, (unsigned int)(low >> 32), (unsigned int)low ); + TRACE_RAW( "%s%x%08x", prefix, (unsigned int)(low >> 32), (unsigned int)low ); else - fprintf( stderr, "%s%x", prefix, (unsigned int)low ); + TRACE_RAW( "%s%x", prefix, (unsigned int)low ); } static void dump_uints64( const char *prefix, const unsigned __int64 *ptr, int len ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); if (len-- > 0) dump_uint64( "", ptr++ ); while (len-- > 0) dump_uint64( ",", ptr++ ); fputc( '}', stderr ); @@ -152,7 +153,7 @@ static void dump_uints64( const char *prefix, const unsigned __int64 *ptr, int l static void dump_rectangle( const char *prefix, const struct rectangle *rect ) { - fprintf( stderr, "%s{%d,%d;%d,%d}", prefix, + TRACE_RAW( "%s{%d,%d;%d,%d}", prefix, rect->left, rect->top, rect->right, rect->bottom ); } @@ -160,7 +161,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) { switch(*code) { -#define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break +#define CASE(c) case c: TRACE_RAW( "%s%s", prefix, #c ); break CASE(IOCTL_CONDRV_ACTIVATE); CASE(IOCTL_CONDRV_BIND_PID); CASE(IOCTL_CONDRV_CTRL_EVENT); @@ -189,18 +190,18 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_SERIAL_SET_TIMEOUTS); CASE(IOCTL_SERIAL_SET_WAIT_MASK); CASE(WS_SIO_ADDRESS_LIST_CHANGE); - default: fprintf( stderr, "%s%08x", prefix, *code ); break; + default: TRACE_RAW( "%s%08x", prefix, *code ); break; #undef CASE } } static void dump_apc_call( const char *prefix, const union apc_call *call ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); switch(call->type) { case APC_NONE: - fprintf( stderr, "APC_NONE" ); + TRACE_RAW( "APC_NONE" ); break; case APC_USER: dump_uint64( "APC_USER,func=", &call->user.func ); @@ -209,13 +210,13 @@ static void dump_apc_call( const char *prefix, const union apc_call *call ) case APC_ASYNC_IO: dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user ); dump_uint64( ",sb=", &call->async_io.sb ); - fprintf( stderr, ",status=%s,result=%u", get_status_name(call->async_io.status), call->async_io.result ); + TRACE_RAW( ",status=%s,result=%u", get_status_name(call->async_io.status), call->async_io.result ); break; case APC_VIRTUAL_ALLOC: dump_uint64( "APC_VIRTUAL_ALLOC,addr=", &call->virtual_alloc.addr ); dump_uint64( ",size=", &call->virtual_alloc.size ); dump_uint64( ",zero_bits=", &call->virtual_alloc.zero_bits ); - fprintf( stderr, ",op_type=%x,prot=%x", call->virtual_alloc.op_type, call->virtual_alloc.prot ); + TRACE_RAW( ",op_type=%x,prot=%x", call->virtual_alloc.op_type, call->virtual_alloc.prot ); break; case APC_VIRTUAL_ALLOC_EX: dump_uint64( "APC_VIRTUAL_ALLOC_EX,addr=", &call->virtual_alloc_ex.addr ); @@ -223,14 +224,14 @@ static void dump_apc_call( const char *prefix, const union apc_call *call ) dump_uint64( ",limit_low=", &call->virtual_alloc_ex.limit_low ); dump_uint64( ",limit_high=", &call->virtual_alloc_ex.limit_high ); dump_uint64( ",align=", &call->virtual_alloc_ex.align ); - fprintf( stderr, ",op_type=%x,prot=%x,attributes=%x", + TRACE_RAW( ",op_type=%x,prot=%x,attributes=%x", call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot, call->virtual_alloc_ex.attributes ); break; case APC_VIRTUAL_FREE: dump_uint64( "APC_VIRTUAL_FREE,addr=", &call->virtual_free.addr ); dump_uint64( ",size=", &call->virtual_free.size ); - fprintf( stderr, ",op_type=%x", call->virtual_free.op_type ); + TRACE_RAW( ",op_type=%x", call->virtual_free.op_type ); break; case APC_VIRTUAL_QUERY: dump_uint64( "APC_VIRTUAL_QUERY,addr=", &call->virtual_query.addr ); @@ -238,7 +239,7 @@ static void dump_apc_call( const char *prefix, const union apc_call *call ) case APC_VIRTUAL_PROTECT: dump_uint64( "APC_VIRTUAL_PROTECT,addr=", &call->virtual_protect.addr ); dump_uint64( ",size=", &call->virtual_protect.size ); - fprintf( stderr, ",prot=%x", call->virtual_protect.prot ); + TRACE_RAW( ",prot=%x", call->virtual_protect.prot ); break; case APC_VIRTUAL_FLUSH: dump_uint64( "APC_VIRTUAL_FLUSH,addr=", &call->virtual_flush.addr ); @@ -253,21 +254,21 @@ static void dump_apc_call( const char *prefix, const union apc_call *call ) dump_uint64( ",size=", &call->virtual_unlock.size ); break; case APC_MAP_VIEW: - fprintf( stderr, "APC_MAP_VIEW,handle=%04x", call->map_view.handle ); + TRACE_RAW( "APC_MAP_VIEW,handle=%04x", call->map_view.handle ); dump_uint64( ",addr=", &call->map_view.addr ); dump_uint64( ",size=", &call->map_view.size ); dump_uint64( ",offset=", &call->map_view.offset ); dump_uint64( ",zero_bits=", &call->map_view.zero_bits ); - fprintf( stderr, ",alloc_type=%x,prot=%x", call->map_view.alloc_type, call->map_view.prot ); + TRACE_RAW( ",alloc_type=%x,prot=%x", call->map_view.alloc_type, call->map_view.prot ); break; case APC_MAP_VIEW_EX: - fprintf( stderr, "APC_MAP_VIEW_EX,handle=%04x", call->map_view_ex.handle ); + TRACE_RAW( "APC_MAP_VIEW_EX,handle=%04x", call->map_view_ex.handle ); dump_uint64( ",addr=", &call->map_view_ex.addr ); dump_uint64( ",size=", &call->map_view_ex.size ); dump_uint64( ",offset=", &call->map_view_ex.offset ); dump_uint64( ",limit_low=", &call->map_view_ex.limit_low ); dump_uint64( ",limit_high=", &call->map_view_ex.limit_high ); - fprintf( stderr, ",alloc_type=%x,prot=%x,machine=%04x", + TRACE_RAW( ",alloc_type=%x,prot=%x,machine=%04x", call->map_view_ex.alloc_type, call->map_view_ex.prot, call->map_view_ex.machine ); break; case APC_UNMAP_VIEW: @@ -279,15 +280,15 @@ static void dump_apc_call( const char *prefix, const union apc_call *call ) dump_uint64( ",zero_bits=", &call->create_thread.zero_bits ); dump_uint64( ",reserve=", &call->create_thread.reserve ); dump_uint64( ",commit=", &call->create_thread.commit ); - fprintf( stderr, ",flags=%x", call->create_thread.flags ); + TRACE_RAW( ",flags=%x", call->create_thread.flags ); break; case APC_DUP_HANDLE: - fprintf( stderr, "APC_DUP_HANDLE,src_handle=%04x,dst_process=%04x,access=%x,attributes=%x,options=%x", + TRACE_RAW( "APC_DUP_HANDLE,src_handle=%04x,dst_process=%04x,access=%x,attributes=%x,options=%x", call->dup_handle.src_handle, call->dup_handle.dst_process, call->dup_handle.access, call->dup_handle.attributes, call->dup_handle.options ); break; default: - fprintf( stderr, "type=%u", call->type ); + TRACE_RAW( "type=%u", call->type ); break; } fputc( '}', stderr ); @@ -295,83 +296,83 @@ static void dump_apc_call( const char *prefix, const union apc_call *call ) static void dump_apc_result( const char *prefix, const union apc_result *result ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); switch(result->type) { case APC_NONE: break; case APC_ASYNC_IO: - fprintf( stderr, "APC_ASYNC_IO,status=%s,total=%u", + TRACE_RAW( "APC_ASYNC_IO,status=%s,total=%u", get_status_name( result->async_io.status ), result->async_io.total ); break; case APC_VIRTUAL_ALLOC: - fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s", + TRACE_RAW( "APC_VIRTUAL_ALLOC,status=%s", get_status_name( result->virtual_alloc.status )); dump_uint64( ",addr=", &result->virtual_alloc.addr ); dump_uint64( ",size=", &result->virtual_alloc.size ); break; case APC_VIRTUAL_FREE: - fprintf( stderr, "APC_VIRTUAL_FREE,status=%s", + TRACE_RAW( "APC_VIRTUAL_FREE,status=%s", get_status_name( result->virtual_free.status )); dump_uint64( ",addr=", &result->virtual_free.addr ); dump_uint64( ",size=", &result->virtual_free.size ); break; case APC_VIRTUAL_QUERY: - fprintf( stderr, "APC_VIRTUAL_QUERY,status=%s", + TRACE_RAW( "APC_VIRTUAL_QUERY,status=%s", get_status_name( result->virtual_query.status )); dump_uint64( ",base=", &result->virtual_query.base ); dump_uint64( ",alloc_base=", &result->virtual_query.alloc_base ); dump_uint64( ",size=", &result->virtual_query.size ); - fprintf( stderr, ",state=%x,prot=%x,alloc_prot=%x,alloc_type=%x", + TRACE_RAW( ",state=%x,prot=%x,alloc_prot=%x,alloc_type=%x", result->virtual_query.state, result->virtual_query.prot, result->virtual_query.alloc_prot, result->virtual_query.alloc_type ); break; case APC_VIRTUAL_PROTECT: - fprintf( stderr, "APC_VIRTUAL_PROTECT,status=%s", + TRACE_RAW( "APC_VIRTUAL_PROTECT,status=%s", get_status_name( result->virtual_protect.status )); dump_uint64( ",addr=", &result->virtual_protect.addr ); dump_uint64( ",size=", &result->virtual_protect.size ); - fprintf( stderr, ",prot=%x", result->virtual_protect.prot ); + TRACE_RAW( ",prot=%x", result->virtual_protect.prot ); break; case APC_VIRTUAL_FLUSH: - fprintf( stderr, "APC_VIRTUAL_FLUSH,status=%s", + TRACE_RAW( "APC_VIRTUAL_FLUSH,status=%s", get_status_name( result->virtual_flush.status )); dump_uint64( ",addr=", &result->virtual_flush.addr ); dump_uint64( ",size=", &result->virtual_flush.size ); break; case APC_VIRTUAL_LOCK: - fprintf( stderr, "APC_VIRTUAL_LOCK,status=%s", + TRACE_RAW( "APC_VIRTUAL_LOCK,status=%s", get_status_name( result->virtual_lock.status )); dump_uint64( ",addr=", &result->virtual_lock.addr ); dump_uint64( ",size=", &result->virtual_lock.size ); break; case APC_VIRTUAL_UNLOCK: - fprintf( stderr, "APC_VIRTUAL_UNLOCK,status=%s", + TRACE_RAW( "APC_VIRTUAL_UNLOCK,status=%s", get_status_name( result->virtual_unlock.status )); dump_uint64( ",addr=", &result->virtual_unlock.addr ); dump_uint64( ",size=", &result->virtual_unlock.size ); break; case APC_MAP_VIEW: - fprintf( stderr, "APC_MAP_VIEW,status=%s", + TRACE_RAW( "APC_MAP_VIEW,status=%s", get_status_name( result->map_view.status )); dump_uint64( ",addr=", &result->map_view.addr ); dump_uint64( ",size=", &result->map_view.size ); break; case APC_UNMAP_VIEW: - fprintf( stderr, "APC_UNMAP_VIEW,status=%s", + TRACE_RAW( "APC_UNMAP_VIEW,status=%s", get_status_name( result->unmap_view.status ) ); break; case APC_CREATE_THREAD: - fprintf( stderr, "APC_CREATE_THREAD,status=%s,pid=%04x,tid=%04x,handle=%04x", + TRACE_RAW( "APC_CREATE_THREAD,status=%s,pid=%04x,tid=%04x,handle=%04x", get_status_name( result->create_thread.status ), result->create_thread.pid, result->create_thread.tid, result->create_thread.handle ); break; case APC_DUP_HANDLE: - fprintf( stderr, "APC_DUP_HANDLE,status=%s,handle=%04x", + TRACE_RAW( "APC_DUP_HANDLE,status=%s,handle=%04x", get_status_name( result->dup_handle.status ), result->dup_handle.handle ); break; default: - fprintf( stderr, "type=%u", result->type ); + TRACE_RAW( "type=%u", result->type ); break; } fputc( '}', stderr ); @@ -379,7 +380,7 @@ static void dump_apc_result( const char *prefix, const union apc_result *result static void dump_async_data( const char *prefix, const struct async_data *data ) { - fprintf( stderr, "%s{handle=%04x,event=%04x", prefix, data->handle, data->event ); + TRACE_RAW( "%s{handle=%04x,event=%04x", prefix, data->handle, data->event ); dump_uint64( ",iosb=", &data->iosb ); dump_uint64( ",user=", &data->user ); dump_uint64( ",apc=", &data->apc ); @@ -392,57 +393,57 @@ static void dump_irp_params( const char *prefix, const union irp_params *data ) switch (data->type) { case IRP_CALL_NONE: - fprintf( stderr, "%s{NONE}", prefix ); + TRACE_RAW( "%s{NONE}", prefix ); break; case IRP_CALL_CREATE: - fprintf( stderr, "%s{CREATE,access=%08x,sharing=%08x,options=%08x", + TRACE_RAW( "%s{CREATE,access=%08x,sharing=%08x,options=%08x", prefix, data->create.access, data->create.sharing, data->create.options ); dump_uint64( ",device=", &data->create.device ); - fprintf( stderr, ",file=%08x}", data->create.file ); + TRACE_RAW( ",file=%08x}", data->create.file ); break; case IRP_CALL_CLOSE: - fprintf( stderr, "%s{CLOSE", prefix ); + TRACE_RAW( "%s{CLOSE", prefix ); dump_uint64( ",file=", &data->close.file ); fputc( '}', stderr ); break; case IRP_CALL_READ: - fprintf( stderr, "%s{READ,key=%08x,out_size=%u", prefix, data->read.key, + TRACE_RAW( "%s{READ,key=%08x,out_size=%u", prefix, data->read.key, data->read.out_size ); dump_uint64( ",pos=", &data->read.pos ); dump_uint64( ",file=", &data->read.file ); fputc( '}', stderr ); break; case IRP_CALL_WRITE: - fprintf( stderr, "%s{WRITE,key=%08x", prefix, data->write.key ); + TRACE_RAW( "%s{WRITE,key=%08x", prefix, data->write.key ); dump_uint64( ",pos=", &data->write.pos ); dump_uint64( ",file=", &data->write.file ); fputc( '}', stderr ); break; case IRP_CALL_FLUSH: - fprintf( stderr, "%s{FLUSH", prefix ); + TRACE_RAW( "%s{FLUSH", prefix ); dump_uint64( ",file=", &data->flush.file ); fputc( '}', stderr ); break; case IRP_CALL_IOCTL: - fprintf( stderr, "%s{IOCTL", prefix ); + TRACE_RAW( "%s{IOCTL", prefix ); dump_ioctl_code( ",code=", &data->ioctl.code ); - fprintf( stderr, ",out_size=%u", data->ioctl.out_size ); + TRACE_RAW( ",out_size=%u", data->ioctl.out_size ); dump_uint64( ",file=", &data->ioctl.file ); fputc( '}', stderr ); break; case IRP_CALL_VOLUME: - fprintf( stderr, "%s{VOLUME,class=%u,out_size=%u", prefix, + TRACE_RAW( "%s{VOLUME,class=%u,out_size=%u", prefix, data->volume.info_class, data->volume.out_size ); dump_uint64( ",file=", &data->volume.file ); fputc( '}', stderr ); break; case IRP_CALL_FREE: - fprintf( stderr, "%s{FREE", prefix ); + TRACE_RAW( "%s{FREE", prefix ); dump_uint64( ",obj=", &data->free.obj ); fputc( '}', stderr ); break; case IRP_CALL_CANCEL: - fprintf( stderr, "%s{CANCEL", prefix ); + TRACE_RAW( "%s{CANCEL", prefix ); dump_uint64( ",irp=", &data->cancel.irp ); fputc( '}', stderr ); break; @@ -454,58 +455,58 @@ static void dump_hw_input( const char *prefix, const union hw_input *input ) switch (input->type) { case INPUT_MOUSE: - fprintf( stderr, "%s{type=MOUSE,x=%d,y=%d,data=%08x,flags=%08x,time=%u", + TRACE_RAW( "%s{type=MOUSE,x=%d,y=%d,data=%08x,flags=%08x,time=%u", prefix, input->mouse.x, input->mouse.y, input->mouse.data, input->mouse.flags, input->mouse.time ); dump_uint64( ",info=", &input->mouse.info ); fputc( '}', stderr ); break; case INPUT_KEYBOARD: - fprintf( stderr, "%s{type=KEYBOARD,vkey=%04hx,scan=%04hx,flags=%08x,time=%u", + TRACE_RAW( "%s{type=KEYBOARD,vkey=%04hx,scan=%04hx,flags=%08x,time=%u", prefix, input->kbd.vkey, input->kbd.scan, input->kbd.flags, input->kbd.time ); dump_uint64( ",info=", &input->kbd.info ); fputc( '}', stderr ); break; case INPUT_HARDWARE: - fprintf( stderr, "%s{type=HARDWARE,msg=%04x", prefix, input->hw.msg ); + TRACE_RAW( "%s{type=HARDWARE,msg=%04x", prefix, input->hw.msg ); dump_uint64( ",wparam=", &input->hw.wparam ); dump_uint64( ",lparam=", &input->hw.lparam ); switch (input->hw.msg) { case WM_INPUT: - fprintf( stderr, "%s{type=HID,device=%04x,usage=%04x:%04x,count=%u,length=%u}", + TRACE_RAW( "%s{type=HID,device=%04x,usage=%04x:%04x,count=%u,length=%u}", prefix, input->hw.hid.device, HIWORD(input->hw.hid.usage), LOWORD(input->hw.hid.usage), input->hw.hid.count, input->hw.hid.length ); break; case WM_INPUT_DEVICE_CHANGE: - fprintf( stderr, "%s{type=HID,device=%04x,usage=%04x:%04x}", + TRACE_RAW( "%s{type=HID,device=%04x,usage=%04x:%04x}", prefix, input->hw.hid.device, HIWORD(input->hw.hid.usage), LOWORD(input->hw.hid.usage) ); break; } fputc( '}', stderr ); break; default: - fprintf( stderr, "%s{type=%04x}", prefix, input->type ); + TRACE_RAW( "%s{type=%04x}", prefix, input->type ); break; } } static void dump_obj_locator( const char *prefix, const struct obj_locator *locator ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); dump_uint64( "id=", &locator->id ); dump_uint64( ",offset=", &locator->offset ); - fprintf( stderr, "}" ); + TRACE_RAW( "}" ); } static void dump_luid( const char *prefix, const struct luid *luid ) { - fprintf( stderr, "%s%d.%u", prefix, luid->high_part, luid->low_part ); + TRACE_RAW( "%s%d.%u", prefix, luid->high_part, luid->low_part ); } static void dump_generic_map( const char *prefix, const struct generic_map *map ) { - fprintf( stderr, "%s{r=%08x,w=%08x,x=%08x,a=%08x}", + TRACE_RAW( "%s{r=%08x,w=%08x,x=%08x,a=%08x}", prefix, map->read, map->write, map->exec, map->all ); } @@ -514,10 +515,10 @@ static void dump_varargs_ints( const char *prefix, data_size_t size ) const int *data = cur_data; data_size_t len = size / sizeof(*data); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { - fprintf( stderr, "%d", *data++ ); + TRACE_RAW( "%d", *data++ ); if (--len) fputc( ',', stderr ); } fputc( '}', stderr ); @@ -545,10 +546,10 @@ static void dump_varargs_ushorts( const char *prefix, data_size_t size ) const unsigned short *data = cur_data; data_size_t len = size / sizeof(*data); - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (len > 0) { - fprintf( stderr, "%04x", *data++ ); + TRACE_RAW( "%04x", *data++ ); if (--len) fputc( ',', stderr ); } fputc( '}', stderr ); @@ -564,7 +565,7 @@ static void dump_varargs_apc_call( const char *prefix, data_size_t size ) dump_apc_call( prefix, call ); size = sizeof(*call); } - else fprintf( stderr, "%s{}", prefix ); + else TRACE_RAW( "%s{}", prefix ); remove_data( size ); } @@ -586,38 +587,38 @@ static void dump_varargs_select_op( const char *prefix, data_size_t size ) if (!size) { - fprintf( stderr, "%s{}", prefix ); + TRACE_RAW( "%s{}", prefix ); return; } memset( &data, 0, sizeof(data) ); memcpy( &data, cur_data, min( size, sizeof(data) )); - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); switch (data.op) { case SELECT_NONE: - fprintf( stderr, "NONE" ); + TRACE_RAW( "NONE" ); break; case SELECT_WAIT: case SELECT_WAIT_ALL: - fprintf( stderr, "%s", data.op == SELECT_WAIT ? "WAIT" : "WAIT_ALL" ); + TRACE_RAW( "%s", data.op == SELECT_WAIT ? "WAIT" : "WAIT_ALL" ); if (size > offsetof( union select_op, wait.handles )) dump_handles( ",handles=", data.wait.handles, min( size, sizeof(data.wait) ) - offsetof( union select_op, wait.handles )); break; case SELECT_SIGNAL_AND_WAIT: - fprintf( stderr, "SIGNAL_AND_WAIT,signal=%04x,wait=%04x", + TRACE_RAW( "SIGNAL_AND_WAIT,signal=%04x,wait=%04x", data.signal_and_wait.signal, data.signal_and_wait.wait ); break; case SELECT_KEYED_EVENT_WAIT: case SELECT_KEYED_EVENT_RELEASE: - fprintf( stderr, "KEYED_EVENT_%s,handle=%04x", + TRACE_RAW( "KEYED_EVENT_%s,handle=%04x", data.op == SELECT_KEYED_EVENT_WAIT ? "WAIT" : "RELEASE", data.keyed_event.handle ); dump_uint64( ",key=", &data.keyed_event.key ); break; default: - fprintf( stderr, "op=%u", data.op ); + TRACE_RAW( "op=%u", data.op ); break; } fputc( '}', stderr ); @@ -629,10 +630,10 @@ static void dump_varargs_user_handles( const char *prefix, data_size_t size ) const user_handle_t *data = cur_data; data_size_t len = size / sizeof(*data); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { - fprintf( stderr, "%08x", *data++ ); + TRACE_RAW( "%08x", *data++ ); if (--len) fputc( ',', stderr ); } fputc( '}', stderr ); @@ -644,26 +645,26 @@ static void dump_varargs_bytes( const char *prefix, data_size_t size ) const unsigned char *data = cur_data; data_size_t len = min( 1024, size ); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { - fprintf( stderr, "%02x", *data++ ); + TRACE_RAW( "%02x", *data++ ); if (--len) fputc( ',', stderr ); } - if (size > 1024) fprintf( stderr, "...(total %u)", size ); + if (size > 1024) TRACE_RAW( "...(total %u)", size ); fputc( '}', stderr ); remove_data( size ); } static void dump_varargs_string( const char *prefix, data_size_t size ) { - fprintf( stderr, "%s\"%.*s\"", prefix, (int)size, (const char *)cur_data ); + TRACE_RAW( "%s\"%.*s\"", prefix, (int)size, (const char *)cur_data ); remove_data( size ); } static void dump_varargs_unicode_str( const char *prefix, data_size_t size ) { - fprintf( stderr, "%sL\"", prefix ); + TRACE_RAW( "%sL\"", prefix ); dump_strW( cur_data, size, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( size ); @@ -671,7 +672,7 @@ static void dump_varargs_unicode_str( const char *prefix, data_size_t size ) static void dump_varargs_unicode_strings( const char *prefix, data_size_t size ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (cur_size >= sizeof(WCHAR)) { const WCHAR *str = cur_data; @@ -696,7 +697,7 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) if (!size) { - fprintf( stderr, "%s{}", prefix ); + TRACE_RAW( "%s{}", prefix ); return; } size = min( size, sizeof(ctx) ); @@ -706,36 +707,36 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) switch (ctx.machine) { case IMAGE_FILE_MACHINE_I386: - fprintf( stderr, "%s{machine=i386", prefix ); + TRACE_RAW( "%s{machine=i386", prefix ); if (ctx.flags & SERVER_CTX_CONTROL) - fprintf( stderr, ",eip=%08x,esp=%08x,ebp=%08x,eflags=%08x,cs=%04x,ss=%04x", + TRACE_RAW( ",eip=%08x,esp=%08x,ebp=%08x,eflags=%08x,cs=%04x,ss=%04x", ctx.ctl.i386_regs.eip, ctx.ctl.i386_regs.esp, ctx.ctl.i386_regs.ebp, ctx.ctl.i386_regs.eflags, ctx.ctl.i386_regs.cs, ctx.ctl.i386_regs.ss ); if (ctx.flags & SERVER_CTX_SEGMENTS) - fprintf( stderr, ",ds=%04x,es=%04x,fs=%04x,gs=%04x", + TRACE_RAW( ",ds=%04x,es=%04x,fs=%04x,gs=%04x", ctx.seg.i386_regs.ds, ctx.seg.i386_regs.es, ctx.seg.i386_regs.fs, ctx.seg.i386_regs.gs ); if (ctx.flags & SERVER_CTX_INTEGER) - fprintf( stderr, ",eax=%08x,ebx=%08x,ecx=%08x,edx=%08x,esi=%08x,edi=%08x", + TRACE_RAW( ",eax=%08x,ebx=%08x,ecx=%08x,edx=%08x,esi=%08x,edi=%08x", ctx.integer.i386_regs.eax, ctx.integer.i386_regs.ebx, ctx.integer.i386_regs.ecx, ctx.integer.i386_regs.edx, ctx.integer.i386_regs.esi, ctx.integer.i386_regs.edi ); if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) - fprintf( stderr, ",dr0=%08x,dr1=%08x,dr2=%08x,dr3=%08x,dr6=%08x,dr7=%08x", + TRACE_RAW( ",dr0=%08x,dr1=%08x,dr2=%08x,dr3=%08x,dr6=%08x,dr7=%08x", ctx.debug.i386_regs.dr0, ctx.debug.i386_regs.dr1, ctx.debug.i386_regs.dr2, ctx.debug.i386_regs.dr3, ctx.debug.i386_regs.dr6, ctx.debug.i386_regs.dr7 ); if (ctx.flags & SERVER_CTX_FLOATING_POINT) { - fprintf( stderr, ",fp.ctrl=%08x,fp.status=%08x,fp.tag=%08x,fp.err_off=%08x,fp.err_sel=%08x", + TRACE_RAW( ",fp.ctrl=%08x,fp.status=%08x,fp.tag=%08x,fp.err_off=%08x,fp.err_sel=%08x", ctx.fp.i386_regs.ctrl, ctx.fp.i386_regs.status, ctx.fp.i386_regs.tag, ctx.fp.i386_regs.err_off, ctx.fp.i386_regs.err_sel ); - fprintf( stderr, ",fp.data_off=%08x,fp.data_sel=%08x,fp.cr0npx=%08x", + TRACE_RAW( ",fp.data_off=%08x,fp.data_sel=%08x,fp.cr0npx=%08x", ctx.fp.i386_regs.data_off, ctx.fp.i386_regs.data_sel, ctx.fp.i386_regs.cr0npx ); for (i = 0; i < 8; i++) { unsigned __int64 reg[2]; memset( reg, 0, sizeof(reg) ); memcpy( reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); - fprintf( stderr, ",fp.reg%u=", i ); + TRACE_RAW( ",fp.reg%u=", i ); dump_uint128( "", reg ); } } @@ -745,17 +746,17 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) if (ctx.flags & SERVER_CTX_YMM_REGISTERS) for (i = 0; i < 16; i++) { - fprintf( stderr, ",ymm%u=", i ); + TRACE_RAW( ",ymm%u=", i ); dump_uint128( "", (const unsigned __int64 *)&ctx.ymm.regs.ymm_high[i] ); } break; case IMAGE_FILE_MACHINE_AMD64: - fprintf( stderr, "%s{machine=x86_64", prefix ); + TRACE_RAW( "%s{machine=x86_64", prefix ); if (ctx.flags & SERVER_CTX_CONTROL) { dump_uint64( ",rip=", &ctx.ctl.x86_64_regs.rip ); dump_uint64( ",rsp=", &ctx.ctl.x86_64_regs.rsp ); - fprintf( stderr, ",cs=%04x,ss=%04x,flags=%08x", + TRACE_RAW( ",cs=%04x,ss=%04x,flags=%08x", ctx.ctl.x86_64_regs.cs, ctx.ctl.x86_64_regs.ss, ctx.ctl.x86_64_regs.flags ); } if (ctx.flags & SERVER_CTX_INTEGER) @@ -777,7 +778,7 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uint64( ",r15=", &ctx.integer.x86_64_regs.r15 ); } if (ctx.flags & SERVER_CTX_SEGMENTS) - fprintf( stderr, ",ds=%04x,es=%04x,fs=%04x,gs=%04x", + TRACE_RAW( ",ds=%04x,es=%04x,fs=%04x,gs=%04x", ctx.seg.x86_64_regs.ds, ctx.seg.x86_64_regs.es, ctx.seg.x86_64_regs.fs, ctx.seg.x86_64_regs.gs ); if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) @@ -792,44 +793,44 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) if (ctx.flags & SERVER_CTX_FLOATING_POINT) for (i = 0; i < 32; i++) { - fprintf( stderr, ",fp%u=", i ); + TRACE_RAW( ",fp%u=", i ); dump_uint128( "", (const unsigned __int64 *)&ctx.fp.x86_64_regs.fpregs[i] ); } if (ctx.flags & SERVER_CTX_YMM_REGISTERS) for (i = 0; i < 16; i++) { - fprintf( stderr, ",ymm%u=", i ); + TRACE_RAW( ",ymm%u=", i ); dump_uint128( "", (const unsigned __int64 *)&ctx.ymm.regs.ymm_high[i] ); } break; case IMAGE_FILE_MACHINE_ARMNT: - fprintf( stderr, "%s{machine=arm", prefix ); + TRACE_RAW( "%s{machine=arm", prefix ); if (ctx.flags & SERVER_CTX_CONTROL) - fprintf( stderr, ",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x", + TRACE_RAW( ",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x", ctx.ctl.arm_regs.sp, ctx.ctl.arm_regs.lr, ctx.ctl.arm_regs.pc, ctx.ctl.arm_regs.cpsr ); if (ctx.flags & SERVER_CTX_INTEGER) - for (i = 0; i < 13; i++) fprintf( stderr, ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); + for (i = 0; i < 13; i++) TRACE_RAW( ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) { for (i = 0; i < 8; i++) - fprintf( stderr, ",bcr%u=%08x,bvr%u=%08x", + TRACE_RAW( ",bcr%u=%08x,bvr%u=%08x", i, ctx.debug.arm_regs.bcr[i], i, ctx.debug.arm_regs.bvr[i] ); - fprintf( stderr, ",wcr0=%08x,wvr0=%08x", + TRACE_RAW( ",wcr0=%08x,wvr0=%08x", ctx.debug.arm_regs.wcr[0], ctx.debug.arm_regs.wvr[0] ); } if (ctx.flags & SERVER_CTX_FLOATING_POINT) { for (i = 0; i < 32; i++) { - fprintf( stderr, ",d%u=", i ); + TRACE_RAW( ",d%u=", i ); dump_uint64( "", &ctx.fp.arm_regs.d[i] ); } - fprintf( stderr, ",fpscr=%08x", ctx.fp.arm_regs.fpscr ); + TRACE_RAW( ",fpscr=%08x", ctx.fp.arm_regs.fpscr ); } break; case IMAGE_FILE_MACHINE_ARM64: - fprintf( stderr, "%s{machine=arm64", prefix ); + TRACE_RAW( "%s{machine=arm64", prefix ); if (ctx.flags & SERVER_CTX_CONTROL) { dump_uint64( ",sp=", &ctx.ctl.arm64_regs.sp ); @@ -840,7 +841,7 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) { for (i = 0; i < 31; i++) { - fprintf( stderr, ",x%u=", i ); + TRACE_RAW( ",x%u=", i ); dump_uint64( "", &ctx.integer.arm64_regs.x[i] ); } } @@ -848,12 +849,12 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) { for (i = 0; i < 8; i++) { - fprintf( stderr, ",bcr%u=%08x,bvr%u=", i, ctx.debug.arm64_regs.bcr[i], i ); + TRACE_RAW( ",bcr%u=%08x,bvr%u=", i, ctx.debug.arm64_regs.bcr[i], i ); dump_uint64( "", &ctx.debug.arm64_regs.bvr[i] ); } for (i = 0; i < 2; i++) { - fprintf( stderr, ",wcr%u=%08x,wvr%u=", i, ctx.debug.arm64_regs.wcr[i], i ); + TRACE_RAW( ",wcr%u=%08x,wvr%u=", i, ctx.debug.arm64_regs.wcr[i], i ); dump_uint64( "", &ctx.debug.arm64_regs.wvr[i] ); } } @@ -861,15 +862,15 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) { for (i = 0; i < 32; i++) { - fprintf( stderr, ",q%u=", i ); + TRACE_RAW( ",q%u=", i ); dump_uint64( "", &ctx.fp.arm64_regs.q[i].high ); dump_uint64( "", &ctx.fp.arm64_regs.q[i].low ); } - fprintf( stderr, ",fpcr=%08x,fpsr=%08x", ctx.fp.arm64_regs.fpcr, ctx.fp.arm64_regs.fpsr ); + TRACE_RAW( ",fpcr=%08x,fpsr=%08x", ctx.fp.arm64_regs.fpcr, ctx.fp.arm64_regs.fpsr ); } break; default: - fprintf( stderr, "%s{machine=%04x", prefix, ctx.machine ); + TRACE_RAW( "%s{machine=%04x", prefix, ctx.machine ); break; } if (ctx.flags & SERVER_CTX_EXEC_SPACE) @@ -883,7 +884,7 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) case EXEC_SPACE_EXCEPTION: space = "exception"; break; default: space = "invalid"; break; } - fprintf( stderr, ",exec_space=%s", space ); + TRACE_RAW( ",exec_space=%s", space ); } fputc( '}', stderr ); remove_data( size ); @@ -893,10 +894,10 @@ static void dump_varargs_contexts( const char *prefix, data_size_t size ) { if (!size) { - fprintf( stderr, "%s{}", prefix ); + TRACE_RAW( "%s{}", prefix ); return; } - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (cur_size) { dump_varargs_context( "", cur_size ); @@ -910,7 +911,7 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) if (!size) { - fprintf( stderr, "%s{}", prefix ); + TRACE_RAW( "%s{}", prefix ); return; } size = min( size, sizeof(event) ); @@ -920,36 +921,36 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) switch(event.code) { case DbgIdle: - fprintf( stderr, "%s{idle}", prefix ); + TRACE_RAW( "%s{idle}", prefix ); break; case DbgReplyPending: - fprintf( stderr, "%s{pending}", prefix ); + TRACE_RAW( "%s{pending}", prefix ); break; case DbgCreateThreadStateChange: - fprintf( stderr, "%s{create_thread,thread=%04x", prefix, event.create_thread.handle ); + TRACE_RAW( "%s{create_thread,thread=%04x", prefix, event.create_thread.handle ); dump_uint64( ",start=", &event.create_thread.start ); fputc( '}', stderr ); break; case DbgCreateProcessStateChange: - fprintf( stderr, "%s{create_process,file=%04x,process=%04x,thread=%04x", prefix, + TRACE_RAW( "%s{create_process,file=%04x,process=%04x,thread=%04x", prefix, event.create_process.file, event.create_process.process, event.create_process.thread ); dump_uint64( ",base=", &event.create_process.base ); - fprintf( stderr, ",offset=%d,size=%d", + TRACE_RAW( ",offset=%d,size=%d", event.create_process.dbg_offset, event.create_process.dbg_size ); dump_uint64( ",start=", &event.create_process.start ); fputc( '}', stderr ); break; case DbgExitThreadStateChange: - fprintf( stderr, "%s{exit_thread,code=%d}", prefix, event.exit.exit_code ); + TRACE_RAW( "%s{exit_thread,code=%d}", prefix, event.exit.exit_code ); break; case DbgExitProcessStateChange: - fprintf( stderr, "%s{exit_process,code=%d}", prefix, event.exit.exit_code ); + TRACE_RAW( "%s{exit_process,code=%d}", prefix, event.exit.exit_code ); break; case DbgExceptionStateChange: case DbgBreakpointStateChange: case DbgSingleStepStateChange: - fprintf( stderr, "%s{%s,first=%d,exc_code=%08x,flags=%08x", prefix, + TRACE_RAW( "%s{%s,first=%d,exc_code=%08x,flags=%08x", prefix, event.code == DbgBreakpointStateChange ? "breakpoint" : event.code == DbgSingleStepStateChange ? "singlestep" : "exception", event.exception.first, event.exception.exc_code, event.exception.flags ); @@ -960,20 +961,20 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) fputc( '}', stderr ); break; case DbgLoadDllStateChange: - fprintf( stderr, "%s{load_dll,file=%04x", prefix, event.load_dll.handle ); + TRACE_RAW( "%s{load_dll,file=%04x", prefix, event.load_dll.handle ); dump_uint64( ",base=", &event.load_dll.base ); - fprintf( stderr, ",offset=%d,size=%d", + TRACE_RAW( ",offset=%d,size=%d", event.load_dll.dbg_offset, event.load_dll.dbg_size ); dump_uint64( ",name=", &event.load_dll.name ); fputc( '}', stderr ); break; case DbgUnloadDllStateChange: - fprintf( stderr, "%s{unload_dll", prefix ); + TRACE_RAW( "%s{unload_dll", prefix ); dump_uint64( ",base=", &event.unload_dll.base ); fputc( '}', stderr ); break; default: - fprintf( stderr, "%s{code=??? (%d)}", prefix, event.code ); + TRACE_RAW( "%s{code=??? (%d)}", prefix, event.code ); break; } remove_data( size ); @@ -997,7 +998,7 @@ static void dump_varargs_startup_info( const char *prefix, data_size_t size ) memset( &info, 0, sizeof(info) ); memcpy( &info, cur_data, min( size, sizeof(info) )); - fprintf( stderr, + TRACE_RAW( "%s{debug_flags=%x,console_flags=%x,console=%04x,hstdin=%04x,hstdout=%04x,hstderr=%04x," "x=%u,y=%u,xsize=%u,ysize=%u,xchars=%u,ychars=%u,attribute=%02x,flags=%x,show=%u," "process_group_id=%u", @@ -1012,7 +1013,7 @@ static void dump_varargs_startup_info( const char *prefix, data_size_t size ) pos = dump_inline_unicode_string( "\",desktop=L\"", pos, info.desktop_len, size ); pos = dump_inline_unicode_string( "\",shellinfo=L\"", pos, info.shellinfo_len, size ); dump_inline_unicode_string( "\",runtime=L\"", pos, info.runtime_len, size ); - fprintf( stderr, "\"}" ); + TRACE_RAW( "\"}" ); remove_data( size ); } @@ -1021,7 +1022,7 @@ static void dump_varargs_rectangles( const char *prefix, data_size_t size ) const struct rectangle *rect = cur_data; data_size_t len = size / sizeof(*rect); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { dump_rectangle( "", rect++ ); @@ -1036,10 +1037,10 @@ static void dump_varargs_cursor_positions( const char *prefix, data_size_t size const struct cursor_pos *pos = cur_data; data_size_t len = size / sizeof(*pos); - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (len > 0) { - fprintf( stderr, "{x=%d,y=%d,time=%u", pos->x, pos->y, pos->time ); + TRACE_RAW( "{x=%d,y=%d,time=%u", pos->x, pos->y, pos->time ); dump_uint64( ",info=", &pos->info ); fputc( '}', stderr ); pos++; @@ -1060,10 +1061,10 @@ static void dump_varargs_properties( const char *prefix, data_size_t size ) const struct property_data *prop = cur_data; data_size_t len = size / sizeof(*prop); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { - fprintf( stderr, "{atom=%04x,str=%d", prop->atom, prop->string ); + TRACE_RAW( "{atom=%04x,str=%d", prop->atom, prop->string ); dump_uint64( ",data=", &prop->data ); fputc( '}', stderr ); prop++; @@ -1078,10 +1079,10 @@ static void dump_varargs_luid_attr( const char *prefix, data_size_t size ) const struct luid_attr *lat = cur_data; data_size_t len = size / sizeof(*lat); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { - fprintf( stderr, "{luid=%08x%08x,attrs=%x}", lat->luid.high_part, lat->luid.low_part, lat->attrs ); + TRACE_RAW( "{luid=%08x%08x,attrs=%x}", lat->luid.high_part, lat->luid.low_part, lat->attrs ); lat++; if (--len) fputc( ',', stderr ); } @@ -1093,17 +1094,17 @@ static void dump_inline_sid( const char *prefix, const struct sid *sid, data_siz { DWORD i; - fprintf( stderr,"%s", prefix ); + TRACE_RAW("%s", prefix ); if (sid_valid_size( sid, size )) { - fprintf( stderr, "S-%u-%u", sid->revision, + TRACE_RAW( "S-%u-%u", sid->revision, ((unsigned int)sid->id_auth[2] << 24) | ((unsigned int)sid->id_auth[3] << 16) | ((unsigned int)sid->id_auth[4] << 8) | ((unsigned int)sid->id_auth[5]) ); - for (i = 0; i < sid->sub_count; i++) fprintf( stderr, "-%u", sid->sub_auth[i] ); + for (i = 0; i < sid->sub_count; i++) TRACE_RAW( "-%u", sid->sub_auth[i] ); } - else fprintf( stderr, "<invalid>" ); + else TRACE_RAW( "<invalid>" ); } static void dump_varargs_sid( const char *prefix, data_size_t size ) @@ -1118,12 +1119,12 @@ static void dump_varargs_sids( const char *prefix, data_size_t size ) const struct sid *sid = cur_data; data_size_t len = size; - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { if (!sid_valid_size( sid, len )) { - fprintf( stderr, "bad len %u", len); + TRACE_RAW( "bad len %u", len); break; } dump_inline_sid( "", sid, size ); @@ -1140,12 +1141,12 @@ static void dump_inline_acl( const char *prefix, const struct acl *acl, data_siz const struct ace *ace; ULONG i; - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); if (size) { if (size < sizeof(*acl)) { - fprintf( stderr, "<invalid acl>}" ); + TRACE_RAW( "<invalid acl>}" ); return; } size -= sizeof(*acl); @@ -1158,20 +1159,20 @@ static void dump_inline_acl( const char *prefix, const struct acl *acl, data_siz size -= ace->size; sid_size = ace->size - sizeof(*ace); if (i != 0) fputc( ',', stderr ); - fprintf( stderr, "{type=" ); + TRACE_RAW( "{type=" ); switch (ace->type) { - case ACCESS_DENIED_ACE_TYPE: fprintf( stderr, "ACCESS_DENIED" ); break; - case ACCESS_ALLOWED_ACE_TYPE: fprintf( stderr, "ACCESS_ALLOWED" ); break; - case SYSTEM_AUDIT_ACE_TYPE: fprintf( stderr, "SYSTEM_AUDIT" ); break; - case SYSTEM_ALARM_ACE_TYPE: fprintf( stderr, "SYSTEM_ALARM" ); break; - case SYSTEM_MANDATORY_LABEL_ACE_TYPE: fprintf( stderr, "SYSTEM_MANDATORY_LABEL" ); break; + case ACCESS_DENIED_ACE_TYPE: TRACE_RAW( "ACCESS_DENIED" ); break; + case ACCESS_ALLOWED_ACE_TYPE: TRACE_RAW( "ACCESS_ALLOWED" ); break; + case SYSTEM_AUDIT_ACE_TYPE: TRACE_RAW( "SYSTEM_AUDIT" ); break; + case SYSTEM_ALARM_ACE_TYPE: TRACE_RAW( "SYSTEM_ALARM" ); break; + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: TRACE_RAW( "SYSTEM_MANDATORY_LABEL" ); break; default: - fprintf( stderr, "%02x", ace->type ); + TRACE_RAW( "%02x", ace->type ); sid = NULL; break; } - fprintf( stderr, ",flags=%x,mask=%x", ace->flags, ace->mask ); + TRACE_RAW( ",flags=%x,mask=%x", ace->flags, ace->mask ); if (sid) dump_inline_sid( ",sid=", sid, sid_size ); fputc( '}', stderr ); } @@ -1188,24 +1189,24 @@ static void dump_varargs_acl( const char *prefix, data_size_t size ) static void dump_inline_security_descriptor( const char *prefix, const struct security_descriptor *sd, data_size_t size ) { - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); if (size >= sizeof(struct security_descriptor)) { size_t offset = sizeof(struct security_descriptor); - fprintf( stderr, "control=%08x", sd->control ); + TRACE_RAW( "control=%08x", sd->control ); if ((sd->owner_len > offsetof(struct sid, sub_auth[255])) || (offset + sd->owner_len > size)) return; if (sd->owner_len) dump_inline_sid( ",owner=", (const struct sid *)((const char *)sd + offset), sd->owner_len ); else - fprintf( stderr, ",owner=<not present>" ); + TRACE_RAW( ",owner=<not present>" ); offset += sd->owner_len; if ((sd->group_len > offsetof(struct sid, sub_auth[255])) || (offset + sd->group_len > size)) return; if (sd->group_len) dump_inline_sid( ",group=", (const struct sid *)((const char *)sd + offset), sd->group_len ); else - fprintf( stderr, ",group=<not present>" ); + TRACE_RAW( ",group=<not present>" ); offset += sd->group_len; if ((sd->sacl_len >= MAX_ACL_LEN) || (offset + sd->sacl_len > size)) return; @@ -1230,7 +1231,7 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) data_size_t pos = 0; unsigned int i; - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (size - pos >= sizeof(struct process_info)) { @@ -1240,7 +1241,7 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) if (size - pos < sizeof(*process)) break; if (pos) fputc( ',', stderr ); dump_timeout( "{start_time=", &process->start_time ); - fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,session_id=%08x,handle_count=%u,unix_pid=%d,", + TRACE_RAW( ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,session_id=%08x,handle_count=%u,unix_pid=%d,", process->thread_count, process->priority, process->pid, process->parent_pid, process->session_id, process->handle_count, process->unix_pid ); pos += sizeof(*process); @@ -1248,18 +1249,18 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size ); pos = (pos + 7) & ~7; - fprintf( stderr, "\",threads={" ); + TRACE_RAW( "\",threads={" ); for (i = 0; i < process->thread_count; i++) { const struct thread_info *thread = (const struct thread_info *)((const char *)cur_data + pos); if (size - pos < sizeof(*thread)) break; if (i) fputc( ',', stderr ); dump_timeout( "{start_time=", &thread->start_time ); - fprintf( stderr, ",tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d}", + TRACE_RAW( ",tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d}", thread->tid, thread->base_priority, thread->current_priority, thread->unix_tid ); pos += sizeof(*thread); } - fprintf( stderr, "}}" ); + TRACE_RAW( "}}" ); } fputc( '}', stderr ); remove_data( size ); @@ -1269,7 +1270,7 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size { const struct object_attributes *objattr = cur_data; - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); if (size) { const WCHAR *str; @@ -1278,15 +1279,15 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size (size - sizeof(*objattr) < objattr->sd_len) || (size - sizeof(*objattr) - objattr->sd_len < objattr->name_len)) { - fprintf( stderr, "***invalid***}" ); + TRACE_RAW( "***invalid***}" ); remove_data( size ); return; } - fprintf( stderr, "rootdir=%04x,attributes=%08x", objattr->rootdir, objattr->attributes ); + TRACE_RAW( "rootdir=%04x,attributes=%08x", objattr->rootdir, objattr->attributes ); dump_inline_security_descriptor( ",sd=", (const struct security_descriptor *)(objattr + 1), objattr->sd_len ); str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); - fprintf( stderr, ",name=L\"" ); + TRACE_RAW( ",name=L\"" ); dump_strW( str, objattr->name_len, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( (sizeof(*objattr) + (objattr->sd_len & ~1) + (objattr->name_len & ~1) + 3) & ~3 ); @@ -1298,21 +1299,21 @@ static void dump_varargs_object_type_info( const char *prefix, data_size_t size { const struct object_type_info *info = cur_data; - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); if (size) { if (size < sizeof(*info) || (size - sizeof(*info) < info->name_len)) { - fprintf( stderr, "***invalid***}" ); + TRACE_RAW( "***invalid***}" ); remove_data( size ); return; } - fprintf( stderr, "index=%u,obj_count=%u,handle_count=%u,obj_max=%u,handle_max=%u,valid=%08x", + TRACE_RAW( "index=%u,obj_count=%u,handle_count=%u,obj_max=%u,handle_max=%u,valid=%08x", info->index,info->obj_count, info->handle_count, info->obj_max, info->handle_max, info->valid_access ); dump_generic_map( ",access=", &info->mapping ); - fprintf( stderr, ",name=L\"" ); + TRACE_RAW( ",name=L\"" ); dump_strW( (const WCHAR *)(info + 1), info->name_len, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( min( size, sizeof(*info) + ((info->name_len + 2) & ~3 ))); @@ -1322,7 +1323,7 @@ static void dump_varargs_object_type_info( const char *prefix, data_size_t size static void dump_varargs_object_types_info( const char *prefix, data_size_t size ) { - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (cur_size) dump_varargs_object_type_info( ",", cur_size ); fputc( '}', stderr ); } @@ -1341,7 +1342,7 @@ static void dump_varargs_filesystem_event( const char *prefix, data_size_t size "MODIFIED_STREAM" }; - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (size) { const struct filesystem_event *event = cur_data; @@ -1349,10 +1350,10 @@ static void dump_varargs_filesystem_event( const char *prefix, data_size_t size / sizeof(int) * sizeof(int); if (size < len) break; if (event->action < ARRAY_SIZE( actions ) && actions[event->action]) - fprintf( stderr, "{action=%s", actions[event->action] ); + TRACE_RAW( "{action=%s", actions[event->action] ); else - fprintf( stderr, "{action=%u", event->action ); - fprintf( stderr, ",name=\"%.*s\"}", event->len, event->name ); + TRACE_RAW( "{action=%u", event->action ); + TRACE_RAW( ",name=\"%.*s\"}", event->len, event->name ); size -= len; remove_data( len ); if (size)fputc( ',', stderr ); @@ -1366,17 +1367,17 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) if (!size) { - fprintf( stderr, "%s{}", prefix ); + TRACE_RAW( "%s{}", prefix ); return; } memset( &info, 0, sizeof(info) ); memcpy( &info, cur_data, min( size, sizeof(info) )); - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); dump_uint64( "base=", &info.base ); dump_uint64( ",stack_size=", &info.stack_size ); dump_uint64( ",stack_commit=", &info.stack_commit ); - fprintf( stderr, ",entry_point=%08x,map_size=%08x,zerobits=%08x,subsystem=%08x,subsystem_minor=%04x,subsystem_major=%04x" + TRACE_RAW( ",entry_point=%08x,map_size=%08x,zerobits=%08x,subsystem=%08x,subsystem_minor=%04x,subsystem_major=%04x" ",osversion_major=%04x,osversion_minor=%04x,image_charact=%04x,dll_charact=%04x,machine=%04x" ",contains_code=%u,image_flags=%02x" ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x}", @@ -1391,11 +1392,11 @@ static void dump_varargs_rawinput_devices(const char *prefix, data_size_t size ) { const struct rawinput_device *device; - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (size >= sizeof(*device)) { device = cur_data; - fprintf( stderr, "{usage=%08x,flags=%08x,target=%08x}", + TRACE_RAW( "{usage=%08x,flags=%08x,target=%08x}", device->usage, device->flags, device->target ); size -= sizeof(*device); remove_data( sizeof(*device) ); @@ -1408,11 +1409,11 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size ) { const struct handle_info *handle; - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (size >= sizeof(*handle)) { handle = cur_data; - fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x,type=%u}", + TRACE_RAW( "{owner=%04x,handle=%04x,access=%08x,attributes=%08x,type=%u}", handle->owner, handle->handle, handle->access, handle->attributes, handle->type ); size -= sizeof(*handle); remove_data( sizeof(*handle) ); @@ -1440,7 +1441,7 @@ static void dump_varargs_tcp_connections( const char *prefix, data_size_t size ) }; const union tcp_connection *conn; - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (size >= sizeof(*conn)) { conn = cur_data; @@ -1451,7 +1452,7 @@ static void dump_varargs_tcp_connections( const char *prefix, data_size_t size ) char remote_addr_str[INET_ADDRSTRLEN] = { 0 }; inet_ntop( AF_INET, (struct in_addr *)&conn->ipv4.local_addr, local_addr_str, INET_ADDRSTRLEN ); inet_ntop( AF_INET, (struct in_addr *)&conn->ipv4.remote_addr, remote_addr_str, INET_ADDRSTRLEN ); - fprintf( stderr, "{family=AF_INET,owner=%04x,state=%s,local=%s:%d,remote=%s:%d}", + TRACE_RAW( "{family=AF_INET,owner=%04x,state=%s,local=%s:%d,remote=%s:%d}", conn->ipv4.owner, state_names[conn->ipv4.state], local_addr_str, conn->ipv4.local_port, remote_addr_str, conn->ipv4.remote_port ); @@ -1462,7 +1463,7 @@ static void dump_varargs_tcp_connections( const char *prefix, data_size_t size ) char remote_addr_str[INET6_ADDRSTRLEN]; inet_ntop( AF_INET6, (struct in6_addr *)&conn->ipv6.local_addr, local_addr_str, INET6_ADDRSTRLEN ); inet_ntop( AF_INET6, (struct in6_addr *)&conn->ipv6.remote_addr, remote_addr_str, INET6_ADDRSTRLEN ); - fprintf( stderr, "{family=AF_INET6,owner=%04x,state=%s,local=[%s%%%d]:%d,remote=[%s%%%d]:%d}", + TRACE_RAW( "{family=AF_INET6,owner=%04x,state=%s,local=[%s%%%d]:%d,remote=[%s%%%d]:%d}", conn->ipv6.owner, state_names[conn->ipv6.state], local_addr_str, conn->ipv6.local_scope_id, conn->ipv6.local_port, remote_addr_str, conn->ipv6.remote_scope_id, conn->ipv6.remote_port ); @@ -1479,7 +1480,7 @@ static void dump_varargs_udp_endpoints( const char *prefix, data_size_t size ) { const union udp_endpoint *endpt; - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (size >= sizeof(*endpt)) { endpt = cur_data; @@ -1488,14 +1489,14 @@ static void dump_varargs_udp_endpoints( const char *prefix, data_size_t size ) { char addr_str[INET_ADDRSTRLEN] = { 0 }; inet_ntop( AF_INET, (struct in_addr *)&endpt->ipv4.addr, addr_str, INET_ADDRSTRLEN ); - fprintf( stderr, "{family=AF_INET,owner=%04x,addr=%s:%d}", + TRACE_RAW( "{family=AF_INET,owner=%04x,addr=%s:%d}", endpt->ipv4.owner, addr_str, endpt->ipv4.port ); } else { char addr_str[INET6_ADDRSTRLEN]; inet_ntop( AF_INET6, (struct in6_addr *)&endpt->ipv6.addr, addr_str, INET6_ADDRSTRLEN ); - fprintf( stderr, "{family=AF_INET6,owner=%04x,addr=[%s%%%d]:%d}", + TRACE_RAW( "{family=AF_INET6,owner=%04x,addr=[%s%%%d]:%d}", endpt->ipv6.owner, addr_str, endpt->ipv6.scope_id, endpt->ipv6.port ); } @@ -1508,7 +1509,7 @@ static void dump_varargs_udp_endpoints( const char *prefix, data_size_t size ) static void dump_varargs_directory_entries( const char *prefix, data_size_t size ) { - fprintf( stderr, "%s{", prefix ); + TRACE_RAW( "%s{", prefix ); while (size) { const struct directory_entry *entry = cur_data; @@ -1519,18 +1520,18 @@ static void dump_varargs_directory_entries( const char *prefix, data_size_t size (size - sizeof(*entry) < entry->name_len) || (size - sizeof(*entry) - entry->name_len < entry->type_len)) { - fprintf( stderr, "***invalid***}" ); + TRACE_RAW( "***invalid***}" ); remove_data( size ); return; } next = (const char *)(entry + 1); - fprintf( stderr, "{name=L\"" ); + TRACE_RAW( "{name=L\"" ); dump_strW( (const WCHAR *)next, entry->name_len, stderr, "\"\"" ); next += entry->name_len; - fprintf( stderr, "\",type=L\"" ); + TRACE_RAW( "\",type=L\"" ); dump_strW( (const WCHAR *)next, entry->type_len, stderr, "\"\"" ); - fprintf( stderr, "\"}" ); + TRACE_RAW( "\"}" ); entry_size = min( size, (sizeof(*entry) + entry->name_len + entry->type_len + 3) & ~3 ); size -= entry_size; @@ -1545,12 +1546,12 @@ static void dump_varargs_monitor_infos( const char *prefix, data_size_t size ) const struct monitor_info *monitor = cur_data; data_size_t len = size / sizeof(*monitor); - fprintf( stderr,"%s{", prefix ); + TRACE_RAW("%s{", prefix ); while (len > 0) { dump_rectangle( "{raw:", &monitor->virt ); dump_rectangle( ",virt:", &monitor->virt ); - fprintf( stderr, ",flags:%#x,dpi:%u", monitor->flags, monitor->dpi ); + TRACE_RAW( ",flags:%#x,dpi:%u", monitor->flags, monitor->dpi ); fputc( '}', stderr ); if (--len) fputc( ',', stderr ); } @@ -1563,34 +1564,34 @@ void trace_request(void) enum request req = current->req.request_header.req; if (req < REQ_NB_REQUESTS) { - fprintf( stderr, "%04x: %s(", current->id, req_names[req] ); + TRACE_RAW( "%04x:trace:server:%s(", current->id, req_names[req] ); if (req_dumpers[req]) { cur_data = get_req_data(); cur_size = get_req_data_size(); req_dumpers[req]( ¤t->req ); } - fprintf( stderr, " )\n" ); + TRACE_RAW( " )\n" ); } - else fprintf( stderr, "%04x: %d(?)\n", current->id, req ); + else TRACE_RAW( "%04x:trace:server:%d(?)\n", current->id, req ); } void trace_reply( enum request req, const union generic_reply *reply ) { if (req < REQ_NB_REQUESTS) { - fprintf( stderr, "%04x: %s() = %s", - current->id, req_names[req], get_status_name(current->error) ); + TRACE_RAW( "%04x:trace:server:%s() = %s", + current->id, req_names[req], get_status_name(current->error) ); if (reply_dumpers[req]) { - fprintf( stderr, " {" ); + TRACE_RAW( " {" ); cur_data = current->reply_data; cur_size = reply->reply_header.reply_size; reply_dumpers[req]( reply ); - fprintf( stderr, " }" ); + TRACE_RAW( " }" ); } fputc( '\n', stderr ); } - else fprintf( stderr, "%04x: %d() = %s\n", - current->id, req, get_status_name(current->error) ); + else TRACE_RAW( "%04x:trace:server:%d() = %s\n", + current->id, req, get_status_name(current->error) ); } diff --git a/server/unicode.c b/server/unicode.c index bb39b55e50c..06bacea4355 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -33,6 +33,7 @@ # include <mach-o/dyld.h> #endif +#include "debug.h" #include "windef.h" #include "winternl.h" #include "request.h" @@ -348,7 +349,7 @@ struct fd *load_intl_file(void) FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ))) break; free( path ); } - if (!fd) fatal_error( "failed to load l_intl.nls\n" ); + if (!fd) TRACE( "failed to load l_intl.nls\n" ); unix_fd = get_unix_fd( fd ); /* read initial offset */ if (pread( unix_fd, &data, sizeof(data), 0 ) != sizeof(data) || !data) goto failed; @@ -367,5 +368,5 @@ struct fd *load_intl_file(void) return fd; failed: - fatal_error( "invalid format for casemap table %s\n", path ); + TRACE( "invalid format for casemap table %s\n", path ); } diff --git a/server/window.c b/server/window.c index d58f643fde9..045f02e5a83 100644 --- a/server/window.c +++ b/server/window.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -158,7 +159,7 @@ static void window_dump( struct object *obj, int verbose ) { struct window *win = (struct window *)obj; assert( obj->ops == &window_ops ); - fprintf( stderr, "window %p handle %x\n", win, win->handle ); + TRACE( "window %p handle %x\n", win, win->handle ); } static void window_destroy( struct object *obj ) diff --git a/server/winstation.c b/server/winstation.c index a36253e20db..f1c956883d2 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <sys/types.h> +#include "debug.h" #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -169,7 +170,7 @@ static void winstation_dump( struct object *obj, int verbose ) { struct winstation *winstation = (struct winstation *)obj; - fprintf( stderr, "Winstation flags=%x clipboard=%p atoms=%p\n", + TRACE( "Winstation flags=%x clipboard=%p atoms=%p\n", winstation->flags, winstation->clipboard, winstation->atom_table ); } @@ -348,7 +349,7 @@ static void desktop_dump( struct object *obj, int verbose ) { struct desktop *desktop = (struct desktop *)obj; - fprintf( stderr, "Desktop flags=%x winstation=%p top_win=%p hooks=%p\n", + TRACE( "Desktop flags=%x winstation=%p top_win=%p hooks=%p\n", desktop->shared->flags, desktop->winstation, desktop->top_window, desktop->global_hooks ); } diff --git a/tools/make_requests b/tools/make_requests index 17e425537b5..596c7d2a184 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -138,11 +138,11 @@ sub DO_DUMP_FUNC($$@) elsif ($fmt =~ /^(%.*)\s+\((.*)\)/) { my ($format, $cast) = ($1, $2); - push @trace_lines, " fprintf( stderr, \"$prefix$var=$format\", ($cast)req->$var );\n"; + push @trace_lines, " TRACE_RAW( \"$prefix$var=$format\", ($cast)req->$var );\n"; } else { - push @trace_lines, " fprintf( stderr, \"$prefix$var=$fmt\", req->$var );\n"; + push @trace_lines, " TRACE_RAW( \"$prefix$var=$fmt\", req->$var );\n"; } } else # must be some varargs format -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9835