diff --git a/auth_token/client/mechanisms/pwd/win32/platform.c b/auth_token/client/mechanisms/pwd/win32/platform.c
new file mode 100644
index 00000000..869b581c
--- /dev/null
+++ b/auth_token/client/mechanisms/pwd/win32/platform.c
@@ -0,0 +1,35 @@
+/***********************************************************************
+ * 
+ *  Copyright (C) 2006 Novell, Inc. All Rights Reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; version 2.1
+ *  of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, Novell, Inc.
+ * 
+ *  To contact Novell about this file by physical or electronic mail, 
+ *  you may find current contact information at www.novell.com.
+ * 
+ *  Author: Juan Carlos Luciani <jluciani@novell.com>
+ *
+ ***********************************************************************/
+
+//===[ Include files ]=====================================================
+
+#include "internal.h"
+
+//===[ Type definitions ]==================================================
+
+//===[ Function prototypes ]===============================================
+
+//===[ Global variables ]==================================================
+
+
diff --git a/auth_token/client/mechanisms/pwd/win32/platform.h b/auth_token/client/mechanisms/pwd/win32/platform.h
index 1f551693..ece8baa3 100644
--- a/auth_token/client/mechanisms/pwd/win32/platform.h
+++ b/auth_token/client/mechanisms/pwd/win32/platform.h
@@ -42,18 +42,24 @@
 //
 // DbgTrace macro define
 //
-#define DbgTrace(LEVEL, X, Y) {                          \
-char printBuff[256];                                     \
-   if (LEVEL == 0)                                       \
-   {                                                     \
-      _snprintf(printBuff, sizeof(printBuff), X, Y);     \
-      printf("PwdMech %s", printBuff);                   \
-   }                                                     \
-   else if (DebugLevel >= LEVEL)                         \
-   {                                                     \
-      _snprintf(printBuff, sizeof(printBuff), X, Y);     \
-      printf("PwdMech %s", printBuff);                   \
-   }                                                     \
+//#define DbgTrace(LEVEL, X, Y) {                          \
+//char printBuff[256];                                     \
+//   if (LEVEL == 0 || DebugLevel >= LEVEL)                \
+//   {                                                     \
+//      _snprintf(printBuff, sizeof(printBuff), X, Y);     \
+//      printf("PwdMech %s", printBuff);                   \
+//   }                                                     \
+//}
+#define DbgTrace(LEVEL, X, Y) {                                \
+char formatBuff[128];                                          \
+char printBuff[256];                                           \
+   if (LEVEL == 0 || DebugLevel >= LEVEL)                      \
+   {                                                           \
+      strcpy(formatBuff, "PwdMech ");                          \
+      strncat(formatBuff, X, sizeof(formatBuff) - 8);          \
+      _snprintf(printBuff, sizeof(printBuff), formatBuff, Y);  \
+      OutputDebugString(printBuff);                            \
+   }                                                           \
 }
 
 #define bool BOOLEAN