From f99a56335fc73259747dbcee70a9be2bb31464b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 14 Nov 2007 09:02:53 +0000
Subject: [PATCH] Add missing debug channel declarations

svn path=/trunk/; revision=30433
---
 reactos/base/system/winlogon/sas.c            | 6 +++---
 reactos/base/system/winlogon/wlx.c            | 2 +-
 reactos/dll/win32/iphlpapi/media.c            | 6 ++++--
 reactos/dll/win32/kernel32/file/lock.c        | 2 ++
 reactos/dll/win32/kernel32/kernel32.rbuild    | 1 +
 reactos/dll/win32/msgina/stubs.c              | 2 ++
 reactos/dll/win32/msvcrt/msvcrt.rbuild        | 2 +-
 reactos/dll/win32/newdev/stubs.c              | 2 ++
 reactos/dll/win32/user32/misc/stubs.c         | 2 ++
 reactos/dll/win32/user32/windows/cursor.c     | 2 ++
 reactos/dll/win32/user32/windows/draw.c       | 2 ++
 reactos/dll/win32/user32/windows/hook.c       | 2 ++
 reactos/dll/win32/user32/windows/messagebox.c | 2 ++
 reactos/dll/win32/user32/windows/paint.c      | 2 ++
 14 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/reactos/base/system/winlogon/sas.c b/reactos/base/system/winlogon/sas.c
index 817f0c08b29..32049c38ea1 100644
--- a/reactos/base/system/winlogon/sas.c
+++ b/reactos/base/system/winlogon/sas.c
@@ -112,7 +112,7 @@ SetDefaultLanguage(
 	}
 	else if (dwType != REG_SZ)
 	{
-		TRACE("Wrong type for %S\\%S registry entry (got 0x%lx, expected 0x%lx)\n",
+		TRACE("Wrong type for %S\\%S registry entry (got 0x%lx, expected 0x%x)\n",
 			SubKey, ValueName, dwType, REG_SZ);
 		goto cleanup;
 	}
@@ -415,7 +415,7 @@ CreateLogoffSecurityAttributes(
 	                               pACL,
 	                               FALSE))   // not a default DACL
 	{
-		ERR("SetSecurityDescriptorDacl Error %u\n", GetLastError());
+		ERR("SetSecurityDescriptorDacl Error %lu\n", GetLastError());
 		HeapFree(GetProcessHeap(), 0, pMem);
 		return STATUS_UNSUCCESSFUL;
 	}
