From: Christophe Mutricy <xtophe@videolan.org>
Date: Fri, 25 Nov 2005 17:56:49 +0000 (+0000)
Subject: Backport of [13378]
X-Git-Tag: 0.8.4~6
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0bf6a95d806634e6690f1487dd016c1ad9a14229;p=vlc

Backport of [13378]
---

diff --git a/modules/video_output/directx/events.c b/modules/video_output/directx/events.c
index f7dd749071..509aae4c2a 100644
--- a/modules/video_output/directx/events.c
+++ b/modules/video_output/directx/events.c
@@ -736,7 +736,7 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
 
     /* Catch the screensaver and the monitor turn-off */
     if( message == WM_SYSCOMMAND &&
-        ( wParam == SC_SCREENSAVE || wParam == SC_MONITORPOWER ) )
+        ( (wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER ) )
     {
         //if( p_vout ) msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND screensaver" );
         return 0; /* this stops them from happening */
diff --git a/modules/video_output/wingdi.c b/modules/video_output/wingdi.c
index 34723464a4..7f413becf8 100644
--- a/modules/video_output/wingdi.c
+++ b/modules/video_output/wingdi.c
@@ -1062,7 +1062,7 @@ static long FAR PASCAL WndProc( HWND hWnd, UINT message,
 #ifndef UNDER_CE
     /* Catch the screensaver and the monitor turn-off */
     if( message == WM_SYSCOMMAND &&
-        ( wParam == SC_SCREENSAVE || wParam == SC_MONITORPOWER ) )
+        ( (wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER ) )
     {
         //if( p_vout ) msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND screensaver" );
         return 0; /* this stops them from happening */