From 06f3a184834ba24f9cbafdbf66ec1ccdbee8db4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 14 Nov 2007 12:50:12 +0000
Subject: [PATCH] Try to be more consistent in unimplemented messages

svn path=/trunk/; revision=30441
---
 reactos/dll/win32/authz/precomp.h    | 16 +---------------
 reactos/dll/win32/shell32/dialogs.c  |  2 +-
 reactos/dll/win32/winscard/precomp.h |  7 +------
 reactos/include/reactos/wine/debug.h |  2 +-
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/reactos/dll/win32/authz/precomp.h b/reactos/dll/win32/authz/precomp.h
index c8d62cfc0c9..d3af8f2b6cc 100644
--- a/reactos/dll/win32/authz/precomp.h
+++ b/reactos/dll/win32/authz/precomp.h
@@ -4,15 +4,7 @@
 #define _AUTHZ_
 #include <windows.h>
 #include <authz.h>
-
-ULONG DbgPrint(PCH Format,...);
-#ifndef DPRINT1
-#define DPRINT1 DbgPrint
-#endif
-
-#ifndef UNIMPLEMENTED
-#define UNIMPLEMENTED DbgPrint("AUTHZ.DLL: %s is UNIMPLEMENTED!\n", __FUNCTION__)
-#endif
+#include <debug.h>
 
 #if DBG
 
@@ -20,17 +12,11 @@ ULONG DbgPrint(PCH Format,...);
 #define CLIENTCTX_TAG  0x789ABCDE
 #define VALIDATE_RESMAN_HANDLE(handle) ASSERT(((PAUTHZ_RESMAN)handle)->Tag == RESMAN_TAG)
 #define VALIDATE_CLIENTCTX_HANDLE(handle) ASSERT(((PAUTHZ_CLIENT_CONTEXT)handle)->Tag == CLIENTCTX_TAG)
-#ifndef ASSERT
-#define ASSERT(cond) if (!(cond)) { DbgPrint("%s:%i: ASSERTION %s failed!\n", __FILE__, __LINE__, #cond ); }
-#endif
 
 #else
 
 #define VALIDATE_RESMAN_HANDLE(handle)
 #define VALIDATE_CLIENTCTX_HANDLE(handle)
-#ifndef ASSERT
-#define ASSERT(cond)
-#endif
 
 #endif
 
diff --git a/reactos/dll/win32/shell32/dialogs.c b/reactos/dll/win32/shell32/dialogs.c
index 953b1449b92..88e93e5e53f 100644
--- a/reactos/dll/win32/shell32/dialogs.c
+++ b/reactos/dll/win32/shell32/dialogs.c
@@ -412,7 +412,7 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D
 
 int WINAPI LogoffWindowsDialog(DWORD uFlags)
 {
-   ERR("LogoffWindowsDialog is UNIMPLEMENTED\n");
+   UNIMPLEMENTED;
    ExitWindowsEx(EWX_LOGOFF, 0);
    return 0;
 }
diff --git a/reactos/dll/win32/winscard/precomp.h b/reactos/dll/win32/winscard/precomp.h
index bc45c21bbb5..4175448869f 100644
--- a/reactos/dll/win32/winscard/precomp.h
+++ b/reactos/dll/win32/winscard/precomp.h
@@ -1,10 +1,5 @@
 #include <windows.h>
 #include <WinSCard.h>
-
-/* INTERNAL *******************************************************************/
-
-ULONG DbgPrint(PCH Format,...);
-#define UNIMPLEMENTED \
-  DbgPrint("%s:%i: %s() UNIMPLEMENTED!\n", __FILE__, __LINE__, __FUNCTION__)
+#include <debug.h>
 
 /* EOF */
diff --git a/reactos/include/reactos/wine/debug.h b/reactos/include/reactos/wine/debug.h
index 6eeb5443972..e3f54d051b6 100644
--- a/reactos/include/reactos/wine/debug.h
+++ b/reactos/include/reactos/wine/debug.h
@@ -62,7 +62,7 @@ struct __wine_debug_channel
     char name[15];
 };
 
-#define UNIMPLEMENTED WINE_FIXME(" is unimplemented")
+#define UNIMPLEMENTED WINE_FIXME("%s is UNIMPLEMENTED!\n", __FUNCTION__)
 
 #ifndef WINE_NO_TRACE_MSGS
 # define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)->flags & (1 << __WINE_DBCL_TRACE))