Author: tfaber
Date: Sun Jul 7 09:42:57 2013
New Revision: 59443
URL: http://svn.reactos.org/svn/reactos?rev=59443&view=rev
Log:
[CMAKE]
- Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all parts of the version number -- e.g. 16.00.40219.01 contains "19." in addition to "16."
Modified:
trunk/reactos/configure.cmd
Modified: trunk/reactos/configure.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59443&r1…
==============================================================================
--- trunk/reactos/configure.cmd [iso-8859-1] (original)
+++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 7 09:42:57 2013
@@ -57,10 +57,11 @@
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm
- cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8
- cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9
- cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10
- cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11
+ cl 2>&1 | find "14.00." > NUL && set BUILD_ENVIRONMENT=VS8
+ cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9
+ cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10
+ cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11
+ ::cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12
if not defined BUILD_ENVIRONMENT (
echo Error: Visual Studio version too old or version detection failed.
exit /b
Author: hbelusca
Date: Sun Jul 7 00:23:34 2013
New Revision: 59437
URL: http://svn.reactos.org/svn/reactos?rev=59437&view=rev
Log:
Revert revision r59381 since it fails to detect VS2010 (and I suppose the other ones, then).
Indeed with VS2010, checking for the string content " 16." instead of "16." makes version checking fail.
After checking with a hex editor what was the character preceding the number "1" of the "16." part of the
version string returned by cl.exe, I saw that it wasn't a space as thought by the author, but the character
of code 0xA0 ...
Modified:
trunk/reactos/configure.cmd
Modified: trunk/reactos/configure.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59437&r1…
==============================================================================
--- trunk/reactos/configure.cmd [iso-8859-1] (original)
+++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 7 00:23:34 2013
@@ -57,10 +57,10 @@
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm
- cl 2>&1 | find " 14." > NUL && set BUILD_ENVIRONMENT=VS8
- cl 2>&1 | find " 15." > NUL && set BUILD_ENVIRONMENT=VS9
- cl 2>&1 | find " 16." > NUL && set BUILD_ENVIRONMENT=VS10
- cl 2>&1 | find " 17." > NUL && set BUILD_ENVIRONMENT=VS11
+ cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8
+ cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9
+ cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10
+ cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11
if not defined BUILD_ENVIRONMENT (
echo Error: Visual Studio version too old or version detection failed.
exit /b
Author: hbelusca
Date: Sat Jul 6 16:05:39 2013
New Revision: 59434
URL: http://svn.reactos.org/svn/reactos?rev=59434&view=rev
Log:
[CONSRV]
Fix copy of text in text-mode screenbuffers, in case we are copying NULL chars.
Modified:
trunk/reactos/win32ss/user/consrv/frontends/gui/text.c
Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte…
==============================================================================
--- trunk/reactos/win32ss/user/consrv/frontends/gui/text.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/consrv/frontends/gui/text.c [iso-8859-1] Sat Jul 6 16:05:39 2013
@@ -83,7 +83,15 @@
/* Copy only the characters, leave attributes alone */
for (xPos = 0; xPos < selWidth; xPos++)
{
- dstPos[xPos] = ptr[xPos].Char.UnicodeChar;
+ /*
+ * Sometimes, applications can put NULL chars into the screen-buffer
+ * (this behaviour is allowed). Detect this and replace by a space.
+ * FIXME - HACK: Improve the way we're doing that (i.e., put spaces
+ * instead of NULLs (or even, nothing) only if it exists a non-null
+ * char *after* those NULLs, before the end-of-line of the selection.
+ * Do the same concerning spaces -- i.e. trailing spaces --).
+ */
+ dstPos[xPos] = (ptr[xPos].Char.UnicodeChar ? ptr[xPos].Char.UnicodeChar : L' ');
}
dstPos += selWidth;