From c7de3401ac483682ec3f334fdd7c81e6d65f4d9c Mon Sep 17 00:00:00 2001 From: Andriy Palamarchuk Date: Fri, 30 Nov 2001 23:15:32 +0000 Subject: [PATCH] Removed Get/SetScreenSaveTimeout user driver functions because they are not used. --- dlls/ttydrv/ttydrv.spec | 2 -- dlls/ttydrv/user.c | 20 -------------------- dlls/user/user_main.c | 2 -- dlls/x11drv/x11drv.spec | 2 -- dlls/x11drv/x11drv_main.c | 31 ------------------------------- include/user.h | 2 -- 6 files changed, 59 deletions(-) diff --git a/dlls/ttydrv/ttydrv.spec b/dlls/ttydrv/ttydrv.spec index 2ff911efe63..984468acbb3 100644 --- a/dlls/ttydrv/ttydrv.spec +++ b/dlls/ttydrv/ttydrv.spec @@ -55,8 +55,6 @@ debug_channels (ttydrv) @ cdecl SetCursor(ptr) TTYDRV_SetCursor @ cdecl GetScreenSaveActive() TTYDRV_GetScreenSaveActive @ cdecl SetScreenSaveActive(long) TTYDRV_SetScreenSaveActive -@ cdecl GetScreenSaveTimeout() TTYDRV_GetScreenSaveTimeout -@ cdecl SetScreenSaveTimeout(long) TTYDRV_SetScreenSaveTimeout @ cdecl LoadOEMResource(long long) TTYDRV_LoadOEMResource @ cdecl CreateWindow(long ptr long) TTYDRV_CreateWindow @ cdecl DestroyWindow(long) TTYDRV_DestroyWindow diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c index 38f2f76213f..8c267b3b0a8 100644 --- a/dlls/ttydrv/user.c +++ b/dlls/ttydrv/user.c @@ -85,26 +85,6 @@ void TTYDRV_SetScreenSaveActive(BOOL bActivate) FIXME("(%d): stub\n", bActivate); } -/*********************************************************************** - * GetScreenSaveTimeout (TTYDRV.@) - * - * Return the screen saver timeout - */ -int TTYDRV_GetScreenSaveTimeout(void) -{ - return 0; -} - -/*********************************************************************** - * SetScreenSaveTimeout (TTYDRV.@) - * - * Set the screen saver timeout - */ -void TTYDRV_SetScreenSaveTimeout(int nTimeout) -{ - FIXME("(%d): stub\n", nTimeout); -} - /********************************************************************** * LoadOEMResource (TTYDRV.@) */ diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 006e74c811c..fa830b64039 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -73,8 +73,6 @@ static BOOL load_driver(void) GET_USER_FUNC(SetCursorPos); GET_USER_FUNC(GetScreenSaveActive); GET_USER_FUNC(SetScreenSaveActive); - GET_USER_FUNC(GetScreenSaveTimeout); - GET_USER_FUNC(SetScreenSaveTimeout); GET_USER_FUNC(LoadOEMResource); GET_USER_FUNC(AcquireClipboard); GET_USER_FUNC(ReleaseClipboard); diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec index 97c4571004b..0c6a3ace49d 100644 --- a/dlls/x11drv/x11drv.spec +++ b/dlls/x11drv/x11drv.spec @@ -72,8 +72,6 @@ debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl GetScreenSaveActive() X11DRV_GetScreenSaveActive @ cdecl SetScreenSaveActive(long) X11DRV_SetScreenSaveActive -@ cdecl GetScreenSaveTimeout() X11DRV_GetScreenSaveTimeout -@ cdecl SetScreenSaveTimeout(long) X11DRV_SetScreenSaveTimeout @ cdecl LoadOEMResource(long long) X11DRV_LoadOEMResource @ cdecl CreateWindow(long ptr long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 202e92116fe..ae2248e79d9 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -501,34 +501,3 @@ void X11DRV_SetScreenSaveActive(BOOL bActivate) TSXSetScreenSaver(gdi_display, timeout, interval, prefer_blanking, allow_exposures); } - -/*********************************************************************** - * GetScreenSaveTimeout (X11DRV.@) - * - * Return the screen saver timeout - */ -int X11DRV_GetScreenSaveTimeout(void) -{ - int timeout, temp; - TSXGetScreenSaver(gdi_display, &timeout, &temp, &temp, &temp); - return timeout; -} - -/*********************************************************************** - * SetScreenSaveTimeout (X11DRV.@) - * - * Set the screen saver timeout - */ -void X11DRV_SetScreenSaveTimeout(int nTimeout) -{ - int timeout, interval, prefer_blanking, allow_exposures; - - TSXGetScreenSaver(gdi_display, &timeout, &interval, &prefer_blanking, - &allow_exposures); - - /* timeout is a 16bit entity (CARD16) in the protocol, so it should - * not get over 32767 or it will get negative. */ - if (nTimeout>32767) nTimeout = 32767; - TSXSetScreenSaver(gdi_display, nTimeout, interval, prefer_blanking, - allow_exposures); -} diff --git a/include/user.h b/include/user.h index baf99dbafcf..512fef0f5a4 100644 --- a/include/user.h +++ b/include/user.h @@ -63,8 +63,6 @@ typedef struct tagUSER_DRIVER { /* screen saver functions */ BOOL (*pGetScreenSaveActive)(void); void (*pSetScreenSaveActive)(BOOL); - int (*pGetScreenSaveTimeout)(void); - void (*pSetScreenSaveTimeout)(int); /* resource functions */ HANDLE (*pLoadOEMResource)(WORD,WORD); /* clipboard functions */