@@ -466,7 +466,7 @@ HandleLogoff(
 	Status = CreateLogoffSecurityAttributes(&psa);
 	if (!NT_SUCCESS(Status))
 	{
-		ERR("Failed to create a required security descriptor. Status 0x%08x\n", Status);
+		ERR("Failed to create a required security descriptor. Status 0x%08lx\n", Status);
 		HeapFree(GetProcessHeap(), 0, LSData);
 		return Status;
 	}
diff --git a/reactos/base/system/winlogon/wlx.c b/reactos/base/system/winlogon/wlx.c
index edd2623653e..38545d84959 100644
--- a/reactos/base/system/winlogon/wlx.c
+++ b/reactos/base/system/winlogon/wlx.c
@@ -667,7 +667,7 @@ LoadGina(
 	}
 	else
 	{
-		TRACE("About to negociate with Gina %S. Winlogon uses version %lx\n",
+		TRACE("About to negociate with Gina %S. Winlogon uses version %x\n",
 			GinaDll, WLX_CURRENT_VERSION);
 		if (!Functions->WlxNegotiate(WLX_CURRENT_VERSION, DllVersion))
 			goto cleanup;
diff --git a/reactos/dll/win32/iphlpapi/media.c b/reactos/dll/win32/iphlpapi/media.c
index ceb78b6245b..92558fbf1e6 100644
--- a/reactos/dll/win32/iphlpapi/media.c
+++ b/reactos/dll/win32/iphlpapi/media.c
@@ -19,12 +19,14 @@
  */
 #include "iphlpapi_private.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
+
 /*
  * @unimplemented
  */
 DWORD STDCALL DisableMediaSense(HANDLE *pHandle,OVERLAPPED *pOverLapped)
 {
-    UNIMPLEMENTED
+    UNIMPLEMENTED;
     return 0L;
 }
 
@@ -33,7 +35,7 @@ DWORD STDCALL DisableMediaSense(HANDLE *pHandle,OVERLAPPED *pOverLapped)
  */
 DWORD STDCALL RestoreMediaSense(OVERLAPPED* pOverlapped,LPDWORD lpdwEnableCount)
 {
-    UNIMPLEMENTED
+    UNIMPLEMENTED;
     return 0L;
 }
 
diff --git a/reactos/dll/win32/kernel32/file/lock.c b/reactos/dll/win32/kernel32/file/lock.c
index 7f8538447a7..f6fa2308bdf 100644
--- a/reactos/dll/win32/kernel32/file/lock.c
+++ b/reactos/dll/win32/kernel32/file/lock.c
@@ -18,6 +18,8 @@
 //#define YDEBUG
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32);
+
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild
index 189517d7add..c5d75ac5a43 100644
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@ -126,6 +126,7 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="WINVER">0x0500</define>
 	<library>kernel32_base</library>
+	<library>wine</library>
 	<library>pseh</library>
 	<library>ntdll</library>
 	<linkerflag>-lgcc</linkerflag>
diff --git a/reactos/dll/win32/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c
index 72f535689fe..436c6d7b670 100644
--- a/reactos/dll/win32/msgina/stubs.c
+++ b/reactos/dll/win32/msgina/stubs.c
@@ -14,6 +14,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(msgina);
+
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/msvcrt/msvcrt.rbuild b/reactos/dll/win32/msvcrt/msvcrt.rbuild
index d74a8d78d6b..faefc706eee 100644
--- a/reactos/dll/win32/msvcrt/msvcrt.rbuild
+++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild
@@ -21,9 +21,9 @@
 	<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
 
 	<library>crt</library>
-	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>wine</library>
+	<library>ntdll</library>
 	<pch>precomp.h</pch>
 	<file>dllmain.c</file>
 	<file>msvcrt.rc</file>
diff --git a/reactos/dll/win32/newdev/stubs.c b/reactos/dll/win32/newdev/stubs.c
index 3bce4a3abc6..7c31a844f14 100644
--- a/reactos/dll/win32/newdev/stubs.c
+++ b/reactos/dll/win32/newdev/stubs.c
@@ -20,6 +20,8 @@
 
 #include "newdev_private.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(newdev);
+
 /*
 * @unimplemented
 */
diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c
index 33527e3d32e..7029b922e9a 100644
--- a/reactos/dll/win32/user32/misc/stubs.c
+++ b/reactos/dll/win32/user32/misc/stubs.c
@@ -14,6 +14,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/user32/windows/cursor.c b/reactos/dll/win32/user32/windows/cursor.c
index a5235ca4073..fd51742f056 100644
--- a/reactos/dll/win32/user32/windows/cursor.c
+++ b/reactos/dll/win32/user32/windows/cursor.c
@@ -32,6 +32,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 #undef CopyCursor
 
 HBITMAP
diff --git a/reactos/dll/win32/user32/windows/draw.c b/reactos/dll/win32/user32/windows/draw.c
index 75eedd7ab36..c3ac41db56a 100644
--- a/reactos/dll/win32/user32/windows/draw.c
+++ b/reactos/dll/win32/user32/windows/draw.c
@@ -32,6 +32,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 /* GLOBALS *******************************************************************/
 
 #define DSS_DEFAULT 0x0040  /* Make it bold */
diff --git a/reactos/dll/win32/user32/windows/hook.c b/reactos/dll/win32/user32/windows/hook.c
index 1ef28ee1e92..d6a55458a52 100644
--- a/reactos/dll/win32/user32/windows/hook.c
+++ b/reactos/dll/win32/user32/windows/hook.c
@@ -32,6 +32,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/user32/windows/messagebox.c b/reactos/dll/win32/user32/windows/messagebox.c
index 85e72992959..cd764d650d0 100644
--- a/reactos/dll/win32/user32/windows/messagebox.c
+++ b/reactos/dll/win32/user32/windows/messagebox.c
@@ -35,6 +35,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 /* DEFINES *******************************************************************/
 
 #define MSGBOX_IDICON   (1088)
diff --git a/reactos/dll/win32/user32/windows/paint.c b/reactos/dll/win32/user32/windows/paint.c
index c2cf5623c82..802c3dbeaae 100644
--- a/reactos/dll/win32/user32/windows/paint.c
+++ b/reactos/dll/win32/user32/windows/paint.c
@@ -32,6 +32,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 static HBRUSH FrameBrushes[13];
 static HBITMAP hHatch;
 const DWORD HatchBitmap[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};