On Wed, 25 Feb 2004, Mike Hearn wrote:
> Another confusing debug channel allocation bites the dust...
>
> -WINE_DEFAULT_DEBUG_CHANNEL(win32);
> +WINE_DEFAULT_DEBUG_CHANNEL(time);
The win32 debug channel should just die, it's too generic to
be useful. The entire friggin' API is Win32 :) Here is a patch
that nukes it.
ChangeLog
Dimitrie O. Paun <dpaun(a)rogers.com>
Remove the win32 debug channel, misc cleanup of debugging code.
Index: ./dlls/kernel/sync.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/sync.c,v
retrieving revision 1.48
diff -u -r1.48 sync.c
--- ./dlls/kernel/sync.c 24 Feb 2004 01:06:30 -0000 1.48
+++ ./dlls/kernel/sync.c 25 Feb 2004 17:16:48 -0000
@@ -52,7 +52,7 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(sync);
/* check if current version is NT or Win95 */
inline static int is_version_nt(void)
Index: ./dlls/kernel/syslevel.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/syslevel.c,v
retrieving revision 1.3
diff -u -r1.3 syslevel.c
--- ./dlls/kernel/syslevel.c 5 Nov 2003 00:52:30 -0000 1.3
+++ ./dlls/kernel/syslevel.c 25 Feb 2004 17:17:16 -0000
@@ -35,7 +35,7 @@
#include "wine/library.h"
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(syslevel);
static SYSLEVEL Win16Mutex;
static CRITICAL_SECTION_DEBUG critsect_debug =
Index: ./dlls/msnet32/msnet_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/msnet32/msnet_main.c,v
retrieving revision 1.2
diff -u -r1.2 msnet_main.c
--- ./dlls/msnet32/msnet_main.c 14 Mar 2003 23:00:53 -0000 1.2
+++ ./dlls/msnet32/msnet_main.c 25 Feb 2004 17:17:44 -0000
@@ -18,7 +18,7 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(msnet);
/***********************************************************************
* @ (MSNET32.57)
Index: ./dlls/wintrust/wintrust_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/wintrust/wintrust_main.c,v
retrieving revision 1.5
diff -u -r1.5 wintrust_main.c
--- ./dlls/wintrust/wintrust_main.c 5 Sep 2003 23:08:26 -0000 1.5
+++ ./dlls/wintrust/wintrust_main.c 25 Feb 2004 17:18:19 -0000
@@ -27,7 +27,7 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
/***********************************************************************
* WinVerifyTrust (WINTRUST.@)
Index: ./windows/user.c
===================================================================
RCS file: /var/cvs/wine/windows/user.c,v
retrieving revision 1.99
diff -u -r1.99 user.c
--- ./windows/user.c 5 Feb 2004 01:24:48 -0000 1.99
+++ ./windows/user.c 25 Feb 2004 17:26:43 -0000
@@ -38,11 +38,7 @@
#include "local.h"
#include "wine/debug.h"
-WINE_DECLARE_DEBUG_CHANNEL(hook);
-WINE_DECLARE_DEBUG_CHANNEL(local);
-WINE_DECLARE_DEBUG_CHANNEL(system);
-WINE_DECLARE_DEBUG_CHANNEL(win);
-WINE_DECLARE_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(system);
static SYSLEVEL USER_SysLevel;
static CRITICAL_SECTION_DEBUG critsect_debug =
@@ -113,7 +109,7 @@
break;
}
FreeLibrary16( gdi_inst );
- TRACE_(local)("<- userPercent %d, gdiPercent %d\n", userPercent, gdiPercent);
+ TRACE("<- userPercent %d, gdiPercent %d\n", userPercent, gdiPercent);
return (WORD)min( userPercent, gdiPercent );
}
@@ -271,8 +267,8 @@
WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
DWORD dwFlags, HMODULE16 hModule )
{
- FIXME_(win)("(%04x, %08lx, %04lx, %04x)\n",
- uCode, dwThreadOrProcessID, dwFlags, hModule );
+ FIXME("(%04x, %08lx, %04lx, %04x)\n",
+ uCode, dwThreadOrProcessID, dwFlags, hModule );
/* FIXME: Should chain to GdiSignalProc now. */
return 0;
}
@@ -291,8 +287,8 @@
*/
BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
{
- TRACE_(system)("Should run the following in DOS-mode: \"%s %s\"\n",
- lpszExe, lpszParams);
+ TRACE("Should run the following in DOS-mode: \"%s %s\"\n",
+ lpszExe, lpszParams);
return ExitWindowsEx( EWX_LOGOFF, 0xffffffff );
}
@@ -481,7 +477,7 @@
) {
if (i)
return FALSE;
- FIXME_(system)("(%p,%ld,%p,0x%08lx), stub!\n",unused,i,lpDisplayDevice,dwFlags);
+ FIXME("(%p,%ld,%p,0x%08lx), stub!\n",unused,i,lpDisplayDevice,dwFlags);
strcpy(lpDisplayDevice->DeviceName,"X11");
strcpy(lpDisplayDevice->DeviceString,"X 11 Windowing System");
lpDisplayDevice->StateFlags =
@@ -499,7 +495,7 @@
) {
if (i)
return FALSE;
- FIXME_(system)("(%p,%ld,%p,0x%08lx), stub!\n",unused,i,lpDisplayDevice,dwFlags);
+ FIXME("(%p,%ld,%p,0x%08lx), stub!\n",unused,i,lpDisplayDevice,dwFlags);
MultiByteToWideChar( CP_ACP, 0, "X11", -1, lpDisplayDevice->DeviceName,
sizeof(lpDisplayDevice->DeviceName)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, "X11 Windowing System", -1, lpDisplayDevice->DeviceString,
@@ -518,7 +514,7 @@
*/
FARPROC16 WINAPI SetEventHook16(FARPROC16 lpfnEventHook)
{
- FIXME_(hook)("(lpfnEventHook=%08x): stub\n", (UINT)lpfnEventHook);
+ FIXME("(lpfnEventHook=%08x): stub\n", (UINT)lpfnEventHook);
return NULL;
}
@@ -538,10 +534,10 @@
case USUD_LOCALHEAP:
return USER_HeapSel;
case USUD_FIRSTCLASS:
- FIXME_(local)("return a pointer to the first window class.\n");
+ FIXME("return a pointer to the first window class.\n");
return (DWORD)-1;
default:
- WARN_(local)("wReqType %04x (unknown)\n", wReqType);
+ WARN("wReqType %04x (unknown)\n", wReqType);
return (DWORD)-1;
}
}
@@ -558,7 +554,7 @@
* RegisterLogonProcess (USER32.@)
*/
DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) {
- FIXME_(win32)("(%p,%d),stub!\n",hprocess,x);
+ FIXME("(%p,%d),stub!\n",hprocess,x);
return 1;
}
@@ -569,7 +565,7 @@
LPWSTR winstation,DWORD res1,DWORD desiredaccess,
LPSECURITY_ATTRIBUTES lpsa
) {
- FIXME_(win32)("(%s,0x%08lx,0x%08lx,%p),stub!\n",debugstr_w(winstation),
+ FIXME("(%s,0x%08lx,0x%08lx,%p),stub!\n",debugstr_w(winstation),
res1,desiredaccess,lpsa
);
return (HWINSTA)0xdeadcafe;
@@ -579,7 +575,7 @@
* SetProcessWindowStation (USER32.@)
*/
BOOL WINAPI SetProcessWindowStation(HWINSTA hWinSta) {
- FIXME_(win32)("(%p),stub!\n",hWinSta);
+ FIXME("(%p),stub!\n",hWinSta);
return TRUE;
}
@@ -591,7 +587,7 @@
PSECURITY_INFORMATION pSIRequested,
PSECURITY_DESCRIPTOR pSID
) {
- FIXME_(win32)("(%p,%p,%p),stub!\n",hObj,pSIRequested,pSID);
+ FIXME("(%p,%p,%p),stub!\n",hObj,pSIRequested,pSID);
return TRUE;
}
@@ -602,7 +598,7 @@
LPSTR lpszDesktop,LPSTR lpszDevice,LPDEVMODEA pDevmode,
DWORD dwFlags,DWORD dwDesiredAccess,LPSECURITY_ATTRIBUTES lpsa
) {
- FIXME_(win32)("(%s,%s,%p,0x%08lx,0x%08lx,%p),stub!\n",
+ FIXME("(%s,%s,%p,0x%08lx,0x%08lx,%p),stub!\n",
lpszDesktop,lpszDevice,pDevmode,
dwFlags,dwDesiredAccess,lpsa
);
@@ -616,7 +612,7 @@
LPWSTR lpszDesktop,LPWSTR lpszDevice,LPDEVMODEW pDevmode,
DWORD dwFlags,DWORD dwDesiredAccess,LPSECURITY_ATTRIBUTES lpsa
) {
- FIXME_(win32)("(%s,%s,%p,0x%08lx,0x%08lx,%p),stub!\n",
+ FIXME("(%s,%s,%p,0x%08lx,0x%08lx,%p),stub!\n",
debugstr_w(lpszDesktop),debugstr_w(lpszDevice),pDevmode,
dwFlags,dwDesiredAccess,lpsa
);
@@ -627,7 +623,7 @@
* EnumDesktopWindows (USER32.@)
*/
BOOL WINAPI EnumDesktopWindows( HDESK hDesktop, WNDENUMPROC lpfn, LPARAM lParam ) {
- FIXME_(win32)("(%p, %p, 0x%08lx), stub!\n", hDesktop, lpfn, lParam );
+ FIXME("(%p, %p, 0x%08lx), stub!\n", hDesktop, lpfn, lParam );
return TRUE;
}
@@ -637,7 +633,7 @@
*/
BOOL WINAPI CloseWindowStation(HWINSTA hWinSta)
{
- FIXME_(win32)("(%p)\n", hWinSta);
+ FIXME("(%p)\n", hWinSta);
return TRUE;
}
@@ -646,7 +642,7 @@
*/
BOOL WINAPI CloseDesktop(HDESK hDesk)
{
- FIXME_(win32)("(%p)\n", hDesk);
+ FIXME("(%p)\n", hDesk);
return TRUE;
}
@@ -654,7 +650,7 @@
* SetWindowStationUser (USER32.@)
*/
DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) {
- FIXME_(win32)("(0x%08lx,0x%08lx),stub!\n",x1,x2);
+ FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2);
return 1;
}
@@ -662,7 +658,7 @@
* SetLogonNotifyWindow (USER32.@)
*/
DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) {
- FIXME_(win32)("(%p,%p),stub!\n",hwinsta,hwnd);
+ FIXME("(%p,%p),stub!\n",hwinsta,hwnd);
return 1;
}
@@ -677,14 +673,14 @@
* GetUserObjectInformationA (USER32.@)
*/
BOOL WINAPI GetUserObjectInformationA( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
-{ FIXME_(win32)("(%p %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
+{ FIXME("(%p %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
return TRUE;
}
/***********************************************************************
* GetUserObjectInformationW (USER32.@)
*/
BOOL WINAPI GetUserObjectInformationW( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
-{ FIXME_(win32)("(%p %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
+{ FIXME("(%p %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
return TRUE;
}
/***********************************************************************
@@ -692,7 +688,7 @@
*/
BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, PSECURITY_INFORMATION pSIRequested,
PSECURITY_DESCRIPTOR pSID, DWORD nLength, LPDWORD lpnLengthNeeded)
-{ FIXME_(win32)("(%p %p %p len=%ld %p),stub!\n", hObj, pSIRequested, pSID, nLength, lpnLengthNeeded);
+{ FIXME("(%p %p %p len=%ld %p),stub!\n", hObj, pSIRequested, pSID, nLength, lpnLengthNeeded);
return TRUE;
}
@@ -700,7 +696,7 @@
* SetSystemCursor (USER32.@)
*/
BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id)
-{ FIXME_(win32)("(%p,%08lx),stub!\n", hcur, id);
+{ FIXME("(%p,%08lx),stub!\n", hcur, id);
return TRUE;
}
@@ -709,15 +705,14 @@
*/
void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved)
{
- FIXME_(win32)("(%08lx, %08lx)\n", flags, reserved);
+ FIXME("(%08lx, %08lx)\n", flags, reserved);
}
/***********************************************************************
* RegisterDeviceNotificationA (USER32.@)
*/
-HDEVNOTIFY WINAPI RegisterDeviceNotificationA(
- HANDLE hnd, LPVOID notifyfilter, DWORD flags
-) {
- FIXME_(win32)("(hwnd=%p, filter=%p,flags=0x%08lx), STUB!\n", hnd,notifyfilter,flags );
+HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags)
+{
+ FIXME("(hwnd=%p, filter=%p,flags=0x%08lx), STUB!\n", hnd,notifyfilter,flags );
return 0;
}
--
Dimi.