update for HEAD-2003050101

[reactos.git] / lib / winedbgc / winedbgc.c

diff --git a/lib/winedbgc/winedbgc.c b/lib/winedbgc/winedbgc.c
index f382f3d..729a49e 100644 (file)
--- a/lib/winedbgc/winedbgc.c
+++ b/lib/winedbgc/winedbgc.c
@@ -1,15 +1,15 @@
 /*
- * Debugging channels functions for WINE
+ * Debugging channels functions for WINE support on ROS.
  */
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "porting.h"
+#include "trace.h"
 
 //#include <ntddk.h>
 #include <wine/debugtools.h>
 
-//DECLARE_DEBUG_CHANNEL(tid);
 DECLARE_DEBUG_CHANNEL(winedbgc);
 
 
@@ -39,7 +39,7 @@ static inline struct debug_info *get_info(void)
         if (!RtlGetProcessHeap()) return &tmp;
         /* setup the temp structure in case HeapAlloc wants to print something */
         NtCurrentTeb()->WineDebugInfo = &tmp;
-        info = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(*info) );
+        info = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(*info));
         info->str_pos = info->strings;
         info->out_pos = info->output;
         NtCurrentTeb()->WineDebugInfo = info;
@@ -59,16 +59,16 @@ static void *gimme1(int n)
 }
 
 /* release extra space that we requested in gimme1() */
-static inline void release( void *ptr )
+static inline void release(void *ptr)
 {
     struct debug_info *info = NtCurrentTeb()->WineDebugInfo;
     info->str_pos = ptr;
 }
 
 /***********************************************************************
- *             wine_dbgstr_an (NTDLL.@)
+ *              wine_dbgstr_an (NTDLL.@)
  */
-const char *wine_dbgstr_an( const char *src, int n )
+const char *wine_dbgstr_an(const char *src, int n)
 {
     char *dst, *res;
 
@@ -118,9 +118,9 @@ const char *wine_dbgstr_an( const char *src, int n )
 }
 
 /***********************************************************************
- *             wine_dbgstr_wn (NTDLL.@)
+ *              wine_dbgstr_wn (NTDLL.@)
  */
-const char *wine_dbgstr_wn( const WCHAR *src, int n )
+const char *wine_dbgstr_wn(const WCHAR *src, int n)
 {
     char *dst, *res;
 
@@ -133,7 +133,7 @@ const char *wine_dbgstr_wn( const WCHAR *src, int n )
     }
     if (n < 0) n = 0;
     else if (n > 200) n = 200;
-    dst = res = gimme1 (n * 5 + 7);
+    dst = res = gimme1(n * 5 + 7);
     *dst++ = 'L';
     *dst++ = '"';
     while (n-- > 0 && *src)
@@ -165,56 +165,53 @@ const char *wine_dbgstr_wn( const WCHAR *src, int n )
         *dst++ = '.';
     }
     *dst++ = '\0';
-    release( dst );
+    release(dst);
     return res;
 }
 
 /***********************************************************************
- *             wine_dbgstr_guid (NTDLL.@)
+ *              wine_dbgstr_guid (NTDLL.@)
  */
-const char *wine_dbgstr_guid( const GUID *id )
+const char *wine_dbgstr_guid(const GUID *id)
 {
     char *str;
 
     if (!id) return "(null)";
-    if (!((WORD)(DWORD)(id) >> 16))
-    {
+    if (!((WORD)(DWORD)(id) >> 16)) {
         str = gimme1(12);
-        sprintf( str, "<guid-0x%04x>", (WORD)(DWORD)(id) );
-    }
-    else
-    {
+        sprintf(str, "<guid-0x%04x>", (WORD)(DWORD)(id));
+    } else {
         str = gimme1(40);
-        sprintf( str, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-                 id->Data1, id->Data2, id->Data3,
-                 id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
-                 id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] );
+        sprintf(str, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+                id->Data1, id->Data2, id->Data3,
+                id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
+                id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7]);
     }
     return str;
 }
 
 /***********************************************************************
- *             wine_dbg_vprintf (NTDLL.@)
+ *              wine_dbg_vprintf (NTDLL.@)
  */
-int wine_dbg_vprintf( const char *format, va_list args )
+int wine_dbg_vprintf(const char *format, va_list args)
 {
     struct debug_info *info = get_info();
     char *p;
 
-    int ret = _vsnprintf( info->out_pos, sizeof(info->output) - (info->out_pos - info->output),
-                         format, args );
+    int ret = _vsnprintf(info->out_pos, sizeof(info->output) - (info->out_pos - info->output),
+                         format, args);
 
-    p = strrchr( info->out_pos, '\n' );
-    if (!p) info->out_pos += ret;
-    else
-    {
+    p = strrchr(info->out_pos, '\n');
+    if (!p) {
+        info->out_pos += ret;
+    } else {
         char *pos = info->output;
-       char saved_ch;
+        char saved_ch;
         p++;
-       saved_ch = *p;
-       *p = 0;
+        saved_ch = *p;
+        *p = 0;
         DbgPrint(pos);
-       *p = saved_ch;
+        *p = saved_ch;
         /* move beginning of next line to start of buffer */
         while ((*pos = *p++)) pos++;
         info->out_pos = pos;
@@ -223,7 +220,7 @@ int wine_dbg_vprintf( const char *format, va_list args )
 }
 
 /***********************************************************************
- *             wine_dbg_printf (NTDLL.@)
+ *              wine_dbg_printf (NTDLL.@)
  */
 int wine_dbg_printf(const char *format, ...)
 {
@@ -231,16 +228,19 @@ int wine_dbg_printf(const char *format, ...)
     va_list valist;
 
     va_start(valist, format);
-    ret = wine_dbg_vprintf( format, valist );
+//
+    Trace(format, valist);
+//
+    ret = wine_dbg_vprintf(format, valist);
     va_end(valist);
     return ret;
 }
 
 /***********************************************************************
- *             wine_dbg_log (NTDLL.@)
+ *              wine_dbg_log (NTDLL.@)
  */
 int wine_dbg_log(enum __DEBUG_CLASS cls, const char *channel,
-                 const char *function, const char *format, ... )
+                 const char *function, const char *format, ...)
 {
     static const char *classes[__DBCL_COUNT] = { "fixme", "err", "warn", "trace" };
     va_list valist;
@@ -248,11 +248,11 @@ int wine_dbg_log(enum __DEBUG_CLASS cls, const char *channel,
 
     va_start(valist, format);
     if (TRACE_ON(winedbgc))
-        ret = wine_dbg_printf( "%08lx:", NtCurrentTeb()->Cid.UniqueThread);
+        ret = wine_dbg_printf("%08lx:", NtCurrentTeb()->Cid.UniqueThread);
     if (cls < __DBCL_COUNT)
-        ret += wine_dbg_printf( "%s:%s:%s ", classes[cls], channel + 1, function );
+        ret += wine_dbg_printf("%s:%s:%s ", classes[cls], channel + 1, function);
     if (format)
-        ret += wine_dbg_vprintf( format, valist );
+        ret += wine_dbg_vprintf(format, valist);
     va_end(valist);
     return ret;
 }