Author: greatlrd
Date: Thu Nov 1 23:32:39 2007
New Revision: 30049
URL: http://svn.reactos.org/svn/reactos?rev=30049&view=rev
Log:
rename framebuf_acc to framebufacc to make rbuild happy
implement hw support for DrvMovePointer, it mean if a driver have this function implement our framebufacc will use it
Added:
trunk/reactos/drivers/video/displays/framebufacc/
- copied from r30044, trunk/reactos/drivers/video/displays/framebuf_acc/
Removed:
trunk/reactos/drivers/video/displays/framebuf_acc/
Modified:
trunk/reactos/drivers/video/displays/directory.rbuild
trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h
trunk/reactos/drivers/video/displays/framebufacc/pointer.c
trunk/reactos/drivers/video/displays/framebufacc/surface.c
Modified: trunk/reactos/drivers/video/displays/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/dir…
==============================================================================
--- trunk/reactos/drivers/video/displays/directory.rbuild (original)
+++ trunk/reactos/drivers/video/displays/directory.rbuild Thu Nov 1 23:32:39 2007
@@ -4,6 +4,9 @@
<directory name="framebuf">
<xi:include href="framebuf/framebuf.rbuild" />
</directory>
+ <directory name="framebufacc">
+ <xi:include href="framebufacc/framebuf_acc.rbuild" />
+ </directory>
<directory name="vga">
<xi:include href="vga/vgaddi.rbuild" />
</directory>
Modified: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
==============================================================================
--- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h (original)
+++ trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h Thu Nov 1 23:32:39 2007
@@ -51,6 +51,9 @@
ULONG BlueMask;
BYTE PaletteShift;
PVOID ScreenPtr;
+
+ /* Vitual desktop stuff */
+ POINTL ScreenOffsetXY;
/* Palette data */
HPALETTE DefaultPalette;
Modified: trunk/reactos/drivers/video/displays/framebufacc/pointer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
==============================================================================
--- trunk/reactos/drivers/video/displays/framebufacc/pointer.c (original)
+++ trunk/reactos/drivers/video/displays/framebufacc/pointer.c Thu Nov 1 23:32:39 2007
@@ -1,7 +1,7 @@
/*
* ReactOS Generic Framebuffer display driver
*
- * Copyright (C) 2004 Filip Navara
+ * Copyright (C) 2007 Magnus Olsen
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -20,6 +20,53 @@
#include "framebuf_acc.h"
+
+/*
+ * DrvMovePointer
+ *
+ * Moves the pointer to a new position and ensures that GDI does not interfere
+ * with the display of the pointer.
+ *
+ * Status
+ * @implemented
+ */
+
+VOID APIENTRY
+DrvMovePointer(IN SURFOBJ *pso,
+ IN LONG x,
+ IN LONG y,
+ IN RECTL *prcl)
+{
+ PPDEV ppdev = (PPDEV) pso->dhpdev;
+ DWORD returnedDataLength;
+ VIDEO_POINTER_POSITION NewPointerPosition;
+
+ x -= ppdev->ScreenOffsetXY.x;
+ y -= ppdev->ScreenOffsetXY.y;
+
+ /* position of (-1,-1) hide the pointer */
+ if ((x == -1) || (y == -1))
+ {
+ if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_DISABLE_POINTER, NULL, 0, NULL, 0, &returnedDataLength))
+ {
+ /* hw did not disable the mouse, we try then with software */
+ EngMovePointer(pso, x, y, prcl);
+ }
+ }
+ else
+ {
+ /* Calc the mouse positions and set it to the new positions */
+ NewPointerPosition.Column = (SHORT) x - (SHORT) (ppdev->PointerHotSpot.x);
+ NewPointerPosition.Row = (SHORT) y - (SHORT) (ppdev->PointerHotSpot.y);
+
+ if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_POINTER_POSITION, &NewPointerPosition,
+ sizeof(VIDEO_POINTER_POSITION), NULL, 0, &returnedDataLength))
+ {
+ /* hw did not disable the mouse, we try then with software */
+ EngMovePointer(pso, x, y, prcl);
+ }
+ }
+}
/*
@@ -48,24 +95,6 @@
return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl);
}
-/*
- * DrvMovePointer
- *
- * Moves the pointer to a new position and ensures that GDI does not interfere
- * with the display of the pointer.
- *
- * Status
- * @unimplemented
- */
-
-VOID APIENTRY
-DrvMovePointer(
- IN SURFOBJ *pso,
- IN LONG x,
- IN LONG y,
- IN RECTL *prcl)
-{
- return EngMovePointer(pso, x, y, prcl);
-}
+
Modified: trunk/reactos/drivers/video/displays/framebufacc/surface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
==============================================================================
--- trunk/reactos/drivers/video/displays/framebufacc/surface.c (original)
+++ trunk/reactos/drivers/video/displays/framebufacc/surface.c Thu Nov 1 23:32:39 2007
@@ -154,6 +154,9 @@
{
return FALSE;
}
+
+ /* Rest the desktop vitual position */
+ ppdev->ScreenOffsetXY = {0,0};
switch (ppdev->BitsPerPixel)
Author: dreimer
Date: Thu Nov 1 23:02:51 2007
New Revision: 30048
URL: http://svn.reactos.org/svn/reactos?rev=30048&view=rev
Log:
Get rid of the last Unix Tool: SED. Byebye
Modified:
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Root/Config.cmd
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Nov 1 23:02:51 2007
@@ -68,6 +68,7 @@
- Get rid of svnversion.exe and its need in ssvn.cmd. (Daniel Reimer)
- Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (Peter Ward)
- Add a Shortcut Listing Feature to scut.cmd. (Daniel Reimer)
+ - Fully get rid of all *nix Tools (Daniel Reimer)
- Started to Update the Documentation. (Daniel Reimer)
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Thu Nov 1 23:02:51 2007
@@ -112,7 +112,6 @@
set SARCH=%SARCH:~7,-1%
echo Right now: %SARCH%
set /p SARCH_CH="(), (xbox)"
-sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%SARCH_CH%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%SARCH_CH%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%TEMP%\config2.rbuild"
cls
echo Which CPU ReactOS should be optimized for.
@@ -129,7 +128,6 @@
if "%OARCH_CH%" == "" (
set OARCH_CH=pentium
)
-sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%OARCH_CH%\"/g" "%TEMP%\config2.rbuild" > "%TEMP%\config3.rbuild"
cls
echo What level do you want ReactOS to be optimized at.
@@ -146,7 +144,6 @@
if "%OPTIMIZE_CH%" == "" (
set OPTIMIZE_CH=1
)
-sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%OPTIMIZE_CH%\"/g" "%TEMP%\config3.rbuild" > "%TEMP%\config4.rbuild"
cls
echo Whether to compile for an uniprocessor or multiprocessor machine.
@@ -159,7 +156,6 @@
if "%MP_CH%" == "" (
set MP_CH=0
)
-sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%MP_CH%\"/g" "%TEMP%\config4.rbuild" > "%TEMP%\config5.rbuild"
cls
echo Whether to compile in the integrated kernel debugger.
@@ -172,7 +168,6 @@
if "%KDBG_CH%" == "" (
set KDBG_CH=0
)
-sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%KDBG_CH%\"/g" "%TEMP%\config5.rbuild" > "%TEMP%\config6.rbuild"
cls
echo Whether to compile for debugging. No compiler optimizations will be
@@ -186,7 +181,6 @@
if "%DBG_CH%" == "" (
set DBG_CH=1
)
-sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%DBG_CH%\"/g" "%TEMP%\config6.rbuild" > "%TEMP%\config7.rbuild"
cls
echo Whether to compile for debugging with GDB. If you don't use GDB,
@@ -200,7 +194,6 @@
if "%GDB_CH%" == "" (
set GDB_CH=0
)
-sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%GDB_CH%\"/g" "%TEMP%\config7.rbuild" > "%TEMP%\config8.rbuild"
cls
echo Whether to compile apps/libs with features covered software patents
@@ -216,7 +209,6 @@
if "%NSWPAT_CH%" == "" (
set NSWPAT_CH=0
)
-sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%NSWPAT_CH%\"/g" "%TEMP%\config8.rbuild" > "%TEMP%\config9.rbuild"
cls
echo Whether to compile with the KD protocol. This will disable support for
@@ -234,15 +226,27 @@
if "%WINKD_CH%" == "" (
set WINKD_CH=0
)
-sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%WINKD_CH%\"/g" "%TEMP%\config9.rbuild" > "%TEMP%\config10.rbuild"
+cls
::
:: Generate a config.rbuild, copy it to the Source Tree and delete temp files.
::
-copy "%TEMP%\config10.rbuild" "%TEMP%\config.tmp"
-del "%TEMP%\*.rbuild"
+echo ^<?xml version="1.0"?^>>%TEMP%\config.tmp
+echo ^<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"^>>%TEMP%\config.tmp
+echo ^<group^>>%TEMP%\config.tmp
+echo ^<property name="SARCH" value="%SARCH_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="OARCH" value="%OARCH_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="OPTIMIZE" value="%OPTIMIZE_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="MP" value="%MP_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="KDBG" value="%KDBG_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="DBG" value="%DBG_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="GDB" value="%GDB_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="NSWPAT" value="%NSWPAT_CH%" /^>>>%TEMP%\config.tmp
+echo ^<property name="_WINKD_" value="%WINKD_CH%" /^>>>%TEMP%\config.tmp
+echo ^</group^>>>%TEMP%\config.tmp
+
copy "%TEMP%\config.tmp" "%_ROSBE_BASEDIR%\config.rbuild"
-del "%TEMP%\*.tmp"
+del %TEMP%\config.tmp
copy "%_ROSBE_BASEDIR%\config.rbuild" "config.rbuild"
goto :NOK
Author: peterw
Date: Thu Nov 1 18:45:51 2007
New Revision: 30044
URL: http://svn.reactos.org/svn/reactos?rev=30044&view=rev
Log:
- Fix the config.rbuild checks... variable expansion in cmd sucks :P.
Modified:
trunk/tools/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE-Windows/Root/Config.cmd
Modified: trunk/tools/RosBE-Windows/Root/Build.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build.cmd Thu Nov 1 18:45:51 2007
@@ -16,9 +16,10 @@
:: Check if config.template.rbuild is newer than config.rbuild, if it is then
:: abort the build and inform the user.
::
+setlocal enabledelayedexpansion
if exist .\config.rbuild (
chknewer .\config.template.rbuild .\config.rbuild
- if errorlevel 1 (
+ if !errorlevel! == 1 (
echo.
echo *** config.template.rbuild is newer than config.rbuild ***
echo *** aborting build. Please check for changes and ***
@@ -27,6 +28,7 @@
goto :EOC
)
)
+endlocal
::
:: Check if strip or ccache are being used and set the appropriate options.
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Thu Nov 1 18:45:51 2007
@@ -84,9 +84,10 @@
:: Check if config.template.rbuild is newer than config.rbuild, if it is then
:: inform the user and offer an update.
::
+setlocal enabledelayedexpansion
if exist ".\config.rbuild" (
chknewer ".\config.template.rbuild" ".\config.rbuild"
- if errorlevel 1 (
+ if !errorlevel! == 1 (
echo.
echo *** config.template.rbuild is newer than working config.rbuild ***
echo *** The Editor cannot continue with this file. Do you wanna ***
@@ -99,6 +100,7 @@
goto :NOK
)
)
+endlocal
::
:: Start with reading settings from config.rbuild and let the user edit them.
Author: dreimer
Date: Thu Nov 1 18:33:59 2007
New Revision: 30042
URL: http://svn.reactos.org/svn/reactos?rev=30042&view=rev
Log:
Add some forgotten "" and add the list feature back to RosBE. It already was in the new C Version, but not in the .cmd which calls it.
Modified:
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/scut.cmd
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Thu Nov 1 18:33:59 2007
@@ -84,8 +84,8 @@
:: Check if config.template.rbuild is newer than config.rbuild, if it is then
:: inform the user and offer an update.
::
-if exist .\config.rbuild (
- chknewer .\config.template.rbuild .\config.rbuild
+if exist ".\config.rbuild" (
+ chknewer ".\config.template.rbuild" ".\config.rbuild"
if errorlevel 1 (
echo.
echo *** config.template.rbuild is newer than working config.rbuild ***
Modified: trunk/tools/RosBE-Windows/Root/scut.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/scut.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/scut.cmd Thu Nov 1 18:33:59 2007
@@ -33,6 +33,10 @@
call "%_ROSBE_BASEDIR%\Tools\scut.exe" %*
goto :EOC
)
+if /i "%1" == "list" (
+ call "%_ROSBE_BASEDIR%\Tools\scut.exe" %*
+ goto :EOC
+)
if not "%1" == "" (
for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools Test\scut.exe" %*"`) do (
if /i not "%%i" == "Default" (