[hpoussin] 30441: Try to be more consistent in unimplemented messages

Author: hpoussin
Date: Wed Nov 14 15:50:12 2007
New Revision: 30441

URL: http://svn.reactos.org/svn/reactos?rev=30441&view=rev
Log:
Try to be more consistent in unimplemented messages

Modified:
    trunk/reactos/dll/win32/authz/precomp.h
    trunk/reactos/dll/win32/shell32/dialogs.c
    trunk/reactos/dll/win32/winscard/precomp.h
    trunk/reactos/include/reactos/wine/debug.h

Modified: trunk/reactos/dll/win32/authz/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/precomp.h?r...
==============================================================================
--- trunk/reactos/dll/win32/authz/precomp.h (original)
+++ trunk/reactos/dll/win32/authz/precomp.h Wed Nov 14 15:50:12 2007
@@ -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 @@
 #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

Modified: trunk/reactos/dll/win32/shell32/dialogs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.c...
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs.c (original)
+++ trunk/reactos/dll/win32/shell32/dialogs.c Wed Nov 14 15:50:12 2007
@@ -412,7 +412,7 @@

int WINAPI LogoffWindowsDialog(DWORD uFlags)
 {
-   ERR("LogoffWindowsDialog is UNIMPLEMENTED\n");
+   UNIMPLEMENTED;
    ExitWindowsEx(EWX_LOGOFF, 0);
    return 0;
 }

Modified: trunk/reactos/dll/win32/winscard/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/precomp....
==============================================================================
--- trunk/reactos/dll/win32/winscard/precomp.h (original)
+++ trunk/reactos/dll/win32/winscard/precomp.h Wed Nov 14 15:50:12 2007
@@ -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 */

Modified: trunk/reactos/include/reactos/wine/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug....
==============================================================================
--- trunk/reactos/include/reactos/wine/debug.h (original)
+++ trunk/reactos/include/reactos/wine/debug.h Wed Nov 14 15:50:12 2007
@@ -62,7 +62,7 @@
     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))