01/02: [WLNOTIFY] Use the wine debug method, add wlnotify to the build and fix some typos
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a36ee83592547875d5d75...
commit 9a36ee83592547875d5d756e6d0952b47b2fb00f Author: Eric Kohl eric.kohl@reactos.org AuthorDate: Sat Aug 18 22:19:14 2018 +0200 Commit: Eric Kohl eric.kohl@reactos.org CommitDate: Sat Aug 18 22:20:17 2018 +0200
[WLNOTIFY] Use the wine debug method, add wlnotify to the build and fix some typos --- boot/bootdata/hivesft.inf | 2 +- dll/win32/CMakeLists.txt | 1 + dll/win32/wlnotify/CMakeLists.txt | 1 + dll/win32/wlnotify/precomp.h | 3 + dll/win32/wlnotify/scard.c | 77 +++++++------ dll/win32/wlnotify/schedsvc.c | 51 +++++---- dll/win32/wlnotify/senssvc.c | 220 +++++++++++++++++++------------------- dll/win32/wlnotify/termserv.c | 147 +++++++++++++------------ dll/win32/wlnotify/wlballoon.c | 39 ++++--- dll/win32/wlnotify/wlnotify.c | 3 +- 10 files changed, 271 insertions(+), 273 deletions(-)
diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index bfd34a22d0..c96b3af291 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1385,7 +1385,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp"," HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Unlock",0x00000000,"SCardResumeCertProp" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","DlLName",0x00020000,"wlnotify.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","Logoff",0x00000000,"SchedEventLogOff" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","Logoff",0x00000000,"SchedEventLogoff" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","StartShell",0x00000000,"SchedStartShell" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Disconnect",0x00000000,"SensDisconnectEvent" diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 9906d76c9c..91407c7d04 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -243,6 +243,7 @@ add_subdirectory(winsta) add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) +add_subdirectory(wlnotify) add_subdirectory(wmi) add_subdirectory(wmiutils) add_subdirectory(wmvcore) diff --git a/dll/win32/wlnotify/CMakeLists.txt b/dll/win32/wlnotify/CMakeLists.txt index 5f890399d6..9a29d0628c 100644 --- a/dll/win32/wlnotify/CMakeLists.txt +++ b/dll/win32/wlnotify/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(wlnotify SHARED ${CMAKE_CURRENT_BINARY_DIR}/wlnotify.def)
set_module_type(wlnotify win32dll UNICODE ENTRYPOINT DllMain 12) +target_link_libraries(wlnotify wine) add_importlibs(wlnotify advapi32 kernel32 ntdll) add_pch(wlnotify precomp.h SOURCE) add_cd_file(TARGET wlnotify DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wlnotify/precomp.h b/dll/win32/wlnotify/precomp.h index 04c440dc93..c083b7c317 100644 --- a/dll/win32/wlnotify/precomp.h +++ b/dll/win32/wlnotify/precomp.h @@ -7,3 +7,6 @@ */ #include <windows.h> #include <winwlx.h> +#include <winsvc.h> + +#include <wine/debug.h> diff --git a/dll/win32/wlnotify/scard.c b/dll/win32/wlnotify/scard.c index 8eaa313070..a5b13b7c0b 100644 --- a/dll/win32/wlnotify/scard.c +++ b/dll/win32/wlnotify/scard.c @@ -7,25 +7,24 @@ */
#include "precomp.h" -#include <winsvc.h>
-#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); +
VOID WINAPI SCardResumeCertProp( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SCardResumeCertProp\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SCardResumeCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -34,15 +33,15 @@ WINAPI SCardStartCertProp( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SCardStartCertProp\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SCardStartCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -51,15 +50,15 @@ WINAPI SCardStopCertProp( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SCardStopCertProp\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SCardStopCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -68,15 +67,15 @@ WINAPI SCardSuspendCertProp( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SCardSuspendCertProp\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SCardSuspendCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
/* EOF */ diff --git a/dll/win32/wlnotify/schedsvc.c b/dll/win32/wlnotify/schedsvc.c index ad8bcb5b16..edf89e29ec 100644 --- a/dll/win32/wlnotify/schedsvc.c +++ b/dll/win32/wlnotify/schedsvc.c @@ -9,8 +9,7 @@ #include "precomp.h" #include <winsvc.h>
-#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify);
VOID @@ -22,33 +21,33 @@ SchedEventLogoff( SC_HANDLE hService = NULL; SERVICE_STATUS ServiceStatus;
- DPRINT("SchedStartShellEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SchedEventLogoff\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback);
hManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (hManager == NULL) { - DPRINT1("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); + WARN("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); goto done; }
hService = OpenServiceW(hManager, L"Schedule", SERVICE_USER_DEFINED_CONTROL); if (hManager == NULL) { - DPRINT1("OpenServiceW() failed (Error %lu)\n", GetLastError()); + WARN("OpenServiceW() failed (Error %lu)\n", GetLastError()); goto done; }
if (!ControlService(hService, 129, &ServiceStatus)) { - DPRINT1("ControlService() failed (Error %lu)\n", GetLastError()); + WARN("ControlService() failed (Error %lu)\n", GetLastError()); }
done: @@ -69,33 +68,33 @@ SchedStartShell( SC_HANDLE hService = NULL; SERVICE_STATUS ServiceStatus;
- DPRINT("SchedStartShellEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SchedStartShell\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback);
hManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (hManager == NULL) { - DPRINT1("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); + WARN("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); goto done; }
hService = OpenServiceW(hManager, L"Schedule", SERVICE_USER_DEFINED_CONTROL); if (hManager == NULL) { - DPRINT1("OpenServiceW() failed (Error %lu)\n", GetLastError()); + WARN("OpenServiceW() failed (Error %lu)\n", GetLastError()); goto done; }
if (!ControlService(hService, 128, &ServiceStatus)) { - DPRINT1("ControlService() failed (Error %lu)\n", GetLastError()); + WARN("ControlService() failed (Error %lu)\n", GetLastError()); }
done: diff --git a/dll/win32/wlnotify/senssvc.c b/dll/win32/wlnotify/senssvc.c index e238a849a9..9c6ff70cf9 100644 --- a/dll/win32/wlnotify/senssvc.c +++ b/dll/win32/wlnotify/senssvc.c @@ -7,10 +7,8 @@ */
#include "precomp.h" -#include <winsvc.h>
-#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify);
VOID @@ -18,15 +16,15 @@ WINAPI SensDisconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensDisconnectEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensDisconnectEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -35,15 +33,15 @@ WINAPI SensLockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensLockEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensLockEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -52,15 +50,15 @@ WINAPI SensLogoffEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensLogoffEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensLogoffEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -69,15 +67,15 @@ WINAPI SensLogonEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensLogonEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensLogonEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -86,15 +84,15 @@ WINAPI SensPostShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensPostShellEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensPostShellEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -103,15 +101,15 @@ WINAPI SensReconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensReconnectEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensReconnectEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -120,15 +118,15 @@ WINAPI SensShutdownEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensShutdownEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensShutdownEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -137,15 +135,15 @@ WINAPI SensStartScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStartScreenSaverEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensStartScreenSaverEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -154,15 +152,15 @@ WINAPI SensStartShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStartShellEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensStartShellEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -171,15 +169,15 @@ WINAPI SensStartupEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStartupEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensStartupEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -188,15 +186,15 @@ WINAPI SensStopScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStopScreenSaverEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensStopScreenSaverEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -205,15 +203,15 @@ WINAPI SensUnlockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensUnlockEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("SensUnlockEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
/* EOF */ diff --git a/dll/win32/wlnotify/termserv.c b/dll/win32/wlnotify/termserv.c index d33eb41d0b..357c2cf162 100644 --- a/dll/win32/wlnotify/termserv.c +++ b/dll/win32/wlnotify/termserv.c @@ -8,8 +8,7 @@
#include "precomp.h"
-#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify);
VOID @@ -17,15 +16,15 @@ WINAPI TSEventDisconnect( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventDisconnect\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventDisconnect\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -34,15 +33,15 @@ WINAPI TSEventLogoff( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventLogoff\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventLogoff\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -51,15 +50,15 @@ WINAPI TSEventLogon( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventLogon\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventLogon\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
VOID @@ -67,15 +66,15 @@ WINAPI TSEventPostShell( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventPostShell\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventPostShell\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
VOID @@ -83,15 +82,15 @@ WINAPI TSEventReconnect( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventReconnect\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventReconnect\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -100,15 +99,15 @@ WINAPI TSEventShutdown( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventShutdown\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventShutdown\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -117,15 +116,15 @@ WINAPI TSEventStartShell( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventStartShell\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventStartShell\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -134,15 +133,15 @@ WINAPI TSEventStartup( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventStartup\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("TSEventStartup\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
diff --git a/dll/win32/wlnotify/wlballoon.c b/dll/win32/wlnotify/wlballoon.c index c6ced7105b..8a5a583df3 100644 --- a/dll/win32/wlnotify/wlballoon.c +++ b/dll/win32/wlnotify/wlballoon.c @@ -8,8 +8,7 @@
#include "precomp.h"
-#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify);
VOID @@ -17,15 +16,15 @@ WINAPI RegisterTicketExpiredNotificationEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("RegisterTicketExpiredNotificationEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("RegisterTicketExpiredNotificationEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
@@ -34,15 +33,15 @@ WINAPI UnregisterTicketExpiredNotificationEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("UnregisterTicketExpiredNotificationEvent\n"); - DPRINT("Size: %lu\n", pInfo->Size); - DPRINT("Flags: %lx\n", pInfo->Flags); - DPRINT("UserName: %S\n", pInfo->UserName); - DPRINT("Domain: %S\n", pInfo->Domain); - DPRINT("WindowStation: %S\n", pInfo->WindowStation); - DPRINT("hToken: %p\n", pInfo->hToken); - DPRINT("hDesktop: %p\n", pInfo->hDesktop); - DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + TRACE("UnregisterTicketExpiredNotificationEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); }
diff --git a/dll/win32/wlnotify/wlnotify.c b/dll/win32/wlnotify/wlnotify.c index 8393e41ee9..38f7137507 100644 --- a/dll/win32/wlnotify/wlnotify.c +++ b/dll/win32/wlnotify/wlnotify.c @@ -8,8 +8,7 @@
#include "precomp.h"
-#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify);
BOOL
-
Eric Kohl