Author: dreimer
Date: Sun Jul 22 19:55:56 2007
New Revision: 27777
URL: http://svn.reactos.org/svn/reactos?rev=27777&view=rev
Log:
- First working try of my Fast Source Tree Switcher.
- Add cutz.cmd to bypass a STUUUPIIID Bug in cut under Windows.
(=Thinking every value in a line after starting cut belongs to it.)
Added:
trunk/tools/RosBE-Windows/Root/srclist.xml
trunk/tools/RosBE-Windows/Root/test.cmd
trunk/tools/RosBE-Windows/Tools/cutz.cmd
Added: trunk/tools/RosBE-Windows/Root/srclist.xml
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.x…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/srclist.xml (added)
+++ trunk/tools/RosBE-Windows/Root/srclist.xml Sun Jul 22 19:55:56 2007
@@ -1,0 +1,13 @@
+<?xml version="1.0"?>
+<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<!--
+ Here you can add all your Source Tree Locations into and use the
+ fast switcher for them later.
+
+ name="" Is the Name of your Shortcut
+ value="" Is the Path to a Source Tree Location.
+ Example: <property name="my" value="D:\SVNTree\ReactOS" />
+-->
+
+<property name="main" value="C:\RosBE\Source" />
Added: trunk/tools/RosBE-Windows/Root/test.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/test.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/test.cmd (added)
+++ trunk/tools/RosBE-Windows/Root/test.cmd Sun Jul 22 19:55:56 2007
@@ -1,0 +1,20 @@
+::
+:: PROJECT: RosBE - ReactOS Build Environment for Windows
+:: LICENSE: GPL - See COPYING in the top level directory
+:: FILE: Root/test.cmd
+:: PURPOSE: First step in the direction of a Multiple Source Tree "Compatible" RosBE.
+:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de>
+::
+::
+@echo off
+
+title Choose your Source Folder...
+
+echo Choose your Source Folder:
+SET /P XY=
+grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz > "%ROSBEBASEDIR%\aaa.tmp"
+set /P dir=< "%ROSBEBASEDIR%\aaa.tmp"
+del "%ROSBEBASEDIR%\aaa.tmp"
+cd %dir%
+
+title ReactOS Build Environment %_VER%
Added: trunk/tools/RosBE-Windows/Tools/cutz.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/cutz.cmd (added)
+++ trunk/tools/RosBE-Windows/Tools/cutz.cmd Sun Jul 22 19:55:56 2007
@@ -1,0 +1,10 @@
+::
+:: PROJECT: RosBE - ReactOS Build Environment for Windows
+:: LICENSE: GPL - See COPYING in the top level directory
+:: FILE: Tools/cutz.cmd
+:: PURPOSE: Bypass a stupid bug in cut.
+:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de>
+::
+::
+@echo off
+cut -d "\"" -f 4
Author: dreimer
Date: Sun Jul 22 15:55:03 2007
New Revision: 27775
URL: http://svn.reactos.org/svn/reactos?rev=27775&view=rev
Log:
- Update ChangeLog.txt
- Set eol:style native
- Get ready for 0.3.7 Final.
Modified:
trunk/tools/RosBE-Windows/Documentation/files/top.html (contents, props changed)
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Root/RosBE.cmd
Modified: trunk/tools/RosBE-Windows/Documentation/files/top.html
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/…
==============================================================================
--- trunk/tools/RosBE-Windows/Documentation/files/top.html (original)
+++ trunk/tools/RosBE-Windows/Documentation/files/top.html Sun Jul 22 15:55:03 2007
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
- <title>RosBE Logo and Title</title>
- <meta name="author" content="Daniel Reimer">
- <meta name="description" content="Shows the official RosBE Logo and Title">
- <style type="text/css">
- BODY
- {
- font-size: 24pt;
- font-style: italic;
- font-weight: bold;
- text-align: center;
- }
- SPAN{ font-size: 10pt; }
- </style>
-</head>
-<body>
- <div>
- <img src="RosBE.jpg" alt="RosBE Logo" style="float: left;">
- Documentation for RosBE for Microsoft<span>®</span>
- Windows NT<span>®</span>- based Operating Systems
- </div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>RosBE Logo and Title</title>
+ <meta name="author" content="Daniel Reimer">
+ <meta name="description" content="Shows the official RosBE Logo and Title">
+ <style type="text/css">
+ BODY
+ {
+ font-size: 24pt;
+ font-style: italic;
+ font-weight: bold;
+ text-align: center;
+ }
+ SPAN{ font-size: 10pt; }
+ </style>
+</head>
+<body>
+ <div>
+ <img src="RosBE.jpg" alt="RosBE Logo" style="float: left;">
+ Documentation for RosBE for Microsoft<span>®</span>
+ Windows NT<span>®</span>- based Operating Systems
+ </div>
+</body>
+</html>
Propchange: trunk/tools/RosBE-Windows/Documentation/files/top.html
------------------------------------------------------------------------------
svn:eol-style = native
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 Sun Jul 22 15:55:03 2007
@@ -1,19 +1,21 @@
-*** June 21th, 2007 - RosBE 0.3.7 Released
+*** July 22nd, 2007 - RosBE 0.3.7 Released
-- Updated: GCC 4.1.3 Build 200707XX
+- Updated: GCC 4.1.3 Build 20070703 (Daniel Reimer)
(Here is the reason why the installer got smaller between 0.3.6 and 0.3.7, my bins are stripped now)
-- Updated: binutils 2.17.50 Build 200707XX
-- Added a SVN Client.
-- Added a config.rbuild Configurator.
-- Added grep/cut/sed Tools for the new Configurator.
-- Added SVN 1.4.4 for the SVN Feature.
-- Added RAddr2Line Tool for the Devs out there.
-- Added use of ROS_LEAN_AND_MEAN by typeing "make/makex %command% strip".
-- Added GDB GNU-Debugger 6.6.
-- Readded makex. Sorry, bug in Vista still persists... its a GCC bug.
-- Changed Default Source Folder to \Source Subfolder. Helpful for letting RosBE load the Source.
-- Added a command to change the Default Folder for this session, nice for working with several ROS Trees or Branches.
-- Very ALPHA NonAdmin Account Support (NOT for Vista).
+- Updated: binutils 2.17.50 Build 20070522 WITH fixed windres! (Daniel Reimer)
+- Added a SVN Client. (Daniel Reimer)
+- Added a config.rbuild Configurator. (Daniel Reimer)
+- Added grep/cut/sed Tools for the new Configurator. (Daniel Reimer)
+- Added SVN 1.4.4 for the SVN Feature. (Daniel Reimer)
+- Added RAddr2Line Tool for the Devs out there. (Christoph von Wittich, Daniel Reimer)
+- Added use of ROS_LEAN_AND_MEAN by typeing "make/makex %command% strip". (Daniel Reimer)
+- Added GDB GNU-Debugger 6.6. (Daniel Reimer)
+- Readded makex. Sorry, bug in Vista still persists... its a GCC bug. (Daniel Reimer)
+- Changed Default Source Folder to \Source Subfolder. Helpful for letting RosBE load the Source. (Daniel Reimer)
+- Added a command to change the Default Folder for this session, nice for working with several ROS Trees or Branches. (Daniel Reimer)
+- Very ALPHA NonAdmin Account Support (NOT for Vista). (Daniel Reimer, Colin Finck)
+- Updated to NSIS 2.29.
+- Big NSIS Code cleanup, Don't add the global ROSBEBASEDIR variable anymore. (Colin Finck)
*** May 21th, 2007 - RosBE 0.3.6 Released
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Jul 22 15:55:03 2007
@@ -89,7 +89,7 @@
echo *******************************************************************************
echo * *
- echo * ReactOS Build Environment 0.3.7-4.1.3-200707XX (prerelease) *
+ echo * ReactOS Build Environment 0.3.7-4.1.3-20070703 (prerelease) *
echo * *
echo *******************************************************************************
echo.
Author: weiden
Date: Sun Jul 22 14:42:06 2007
New Revision: 27772
URL: http://svn.reactos.org/svn/reactos?rev=27772&view=rev
Log:
Create tag for freetype-2.3.5
Added:
vendor/freetype/freeype-2.3.5/
- copied from r27771, vendor/freetype/current/
Author: greatlrd
Date: Sat Jul 21 22:41:06 2007
New Revision: 27768
URL: http://svn.reactos.org/svn/reactos?rev=27768&view=rev
Log:
patch from : Paolo Devoti (email devotip at tiscali dot it)
-----------------------------------------------------------
Fixed right hdc being save/restore , the #if 0 change was not accpected.
the code works fine without it. it was problare cause by another bug.
all wine test for gdi32_winetest dc pass now, without any foualt.
See issue #2055 for more details.
Modified:
trunk/reactos/subsystems/win32/win32k/objects/dc.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Jul 21 22:41:06 2007
@@ -1811,42 +1811,44 @@
return FALSE;
}
- if(abs(SaveLevel) > dc->saveLevel || SaveLevel == 0)
+ if (SaveLevel < 0)
+ SaveLevel = dc->saveLevel + SaveLevel + 1;
+
+ if(SaveLevel < 0 || dc->saveLevel<SaveLevel)
{
DC_UnlockDc(dc);
return FALSE;
}
-
- /* FIXME this calc are not 100% correct I think ??*/
- if (SaveLevel < 0) SaveLevel = dc->saveLevel + SaveLevel + 1;
success=TRUE;
while (dc->saveLevel >= SaveLevel)
{
HDC hdcs = DC_GetNextDC (dc);
- dcs = DC_LockDc (hdcs);
+ dcs = DC_LockDc (hdcs);
if (dcs == NULL)
{
DC_UnlockDc(dc);
return FALSE;
}
- DC_SetNextDC (dc, DC_GetNextDC (dcs));
- dcs->hNext = 0;
-
- if (--dc->saveLevel < SaveLevel)
- {
- DC_UnlockDc( dc );
+ DC_SetNextDC (dc, DC_GetNextDC (dcs));
+ dcs->hNext = 0;
+
+ if (--dc->saveLevel < SaveLevel)
+ {
+ DC_UnlockDc( dc );
DC_UnlockDc( dcs );
- NtGdiSetDCState(hDC, hdcs);
- //if (!PATH_AssignGdiPath( &dc->path, &dcs->path ))
- /* FIXME: This might not be quite right, since we're
- * returning FALSE but still destroying the saved DC state
- */
- success=FALSE;
- dc = DC_LockDc(hDC);
+ NtGdiSetDCState(hDC, hdcs);
+
+ if (!PATH_AssignGdiPath( &dc->w.path, &dcs->w.path ))
+ {
+ /* FIXME: This might not be quite right, since we're
+ * returning FALSE but still destroying the saved DC state */
+ success = FALSE;
+ }
+ dc = DC_LockDc(hDC);
if(!dc)
{
return FALSE;