Author: greatlrd Date: Mon Jul 10 05:48:46 2006 New Revision: 22988
URL: http://svn.reactos.org/svn/reactos?rev=22988&view=rev Log: Implement SPI_GETFLATMENU and SPI_SETFLATMENU after jimtabor request not tested if it work
Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c
Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Mon Jul 10 05:48:46 2006 @@ -32,7 +32,8 @@ UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; - + + BOOL FlatMenu; /* ScreenSaver */ BOOL ScreenSaverRunning; UINT ScreenSaverTimeOut;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jul 10 05:48:46 2006 @@ -998,6 +998,8 @@ case SPI_GETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETFLATMENU: + case SPI_SETFLATMENU: { PSYSTEM_CURSORINFO CurInfo;
@@ -1013,6 +1015,12 @@
switch(uiAction) { + case SPI_GETFLATMENU: + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; + return TRUE; + case SPI_SETFLATMENU: + WinStaObject->FlatMenu = uiParam; + break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; @@ -1035,7 +1043,7 @@ CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? - break; + return TRUE; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */ @@ -1400,6 +1408,8 @@ case SPI_SETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETFLATMENU: + case SPI_SETFLATMENU: { BOOL Ret;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Jul 10 05:48:46 2006 @@ -490,6 +490,7 @@ */ WindowStationObject->ScreenSaverRunning = FALSE; WindowStationObject->ScreenSaverTimeOut = 30; + WindowStationObject->FlatMenu = FALSE;
if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) { @@ -509,6 +510,8 @@
CurInfo->WheelScroLines = 3; CurInfo->WheelScroChars = 3; + +
/* FIXME: Obtain the following information from the registry */ CurInfo->SwapButtons = FALSE;