[ros-diffs] [hpoussin] 30433: Add missing debug channel declarations

Author: hpoussin
Date: Wed Nov 14 12:02:53 2007
New Revision: 30433

URL: http://svn.reactos.org/svn/reactos?rev=30433&view=rev
Log:
Add missing debug channel declarations

Modified:
    trunk/reactos/base/system/winlogon/sas.c
    trunk/reactos/base/system/winlogon/wlx.c
    trunk/reactos/dll/win32/iphlpapi/media.c
    trunk/reactos/dll/win32/kernel32/file/lock.c
    trunk/reactos/dll/win32/kernel32/kernel32.rbuild
    trunk/reactos/dll/win32/msgina/stubs.c
    trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
    trunk/reactos/dll/win32/newdev/stubs.c
    trunk/reactos/dll/win32/user32/misc/stubs.c
    trunk/reactos/dll/win32/user32/windows/cursor.c
    trunk/reactos/dll/win32/user32/windows/draw.c
    trunk/reactos/dll/win32/user32/windows/hook.c
    trunk/reactos/dll/win32/user32/windows/messagebox.c
    trunk/reactos/dll/win32/user32/windows/paint.c

Modified: trunk/reactos/base/system/winlogon/sas.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c…
==============================================================================
--- trunk/reactos/base/system/winlogon/sas.c (original)
+++ trunk/reactos/base/system/winlogon/sas.c Wed Nov 14 12:02:53 2007
@@ -112,7 +112,7 @@
 	}
 	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 @@
 	                               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 @@
 	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;
 	}

Modified: trunk/reactos/base/system/winlogon/wlx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c…
==============================================================================
--- trunk/reactos/base/system/winlogon/wlx.c (original)
+++ trunk/reactos/base/system/winlogon/wlx.c Wed Nov 14 12:02:53 2007
@@ -667,7 +667,7 @@
 	}
 	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;

Modified: trunk/reactos/dll/win32/iphlpapi/media.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/media.c…
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/media.c (original)
+++ trunk/reactos/dll/win32/iphlpapi/media.c Wed Nov 14 12:02:53 2007
@@ -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 RestoreMediaSense(OVERLAPPED* pOverlapped,LPDWORD lpdwEnableCount)
 {
-    UNIMPLEMENTED
+    UNIMPLEMENTED;
     return 0L;
 }
 

Modified: trunk/reactos/dll/win32/kernel32/file/lock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/lock.c (original)
+++ trunk/reactos/dll/win32/kernel32/file/lock.c Wed Nov 14 12:02:53 2007
@@ -17,6 +17,8 @@
 
 //#define YDEBUG
 #include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32);
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Wed Nov 14 12:02:53 2007
@@ -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>

Modified: trunk/reactos/dll/win32/msgina/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msgina/stubs.c (original)
+++ trunk/reactos/dll/win32/msgina/stubs.c Wed Nov 14 12:02:53 2007
@@ -13,6 +13,8 @@
 #include <winwlx.h>
 
 #include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(msgina);
 
 /*
  * @unimplemented

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original)
+++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Wed Nov 14 12:02:53 2007
@@ -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>

Modified: trunk/reactos/dll/win32/newdev/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?r…
==============================================================================
--- trunk/reactos/dll/win32/newdev/stubs.c (original)
+++ trunk/reactos/dll/win32/newdev/stubs.c Wed Nov 14 12:02:53 2007
@@ -19,6 +19,8 @@
  */
 
 #include "newdev_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(newdev);
 
 /*
 * @unimplemented

Modified: trunk/reactos/dll/win32/user32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/user32/misc/stubs.c Wed Nov 14 12:02:53 2007
@@ -14,6 +14,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 /*
  * @unimplemented
  */

Modified: trunk/reactos/dll/win32/user32/windows/cursor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/cursor.c (original)
+++ trunk/reactos/dll/win32/user32/windows/cursor.c Wed Nov 14 12:02:53 2007
@@ -32,6 +32,8 @@
 
 #include <wine/debug.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
+
 #undef CopyCursor
 
 HBITMAP

Modified: trunk/reactos/dll/win32/user32/windows/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/draw.c (original)
+++ trunk/reactos/dll/win32/user32/windows/draw.c Wed Nov 14 12:02:53 2007
@@ -31,6 +31,8 @@
 #include <user32.h>
 
 #include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* GLOBALS *******************************************************************/
 

Modified: trunk/reactos/dll/win32/user32/windows/hook.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/hook.c (original)
+++ trunk/reactos/dll/win32/user32/windows/hook.c Wed Nov 14 12:02:53 2007
@@ -31,6 +31,8 @@
 #include <user32.h>
 
 #include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/messagebox.c (original)
+++ trunk/reactos/dll/win32/user32/windows/messagebox.c Wed Nov 14 12:02:53 2007
@@ -34,6 +34,8 @@
 #include <user32.h>
 
 #include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* DEFINES *******************************************************************/
 

Modified: trunk/reactos/dll/win32/user32/windows/paint.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/paint.c (original)
+++ trunk/reactos/dll/win32/user32/windows/paint.c Wed Nov 14 12:02:53 2007
@@ -31,6 +31,8 @@
 #include <user32.h>
 
 #include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 static HBRUSH FrameBrushes[13];
 static HBITMAP hHatch;