Module: wine Branch: master Commit: 1b2ceb5718365d2a122b4b07c940ca6fd406b957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2ceb5718365d2a122b4b07c9...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jan 6 20:27:51 2009 +0100
kernel32: Moved _DebugOutput to kernel16.c.
---
dlls/kernel32/debugger.c | 19 ------------------- dlls/kernel32/kernel16.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 6e7b4b1..b83647c 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -25,7 +25,6 @@ #include "wine/winbase16.h" #include "wine/server.h" #include "kernel_private.h" -#include "kernel16_private.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(debugstr); @@ -409,24 +408,6 @@ BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE process, PBOOL DebuggerPresent) }
/*********************************************************************** - * _DebugOutput (KERNEL.328) - */ -void WINAPIV _DebugOutput( WORD flags, LPCSTR spec, VA_LIST16 valist ) -{ - char caller[101]; - - /* Decode caller address */ - if (!GetModuleName16( GetExePtr(CURRENT_STACK16->cs), caller, sizeof(caller) )) - sprintf( caller, "%04X:%04X", CURRENT_STACK16->cs, CURRENT_STACK16->ip ); - - /* FIXME: cannot use wvsnprintf16 from kernel */ - /* wvsnprintf16( temp, sizeof(temp), spec, valist ); */ - - /* Output */ - FIXME("%s %04x %s\n", caller, flags, debugstr_a(spec) ); -} - -/*********************************************************************** * DebugSetProcessKillOnExit (KERNEL32.@) * * Let a debugger decide whether a debuggee will be killed upon debugger diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 7ae378d..b904057 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -19,6 +19,7 @@ */
#include <stdarg.h> +#include <stdio.h>
#include "windef.h" #include "winbase.h" @@ -264,3 +265,21 @@ void WINAPI WINHELP_EntryPoint( CONTEXT86 *context ) HeapFree( GetProcessHeap(), 0, cmdline ); ExitThread( exit_code ); } + +/*********************************************************************** + * _DebugOutput (KERNEL.328) + */ +void WINAPIV _DebugOutput( WORD flags, LPCSTR spec, VA_LIST16 valist ) +{ + char caller[101]; + + /* Decode caller address */ + if (!GetModuleName16( GetExePtr(CURRENT_STACK16->cs), caller, sizeof(caller) )) + sprintf( caller, "%04X:%04X", CURRENT_STACK16->cs, CURRENT_STACK16->ip ); + + /* FIXME: cannot use wvsnprintf16 from kernel */ + /* wvsnprintf16( temp, sizeof(temp), spec, valist ); */ + + /* Output */ + FIXME("%s %04x %s\n", caller, flags, debugstr_a(spec) ); +}