ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2013
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
13 participants
199 discussions
Start a n
N
ew thread
[tfaber] 59464: [PSDK] - Add CLSID_CCommonBrowser, CLSID_DeskBar, CLSID_DeskBarApp
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Jul 13 07:07:27 2013 New Revision: 59464 URL:
http://svn.reactos.org/svn/reactos?rev=59464&view=rev
Log: [PSDK] - Add CLSID_CCommonBrowser, CLSID_DeskBar, CLSID_DeskBarApp Modified: trunk/reactos/include/psdk/shlguid_undoc.h Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc…
============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sat Jul 13 07:07:27 2013 @@ -78,6 +78,9 @@ DEFINE_GUID(CLSID_ShellSearchExt, 0x169A0691, 0x8DF9, 0x11D1, 0xA1, 0xC4, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); DEFINE_GUID(CLSID_CommonButtons, 0x1E79697E, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x00, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); +DEFINE_GUID(CLSID_CCommonBrowser, 0xAF604EFE, 0x8897, 0x11D1, 0xB9, 0x44, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(CLSID_DeskBar, 0xecd4fc4c, 0x521c, 0x11d0, 0xb7, 0x92, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); +DEFINE_GUID(CLSID_DeskBarApp, 0x3ccf8a41, 0x5c85, 0x11d0, 0x97, 0x96, 0x00, 0xaa, 0x00, 0xb9, 0x0a, 0xdf); DEFINE_GUID(CGID_BrandCmdGroup, 0x25019D8C, 0x9EE0, 0x45C0, 0x88, 0x3B, 0x97, 0x2D, 0x48, 0x32, 0x5E, 0x18);
11 years, 5 months
1
0
0
0
[tfaber] 59463: [KMTESTS:RTL] - Fix a warning
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Jul 13 06:31:13 2013 New Revision: 59463 URL:
http://svn.reactos.org/svn/reactos?rev=59463&view=rev
Log: [KMTESTS:RTL] - Fix a warning Modified: trunk/rostests/kmtests/rtl/RtlException.c Modified: trunk/rostests/kmtests/rtl/RtlException.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.…
============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Sat Jul 13 06:31:13 2013 @@ -11,7 +11,6 @@ { NTSTATUS ExceptionStatus; PCHAR Buffer[128]; - CHAR Value; /* Access a valid pointer - must not trigger SEH */ KmtStartSeh() @@ -20,7 +19,7 @@ /* Read from a NULL pointer - must cause an access violation */ KmtStartSeh() - Value = *(volatile CHAR *)NULL; + (void)*(volatile CHAR *)NULL; KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to a NULL pointer - must cause an access violation */ @@ -32,7 +31,7 @@ #if 0 //def KMT_KERNEL_MODE /* Read from MmBadPointer - must cause an access violation */ KmtStartSeh() - Value = *(volatile CHAR *)MmBadPointer; + (void)*(volatile CHAR *)MmBadPointer; KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to MmBadPointer - must cause an access violation */
11 years, 5 months
1
0
0
0
[hbelusca] 59461: [CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Sat Jul 13 04:54:49 2013 New Revision: 59461 URL:
http://svn.reactos.org/svn/reactos?rev=59461&view=rev
Log: [CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. Added: trunk/reactos/win32ss/user/winsrv/consrv/ - copied from r59454, trunk/reactos/win32ss/user/consrv/ trunk/reactos/win32ss/user/winsrv/consrv.cmake - copied, changed from r59454, trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h - copied, changed from r59454, trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/winsrv/usersrv/ (with props) trunk/reactos/win32ss/user/winsrv/usersrv.cmake - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/usersrv/api.h - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/api.h trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/harderror.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/lang/ - copied from r59454, trunk/reactos/win32ss/user/winsrv/lang/ trunk/reactos/win32ss/user/winsrv/usersrv/register.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/register.c trunk/reactos/win32ss/user/winsrv/usersrv/resource.h - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/resource.h trunk/reactos/win32ss/user/winsrv/usersrv/rsrc.rc - copied unchanged from r59454, trunk/reactos/win32ss/user/winsrv/rsrc.rc trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.h trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.rc - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.rc Removed: trunk/reactos/win32ss/user/consrv/ trunk/reactos/win32ss/user/winsrv/api.h trunk/reactos/win32ss/user/winsrv/consrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv/conio.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.spec trunk/reactos/win32ss/user/winsrv/harderror.c trunk/reactos/win32ss/user/winsrv/lang/ trunk/reactos/win32ss/user/winsrv/register.c trunk/reactos/win32ss/user/winsrv/resource.h trunk/reactos/win32ss/user/winsrv/rsrc.rc trunk/reactos/win32ss/user/winsrv/shutdown.c trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv/alias.c trunk/reactos/win32ss/user/winsrv/consrv/alias.h trunk/reactos/win32ss/user/winsrv/consrv/api.h trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.h trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.rc trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/handle.h trunk/reactos/win32ss/user/winsrv/consrv/heap.h trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/include/console.h trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h trunk/reactos/win32ss/user/winsrv/consrv/procinit.h trunk/reactos/win32ss/user/winsrv/consrv/resource.h trunk/reactos/win32ss/user/winsrv/consrv/settings.c trunk/reactos/win32ss/user/winsrv/init.c trunk/reactos/win32ss/user/winsrv/winsrv.rc trunk/reactos/win32ss/user/winsrv/winsrv.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesys.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists…
Modified: trunk/reactos/win32ss/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev…
Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL…
Removed: trunk/reactos/win32ss/user/winsrv/api.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/api.h?…
Copied: trunk/reactos/win32ss/user/winsrv/consrv.cmake (from r59454, trunk/reactos/win32ss/user/consrv/CMakeLists.txt) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Removed: trunk/reactos/win32ss/user/winsrv/consrv/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/api.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Removed: trunk/reactos/win32ss/user/winsrv/consrv/conio.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Removed: trunk/reactos/win32ss/user/winsrv/consrv/consrv.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/heap.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Copied: trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h (from r59454, trunk/reactos/win32ss/user/consrv/conio.h) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/console.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
Removed: trunk/reactos/win32ss/user/winsrv/harderror.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/harder…
Modified: trunk/reactos/win32ss/user/winsrv/init.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c…
Removed: trunk/reactos/win32ss/user/winsrv/register.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/regist…
Removed: trunk/reactos/win32ss/user/winsrv/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/resour…
Removed: trunk/reactos/win32ss/user/winsrv/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/rsrc.r…
Removed: trunk/reactos/win32ss/user/winsrv/shutdown.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/shutdo…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv.cmake (from r59454, trunk/reactos/win32ss/user/winsrv/CMakeLists.txt) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/api.h (from r59454, trunk/reactos/win32ss/user/winsrv/api.h) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c (from r59454, trunk/reactos/win32ss/user/winsrv/harderror.c) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/init.c (from r59454, trunk/reactos/win32ss/user/winsrv/init.c) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/register.c (from r59454, trunk/reactos/win32ss/user/winsrv/register.c) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/resource.h (from r59454, trunk/reactos/win32ss/user/winsrv/resource.h) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c (from r59454, trunk/reactos/win32ss/user/winsrv/shutdown.c) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h (from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.h) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Copied: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.rc (from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.rc) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
Removed: trunk/reactos/win32ss/user/winsrv/winsrv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv…
Modified: trunk/reactos/win32ss/user/winsrv/winsrv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv…
Modified: trunk/reactos/win32ss/user/winsrv/winsrv.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv…
11 years, 5 months
1
0
0
0
[aandrejevic] 59460: [NTVDM] Implement the IOCTL command in VDM DOS. Rewrite the BIOS video pages support to use only one console buffer (not yet complete). Fix the BIOS video mode table and severa...
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Sat Jul 13 01:56:36 2013 New Revision: 59460 URL:
http://svn.reactos.org/svn/reactos?rev=59460&view=rev
Log: [NTVDM] Implement the IOCTL command in VDM DOS. Rewrite the BIOS video pages support to use only one console buffer (not yet complete). Fix the BIOS video mode table and several bugs in video functions. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r…
============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Jul 13 01:56:36 2013 @@ -26,58 +26,46 @@ static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; static BYTE CurrentVideoMode = BIOS_DEFAULT_VIDEO_MODE; static BYTE CurrentVideoPage = 0; -static HANDLE ConsoleBuffers[BIOS_MAX_PAGES] = { NULL }; -static LPVOID ConsoleFramebuffers[BIOS_MAX_PAGES] = { NULL }; -static HANDLE ConsoleMutexes[BIOS_MAX_PAGES] = { NULL }; +static COORD BiosCursorPositions[BIOS_MAX_PAGES]; +static HANDLE BiosGraphicsOutput = NULL; +static LPVOID ConsoleFramebuffer = NULL; +static HANDLE ConsoleMutex = NULL; static BOOLEAN VideoNeedsUpdate = TRUE; static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; static VIDEO_MODE VideoModes[] = { - /* Width | Height | Text | Colors | Gray | Pages | Segment */ + /* Width | Height | Text | Bpp | Gray | Pages | Segment */ { 40, 25, TRUE, 16, TRUE, 8, 0xB800}, /* Mode 00h */ { 40, 25, TRUE, 16, FALSE, 8, 0xB800}, /* Mode 01h */ { 80, 25, TRUE, 16, TRUE, 8, 0xB800}, /* Mode 02h */ { 80, 25, TRUE, 16, FALSE, 8, 0xB800}, /* Mode 03h */ - { 320, 200, FALSE, 4, FALSE, 4, 0xB800}, /* Mode 04h */ - { 320, 200, FALSE, 4, TRUE, 4, 0xB800}, /* Mode 05h */ - { 640, 200, FALSE, 2, FALSE, 2, 0xB800}, /* Mode 06h */ - { 80, 25, TRUE, 3, FALSE, 1, 0xB000}, /* Mode 07h */ + { 320, 200, FALSE, 2, FALSE, 1, 0xB800}, /* Mode 04h */ + { 320, 200, FALSE, 2, TRUE, 1, 0xB800}, /* Mode 05h */ + { 640, 200, FALSE, 1, FALSE, 1, 0xB800}, /* Mode 06h */ + { 80, 25, TRUE, 8, FALSE, 1, 0xB000}, /* Mode 07h */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 08h - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 09h - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Ah - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Bh - not used */ { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Ch - not used */ - { 320, 200, FALSE, 16, FALSE, 8, 0xA000}, /* Mode 0Dh */ - { 640, 200, FALSE, 16, FALSE, 4, 0xA000}, /* Mode 0Eh */ - { 640, 350, FALSE, 3, FALSE, 2, 0xA000}, /* Mode 0Fh */ - { 640, 350, FALSE, 4, FALSE, 2, 0xA000}, /* Mode 10h */ - { 640, 480, FALSE, 2, FALSE, 1, 0xA000}, /* Mode 11h */ - { 640, 480, FALSE, 16, FALSE, 1, 0xA000}, /* Mode 12h */ - { 640, 480, FALSE, 256, FALSE, 1, 0xA000} /* Mode 13h */ + { 320, 200, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 0Dh */ + { 640, 200, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 0Eh */ + { 640, 350, FALSE, 1, FALSE, 1, 0xA000}, /* Mode 0Fh */ + { 640, 350, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 10h */ + { 640, 480, FALSE, 1, FALSE, 1, 0xA000}, /* Mode 11h */ + { 640, 480, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 12h */ + { 320, 200, FALSE, 8, FALSE, 1, 0xA000} /* Mode 13h */ }; /* PRIVATE FUNCTIONS **********************************************************/ - -static INT BiosColorNumberToBits(DWORD Colors) -{ - INT i; - - /* Find the index of the highest-order bit */ - for (i = 31; i >= 0; i--) if (Colors & (1 << i)) break; - - /* Special case for zero */ - if (i == 0) i = 32; - - return i; -} static DWORD BiosGetVideoPageSize() { INT i; DWORD BufferSize = VideoModes[CurrentVideoMode].Width * VideoModes[CurrentVideoMode].Height - * BiosColorNumberToBits(VideoModes[CurrentVideoMode].Colors) + * VideoModes[CurrentVideoMode].Bpp / 8; for (i = 0; i < 32; i++) if ((1 << i) >= BufferSize) break; @@ -87,16 +75,15 @@ static BYTE BiosVideoAddressToPage(ULONG Address) { - return (Address - (VideoModes[CurrentVideoMode].Segment << 4)) + return (Address - BiosGetVideoMemoryStart()) / BiosGetVideoPageSize(); } static COORD BiosVideoAddressToCoord(ULONG Address) { COORD Result = {0, 0}; - INT BitsPerPixel; - BYTE PageStart = BiosVideoAddressToPage(Address) * BiosGetVideoPageSize(); - DWORD Offset = Address - (VideoModes[CurrentVideoMode].Segment << 4) - PageStart; + DWORD PageStart = BiosVideoAddressToPage(Address) * BiosGetVideoPageSize(); + DWORD Offset = Address - BiosGetVideoMemoryStart() - PageStart; if (VideoModes[CurrentVideoMode].Text) { @@ -105,11 +92,9 @@ } else { - BitsPerPixel = BiosColorNumberToBits(VideoModes[CurrentVideoMode].Colors); - - Result.X = ((Offset * 8) / BitsPerPixel) + Result.X = ((Offset * 8) / VideoModes[CurrentVideoMode].Bpp) % VideoModes[CurrentVideoMode].Width; - Result.Y = ((Offset * 8) / BitsPerPixel) + Result.Y = ((Offset * 8) / VideoModes[CurrentVideoMode].Bpp) / VideoModes[CurrentVideoMode].Width; } @@ -157,127 +142,166 @@ return TRUE; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -BYTE BiosGetVideoMode() -{ - return CurrentVideoMode; -} - -BOOLEAN BiosSetVideoMode(BYTE ModeNumber) +static BOOLEAN BiosCreateGraphicsBuffer(BYTE ModeNumber) { INT i; - COORD Coord; CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; LPBITMAPINFO BitmapInfo; LPWORD PaletteIndex; + /* Allocate a bitmap info structure */ + BitmapInfo = (LPBITMAPINFO)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(BITMAPINFOHEADER) + + (1 << VideoModes[ModeNumber].Bpp) + * sizeof(WORD)); + if (BitmapInfo == NULL) return FALSE; + + /* Fill the bitmap info header */ + ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); + BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + BitmapInfo->bmiHeader.biWidth = VideoModes[ModeNumber].Width; + BitmapInfo->bmiHeader.biHeight = VideoModes[ModeNumber].Height; + BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biCompression = BI_RGB; + BitmapInfo->bmiHeader.biBitCount = VideoModes[ModeNumber].Bpp; + + /* Calculate the image size */ + BitmapInfo->bmiHeader.biSizeImage = BitmapInfo->bmiHeader.biWidth + * BitmapInfo->bmiHeader.biHeight + * (BitmapInfo->bmiHeader.biBitCount >> 3); + + /* Fill the palette data */ + PaletteIndex = (LPWORD)((ULONG_PTR)BitmapInfo + sizeof(BITMAPINFOHEADER)); + for (i = 0; i < (1 << VideoModes[ModeNumber].Bpp); i++) + { + PaletteIndex[i] = i; + } + + /* Fill the console graphics buffer info */ + GraphicsBufferInfo.dwBitMapInfoLength = sizeof(BITMAPINFOHEADER) + + (1 << VideoModes[ModeNumber].Bpp) + * sizeof(WORD); + GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; + GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; + + /* Create the buffer */ + BiosGraphicsOutput = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + CONSOLE_GRAPHICS_BUFFER, + &GraphicsBufferInfo); + + /* Save the framebuffer address and mutex */ + ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; + ConsoleMutex = GraphicsBufferInfo.hMutex; + + /* Free the bitmap information */ + HeapFree(GetProcessHeap(), 0, BitmapInfo); + + return TRUE; +} + +static VOID BiosDestroyGraphicsBuffer() +{ + CloseHandle(ConsoleMutex); + CloseHandle(BiosGraphicsOutput); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE BiosGetVideoMode() +{ + return CurrentVideoMode; +} + +BOOLEAN BiosSetVideoMode(BYTE ModeNumber) +{ + COORD Coord; + /* Make sure this is a valid video mode */ if (ModeNumber > BIOS_MAX_VIDEO_MODE) return FALSE; if (VideoModes[ModeNumber].Pages == 0) return FALSE; - /* Free the current buffers */ - for (i = 0; i < VideoModes[CurrentVideoMode].Pages; i++) - { - if (ConsoleBuffers[i] != NULL) CloseHandle(ConsoleBuffers[i]); - if (!VideoModes[CurrentVideoMode].Text) CloseHandle(ConsoleMutexes[i]); - } - - if (VideoModes[ModeNumber].Text) - { - /* Page 0 is CONOUT$ */ - ConsoleBuffers[0] = CreateFile(TEXT("CONOUT$"), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - - /* Set the current page to page 0 */ - CurrentVideoPage = 0; - - /* Create console buffers for other pages */ - for (i = 1; i < VideoModes[ModeNumber].Pages; i++) - { - ConsoleBuffers[i] = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - CONSOLE_TEXTMODE_BUFFER, - NULL); - } - - /* Set the size for the buffers */ - for (i = 0; i < VideoModes[ModeNumber].Pages; i++) - { - Coord.X = VideoModes[ModeNumber].Width; - Coord.Y = VideoModes[ModeNumber].Height; - - SetConsoleScreenBufferSize(ConsoleBuffers[i], Coord); - } - } - else - { - /* Allocate a bitmap info structure */ - BitmapInfo = (LPBITMAPINFO)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(BITMAPINFOHEADER) - + VideoModes[ModeNumber].Colors - * sizeof(WORD)); - if (BitmapInfo == NULL) return FALSE; - - /* Fill the bitmap info header */ - ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); - BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = VideoModes[ModeNumber].Width; - BitmapInfo->bmiHeader.biHeight = VideoModes[ModeNumber].Height; - BitmapInfo->bmiHeader.biPlanes = 1; - BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biBitCount = BiosColorNumberToBits(VideoModes[ModeNumber].Colors); - - /* Calculate the image size */ - BitmapInfo->bmiHeader.biSizeImage = BitmapInfo->bmiHeader.biWidth - * BitmapInfo->bmiHeader.biHeight - * (BitmapInfo->bmiHeader.biBitCount >> 3); - - /* Fill the palette data */ - PaletteIndex = (LPWORD)((ULONG_PTR)BitmapInfo + sizeof(BITMAPINFOHEADER)); - for (i = 0; i < VideoModes[ModeNumber].Colors; i++) - { - PaletteIndex[i] = i; - } - - /* Create a console buffer for each page */ - for (i = 0; i < VideoModes[ModeNumber].Pages; i++) - { - /* Fill the console graphics buffer info */ - GraphicsBufferInfo.dwBitMapInfoLength = sizeof(BITMAPINFOHEADER) - + VideoModes[ModeNumber].Colors - * sizeof(WORD); - GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; - GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; - - /* Create the buffer */ - ConsoleBuffers[i] = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - CONSOLE_GRAPHICS_BUFFER, - &GraphicsBufferInfo); - - /* Save the framebuffer address and mutex */ - ConsoleFramebuffers[i] = GraphicsBufferInfo.lpBitMap; - ConsoleMutexes[i] = GraphicsBufferInfo.hMutex; - } - - /* Free the bitmap information */ - HeapFree(GetProcessHeap(), 0, BitmapInfo); - } - - /* Set the active page console buffer */ - SetConsoleActiveScreenBuffer(ConsoleBuffers[CurrentVideoPage]); - - /* Update the mode number */ + /* Set the new video mode size */ + Coord.X = VideoModes[ModeNumber].Width; + Coord.Y = VideoModes[ModeNumber].Height; + + if (VideoModes[ModeNumber].Text && VideoModes[CurrentVideoMode].Text) + { + /* Switching from text mode to another text mode */ + + /* Resize the text buffer */ + SetConsoleScreenBufferSize(BiosConsoleOutput, Coord); + } + else if (VideoModes[ModeNumber].Text && !VideoModes[CurrentVideoMode].Text) + { + /* Switching from graphics mode to text mode */ + + /* Resize the text buffer */ + SetConsoleScreenBufferSize(BiosConsoleOutput, Coord); + + /* Change the active screen buffer to the text buffer */ + SetConsoleActiveScreenBuffer(BiosConsoleOutput); + + /* Cleanup the graphics buffer */ + BiosDestroyGraphicsBuffer(); + } + else if (!VideoModes[ModeNumber].Text && VideoModes[CurrentVideoMode].Text) + { + /* Switching from text mode to graphics mode */ + if (!BiosCreateGraphicsBuffer(ModeNumber)) return FALSE; + + SetConsoleActiveScreenBuffer(BiosGraphicsOutput); + } + else if (!VideoModes[ModeNumber].Text && !VideoModes[CurrentVideoMode].Text) + { + /* Switching from graphics mode to another graphics mode */ + + /* Temporarily switch to the text mode buffer */ + SetConsoleActiveScreenBuffer(BiosConsoleOutput); + + /* Cleanup the current graphics mode buffer */ + BiosDestroyGraphicsBuffer(); + + /* Create a new graphics mode buffer */ + if (!BiosCreateGraphicsBuffer(ModeNumber)) return FALSE; + + /* Switch to it */ + SetConsoleActiveScreenBuffer(BiosGraphicsOutput); + } + + /* Set the video mode */ CurrentVideoMode = ModeNumber; + + return TRUE; +} + +BOOLEAN BiosSetVideoPage(BYTE PageNumber) +{ + ULONG PageStart; + CONSOLE_SCREEN_BUFFER_INFO BufferInfo; + + /* Make sure this is a valid page number */ + if (PageNumber >= VideoModes[CurrentVideoMode].Pages) return FALSE; + + /* Save the current console buffer in the video memory */ + PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); + BiosUpdateVideoMemory(PageStart, PageStart + BiosGetVideoPageSize()); + + /* Save the cursor */ + if (!GetConsoleScreenBufferInfo(BiosConsoleOutput, &BufferInfo)) return FALSE; + BiosCursorPositions[CurrentVideoPage] = BufferInfo.dwCursorPosition; + + /* Set the page */ + CurrentVideoPage = PageNumber; + + /* Update the console */ + PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); + BiosUpdateConsole(PageStart, PageStart + BiosGetVideoPageSize()); + + /* Set the cursor */ + SetConsoleCursorPosition(BiosConsoleOutput, BiosCursorPositions[PageNumber]); return TRUE; } @@ -296,8 +320,7 @@ if (!VideoNeedsUpdate) return; /* Redraw the screen */ - InvalidateConsoleDIBits(ConsoleBuffers[CurrentVideoPage], - &UpdateRectangle); + InvalidateConsoleDIBits(BiosGraphicsOutput, &UpdateRectangle); /* Clear the update flag */ VideoNeedsUpdate = FALSE; @@ -363,6 +386,10 @@ { return FALSE; } + + /* Store the cursor position */ + ZeroMemory(&BiosCursorPositions, sizeof(BiosCursorPositions)); + BiosCursorPositions[0] = BiosSavedBufferInfo.dwCursorPosition; /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); @@ -399,20 +426,14 @@ VOID BiosCleanup() { - INT i; - /* Restore the old screen buffer */ SetConsoleActiveScreenBuffer(BiosConsoleOutput); /* Restore the screen buffer size */ SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); - /* Free the buffers */ - for (i = 0; i < VideoModes[CurrentVideoMode].Pages; i++) - { - if (ConsoleBuffers[i] != NULL) CloseHandle(ConsoleBuffers[i]); - if (!VideoModes[CurrentVideoMode].Text) CloseHandle(ConsoleMutexes[i]); - } + /* Free the graphics buffer */ + if (!VideoModes[CurrentVideoMode].Text) BiosDestroyGraphicsBuffer(); /* Close the console handles */ if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); @@ -423,7 +444,6 @@ { ULONG i; COORD Coordinates; - BYTE Page; COORD Origin = { 0, 0 }; COORD UnitSize = { 1, 1 }; CHAR_INFO Character; @@ -440,11 +460,8 @@ /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); - /* Get the page number */ - Page = BiosVideoAddressToPage(i); - - /* Make sure the page is valid */ - if (Page >= VideoModes[CurrentVideoMode].Pages) continue; + /* Make sure this is the current page */ + if (BiosVideoAddressToPage(i) != CurrentVideoPage) continue; /* Fill the rectangle structure */ Rect.Left = Coordinates.X; @@ -457,7 +474,7 @@ Character.Attributes = *((PBYTE)((ULONG_PTR)BaseAddress + i + 1)); /* Write the character */ - WriteConsoleOutputA(ConsoleBuffers[Page], + WriteConsoleOutputA(BiosConsoleOutput, &Character, UnitSize, Origin, @@ -467,16 +484,16 @@ else { /* Wait for the mutex object */ - WaitForSingleObject(ConsoleMutexes[CurrentVideoPage], INFINITE); + WaitForSingleObject(ConsoleMutex, INFINITE); /* Copy the data to the framebuffer */ - RtlCopyMemory((LPVOID)((ULONG_PTR)ConsoleFramebuffers[CurrentVideoPage] + RtlCopyMemory((LPVOID)((ULONG_PTR)ConsoleFramebuffer + StartAddress - BiosGetVideoMemoryStart()), (LPVOID)((ULONG_PTR)BaseAddress + StartAddress), EndAddress - StartAddress); /* Release the mutex */ - ReleaseMutex(ConsoleMutexes[CurrentVideoPage]); + ReleaseMutex(ConsoleMutex); /* Check if this is the first time the rectangle is updated */ if (!VideoNeedsUpdate) @@ -507,7 +524,6 @@ { ULONG i; COORD Coordinates; - BYTE Page; WORD Attribute; DWORD CharsWritten; @@ -519,17 +535,14 @@ /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); - /* Get the page number */ - Page = BiosVideoAddressToPage(i); - - /* Make sure the page is valid */ - if (Page >= VideoModes[CurrentVideoMode].Pages) continue; + /* Make sure this is the current page */ + if (BiosVideoAddressToPage(i) != CurrentVideoPage) continue; /* Check if this is a character byte or an attribute byte */ - if ((i - (VideoModes[CurrentVideoMode].Segment << 4)) % 2 == 0) + if ((i - BiosGetVideoMemoryStart()) % 2 == 0) { /* This is a regular character */ - ReadConsoleOutputCharacterA(ConsoleBuffers[Page], + ReadConsoleOutputCharacterA(BiosConsoleOutput, (LPSTR)((ULONG_PTR)BaseAddress + i), sizeof(CHAR), Coordinates, @@ -538,7 +551,7 @@ else { /* This is an attribute */ - ReadConsoleOutputAttribute(ConsoleBuffers[Page], + ReadConsoleOutputAttribute(BiosConsoleOutput, &Attribute, sizeof(CHAR), Coordinates, @@ -551,16 +564,16 @@ else { /* Wait for the mutex object */ - WaitForSingleObject(ConsoleMutexes[CurrentVideoPage], INFINITE); + WaitForSingleObject(ConsoleMutex, INFINITE); /* Copy the data to the emulator memory */ RtlCopyMemory((LPVOID)((ULONG_PTR)BaseAddress + StartAddress), - (LPVOID)((ULONG_PTR)ConsoleFramebuffers[CurrentVideoPage] + (LPVOID)((ULONG_PTR)ConsoleFramebuffer + StartAddress - BiosGetVideoMemoryStart()), EndAddress - StartAddress); /* Release the mutex */ - ReleaseMutex(ConsoleMutexes[CurrentVideoPage]); + ReleaseMutex(ConsoleMutex); } } @@ -627,6 +640,7 @@ DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); + // TODO: Add support for multiple pages! switch (HIBYTE(Eax)) { /* Set Video Mode */ @@ -648,7 +662,7 @@ /* Set the cursor */ CursorInfo.dwSize = (CursorHeight * 100) / CONSOLE_FONT_HEIGHT; CursorInfo.bVisible = !Invisible; - SetConsoleCursorInfo(ConsoleBuffers[CurrentVideoPage], &CursorInfo); + SetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); break; } @@ -662,7 +676,15 @@ Position.X = LOBYTE(Edx); Position.Y = HIBYTE(Edx); - SetConsoleCursorPosition(ConsoleBuffers[HIBYTE(Ebx)], Position); + BiosCursorPositions[HIBYTE(Ebx)] = Position; + + /* Check if this is the current video page */ + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Yes, change the actual cursor */ + SetConsoleCursorPosition(BiosConsoleOutput, Position); + } + break; } @@ -675,9 +697,7 @@ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; /* Retrieve the data */ - GetConsoleCursorInfo(ConsoleBuffers[HIBYTE(Ebx)], &CursorInfo); - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); + GetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); /* Find the first line */ StartLine = 32 - ((CursorInfo.dwSize * 32) / 100); @@ -686,8 +706,8 @@ EmulatorSetRegister(EMULATOR_REG_AX, 0); EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); EmulatorSetRegister(EMULATOR_REG_DX, - LOWORD(ScreenBufferInfo.dwCursorPosition.Y) << 8 - || LOWORD(ScreenBufferInfo.dwCursorPosition.X)); + (LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].Y) << 8) + | LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].X)); break; } @@ -701,14 +721,7 @@ if (LOBYTE(Eax) == CurrentVideoPage) break; /* Change the video page */ - CurrentVideoPage = LOBYTE(Eax); - - /* Set the active page console buffer */ - SetConsoleActiveScreenBuffer(ConsoleBuffers[CurrentVideoPage]); - - /* Restore the cursor to (0, 0) */ - Position.X = Position.Y = 0; - SetConsoleCursorPosition(BiosConsoleOutput, Position); + BiosSetVideoPage(LOBYTE(Eax)); break; } @@ -724,10 +737,11 @@ Character.Char.UnicodeChar = L' '; Character.Attributes = HIBYTE(Ebx); Position.X = Rect.Left; + if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); else Position.Y = Rect.Top + LOBYTE(Eax); - ScrollConsoleScreenBuffer(ConsoleBuffers[CurrentVideoPage], + ScrollConsoleScreenBuffer(BiosConsoleOutput, &Rect, &Rect, Position, @@ -743,25 +757,32 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Get the cursor position */ - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); - - /* Read at cursor position */ - Rect.Left = ScreenBufferInfo.dwCursorPosition.X; - Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Get the cursor position */ + GetConsoleScreenBufferInfo(BiosConsoleOutput, + &ScreenBufferInfo); + + /* Read at cursor position */ + Rect.Left = ScreenBufferInfo.dwCursorPosition.X; + Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; - /* Read the console output */ - ReadConsoleOutput(ConsoleBuffers[HIBYTE(Ebx)], - &Character, - BufferSize, - Origin, - &Rect); - - /* Return the result */ - EmulatorSetRegister(EMULATOR_REG_AX, - (LOBYTE(Character.Attributes) << 8) - | Character.Char.AsciiChar); + /* Read the console output */ + ReadConsoleOutput(BiosConsoleOutput, + &Character, + BufferSize, + Origin, + &Rect); + + /* Return the result */ + EmulatorSetRegister(EMULATOR_REG_AX, + (LOBYTE(Character.Attributes) << 8) + | Character.Char.AsciiChar); + } + else + { + // TODO: NOT IMPLEMENTED + } break; } @@ -774,23 +795,30 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Get the cursor position */ - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); - - /* Write the attribute to the output */ - FillConsoleOutputAttribute(ConsoleBuffers[HIBYTE(Ebx)], - LOBYTE(Ebx), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(ConsoleBuffers[HIBYTE(Ebx)], - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Get the cursor position */ + GetConsoleScreenBufferInfo(BiosConsoleOutput, + &ScreenBufferInfo); + + /* Write the attribute to the output */ + FillConsoleOutputAttribute(BiosConsoleOutput, + LOBYTE(Ebx), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + + /* Write the character to the output */ + FillConsoleOutputCharacterA(BiosConsoleOutput, + LOBYTE(Eax), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + } + else + { + // TODO: NOT IMPLEMENTED + } break; } @@ -803,16 +831,22 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Get the cursor position */ - GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], - &ScreenBufferInfo); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(ConsoleBuffers[HIBYTE(Ebx)], - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); + if (HIBYTE(Ebx) == CurrentVideoPage) + { + /* Get the cursor position */ + GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); + + /* Write the character to the output */ + FillConsoleOutputCharacterA(BiosConsoleOutput, + LOBYTE(Eax), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + } + else + { + // TODO: NOT IMPLEMENTED + } break; } @@ -827,10 +861,10 @@ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; /* Set the attribute */ - SetConsoleTextAttribute(ConsoleBuffers[HIBYTE(Ebx)], LOBYTE(Ebx)); + SetConsoleTextAttribute(BiosConsoleOutput, LOBYTE(Ebx)); /* Write the character */ - WriteConsoleA(ConsoleBuffers[HIBYTE(Ebx)], + WriteConsoleA(BiosConsoleOutput, &Character, sizeof(CHAR), &NumWritten, Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r…
============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sat Jul 13 01:56:36 2013 @@ -38,7 +38,7 @@ DWORD Width; DWORD Height; BOOLEAN Text; - DWORD Colors; + BYTE Bpp; BOOLEAN Gray; BYTE Pages; WORD Segment; Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re…
============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sat Jul 13 01:56:36 2013 @@ -906,6 +906,56 @@ DosWriteFile(DOS_OUTPUT_HANDLE, &Character, sizeof(CHAR), &BytesWritten); } +VOID DosHandleIoctl(BYTE ControlCode, WORD FileHandle) +{ + HANDLE Handle = DosGetRealHandle(FileHandle); + + if (Handle == INVALID_HANDLE_VALUE) + { + /* Doesn't exist */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_FILE_NOT_FOUND); + } + + switch (ControlCode) + { + /* Get Device Information */ + case 0x00: + { + WORD InfoWord = 0; + + if (Handle == DosSystemFileTable[0]) + { + /* Console input */ + InfoWord |= 1 << 0; + } + else if (Handle == DosSystemFileTable[1]) + { + /* Console output */ + InfoWord |= 1 << 1; + } + + /* It is a character device */ + InfoWord |= 1 << 7; + + /* Return the device information word */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_DX, InfoWord); + + break; + } + + /* Unsupported control code */ + default: + { + DPRINT1("Unsupported IOCTL: 0x%02X\n", ControlCode); + + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); + } + } +} + VOID DosInt20h(WORD CodeSegment) { /* This is the exit interrupt */ @@ -1326,6 +1376,14 @@ break; } + /* IOCTL */ + case 0x44: + { + DosHandleIoctl(LOBYTE(Eax), LOWORD(Ebx)); + + break; + } + /* Allocate Memory */ case 0x48: {
11 years, 5 months
1
0
0
0
[hbelusca] 59459: [KERNEL32] CreateEvent --> NtCreateEvent --> NotificationEvent or SynchronizationEvent (contrary to CreateTimer --> NtCreateTimer).
by hbelusca@svn.reactos.org
Author: hbelusca Date: Fri Jul 12 22:27:12 2013 New Revision: 59459 URL:
http://svn.reactos.org/svn/reactos?rev=59459&view=rev
Log: [KERNEL32] CreateEvent --> NtCreateEvent --> NotificationEvent or SynchronizationEvent (contrary to CreateTimer --> NtCreateTimer). Modified: trunk/reactos/dll/win32/kernel32/client/synch.c Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Fri Jul 12 22:27:12 2013 @@ -590,7 +590,7 @@ CreateNtObjectFromWin32Api(Event, Event, EVENT, lpEventAttributes, lpName, - bManualReset ? NotificationTimer : SynchronizationTimer, + bManualReset ? NotificationEvent : SynchronizationEvent, bInitialState); }
11 years, 5 months
1
0
0
0
[pschweitzer] 59458: [CONFIGURE.SH] Fix formatting
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Fri Jul 12 10:13:45 2013 New Revision: 59458 URL:
http://svn.reactos.org/svn/reactos?rev=59458&view=rev
Log: [CONFIGURE.SH] Fix formatting Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59458&r1=…
============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Fri Jul 12 10:13:45 2013 @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$ROS_ARCH" = "x" ]; then - echo Could not detect RosBE. - exit 1 + echo Could not detect RosBE. + exit 1 fi BUILD_ENVIRONMENT=MinGW @@ -11,8 +11,8 @@ REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH usage() { -echo Invalid parameter given. -exit 1 + echo Invalid parameter given. + exit 1 } CMAKE_GENERATOR="Ninja" @@ -41,9 +41,9 @@ done if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then - echo Creating directories in $REACTOS_OUTPUT_PATH - mkdir -p "$REACTOS_OUTPUT_PATH" - cd "$REACTOS_OUTPUT_PATH" + echo Creating directories in $REACTOS_OUTPUT_PATH + mkdir -p "$REACTOS_OUTPUT_PATH" + cd "$REACTOS_OUTPUT_PATH" fi mkdir -p host-tools reactos
11 years, 5 months
1
0
0
0
[pschweitzer] 59457: [CONFIGURE.SH] Kill bashisms introduced by r59197 and replace them by sh code. This is mainly to preserve maximum portability of the code, and to fix configure.sh on platforms ...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Fri Jul 12 10:10:23 2013 New Revision: 59457 URL:
http://svn.reactos.org/svn/reactos?rev=59457&view=rev
Log: [CONFIGURE.SH] Kill bashisms introduced by r59197 and replace them by sh code. This is mainly to preserve maximum portability of the code, and to fix configure.sh on platforms where /bin/sh doesn't point to /bin/sh ;-). Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59457&r1=…
============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Fri Jul 12 10:10:23 2013 @@ -16,19 +16,19 @@ } CMAKE_GENERATOR="Ninja" -for (( i=1; i<=$#; i++ )); do - case ${!i} in +while [ $# -gt 0 ]; do + case $1 in -D) - ((i++)) - if [[ "x${!i}" == x?*=* ]] ; then - ROS_CMAKEOPTS+=" -D ${!i}" + shift + if echo "x$1" | grep 'x?*=*' > /dev/null; then + ROS_CMAKEOPTS+=" -D $1" else usage fi ;; - -D?*=*) - ROS_CMAKEOPTS+=" ${!i}" + -D?*=*|-D?*) + ROS_CMAKEOPTS+=" $1" ;; makefiles|Makefiles) CMAKE_GENERATOR="Unix Makefiles" @@ -36,6 +36,8 @@ *) usage esac + + shift done if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
11 years, 5 months
1
0
0
0
[ekohl] 59456: [SAMSRV] SamrChangePasswordUser: Update the PasswordLastSet time after a new password has been set.
by ekohl@svn.reactos.org
Author: ekohl Date: Wed Jul 10 23:04:49 2013 New Revision: 59456 URL:
http://svn.reactos.org/svn/reactos?rev=59456&view=rev
Log: [SAMSRV] SamrChangePasswordUser: Update the PasswordLastSet time after a new password has been set. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?…
============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed Jul 10 23:04:49 2013 @@ -7477,6 +7477,7 @@ PENCRYPTED_NT_OWF_PASSWORD NewNtPassword; PSAM_DB_OBJECT UserObject; ULONG Length; + SAM_USER_FIXED_DATA FixedUserData; NTSTATUS Status; TRACE("(%p %u %p %p %u %p %p %u %p %u %p)\n", @@ -7585,6 +7586,28 @@ NtPresent, NewLmPassword, LmPresent); + if (NT_SUCCESS(Status)) + { + /* Get the fixed size user data */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + &FixedUserData, + &Length); + if (NT_SUCCESS(Status)) + { + /* Update PasswordLastSet */ + NtQuerySystemTime(&FixedUserData.PasswordLastSet); + + /* Set the fixed size user data */ + Status = SampSetObjectAttribute(UserObject, + L"F", + REG_BINARY, + &FixedUserData, + Length); + } + } } return Status;
11 years, 5 months
1
0
0
0
[hbelusca] 59455: Remove an unneccesary commented definition of RegOpenCurrentUser.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Jul 10 22:28:29 2013 New Revision: 59455 URL:
http://svn.reactos.org/svn/reactos?rev=59455&view=rev
Log: Remove an unneccesary commented definition of RegOpenCurrentUser. Modified: trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/power.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c…
============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Wed Jul 10 22:28:29 2013 @@ -15,13 +15,6 @@ #include <winreg.h> #include <powrprof.h> -/* - LONG WINAPI RegOpenCurrentUser(REGSAM a,PHKEY b) - { - *b = HKEY_CURRENT_USER; - return ERROR_SUCCESS; - } - */ unsigned int g_NumPwrSchemes = 0; unsigned int g_NumPwrSchemesEnumerated = 0; unsigned int g_ActivePwrScheme = 3;
11 years, 5 months
1
0
0
0
[aandrejevic] 59454: [NTVDM] Add video pages support to INT 10h functions and memory access. [SOFTX86] Fix the opcode check for XLAT.
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Wed Jul 10 19:41:43 2013 New Revision: 59454 URL:
http://svn.reactos.org/svn/reactos?rev=59454&view=rev
Log: [NTVDM] Add video pages support to INT 10h functions and memory access. [SOFTX86] Fix the opcode check for XLAT. Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/mov.c branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/mov.c URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/softx86/soft…
============================================================================== --- branches/ntvdm/lib/3rdparty/softx86/softx86/mov.c [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/softx86/softx86/mov.c [iso-8859-1] Wed Jul 10 19:41:43 2013 @@ -219,7 +219,7 @@ else seg = ctx->state->segment_override; - if ((opcode&0xFC) == 0xD7) { // MOV reg,reg/mem or reg/mem,reg + if (opcode == 0xD7) { // MOV reg,reg/mem or reg/mem,reg sx86_ubyte d; sx86_udword ofs; @@ -239,7 +239,7 @@ int Sfx86OpcodeDec_xlat(sx86_ubyte opcode,softx86_ctx* ctx,char buf[128]) { - if ((opcode&0xFC) == 0xD7) { // XLAT + if (opcode == 0xD7) { // XLAT strcpy(buf,"XLAT"); return 1; } Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r…
============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Wed Jul 10 19:41:43 2013 @@ -72,11 +72,31 @@ return i; } +static DWORD BiosGetVideoPageSize() +{ + INT i; + DWORD BufferSize = VideoModes[CurrentVideoMode].Width + * VideoModes[CurrentVideoMode].Height + * BiosColorNumberToBits(VideoModes[CurrentVideoMode].Colors) + / 8; + + for (i = 0; i < 32; i++) if ((1 << i) >= BufferSize) break; + + return 1 << i; +} + +static BYTE BiosVideoAddressToPage(ULONG Address) +{ + return (Address - (VideoModes[CurrentVideoMode].Segment << 4)) + / BiosGetVideoPageSize(); +} + static COORD BiosVideoAddressToCoord(ULONG Address) { COORD Result = {0, 0}; INT BitsPerPixel; - DWORD Offset = Address - (VideoModes[CurrentVideoMode].Segment << 4); + BYTE PageStart = BiosVideoAddressToPage(Address) * BiosGetVideoPageSize(); + DWORD Offset = Address - (VideoModes[CurrentVideoMode].Segment << 4) - PageStart; if (VideoModes[CurrentVideoMode].Text) { @@ -403,6 +423,7 @@ { ULONG i; COORD Coordinates; + BYTE Page; COORD Origin = { 0, 0 }; COORD UnitSize = { 1, 1 }; CHAR_INFO Character; @@ -418,6 +439,12 @@ { /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); + + /* Get the page number */ + Page = BiosVideoAddressToPage(i); + + /* Make sure the page is valid */ + if (Page >= VideoModes[CurrentVideoMode].Pages) continue; /* Fill the rectangle structure */ Rect.Left = Coordinates.X; @@ -430,7 +457,7 @@ Character.Attributes = *((PBYTE)((ULONG_PTR)BaseAddress + i + 1)); /* Write the character */ - WriteConsoleOutputA(BiosConsoleOutput, + WriteConsoleOutputA(ConsoleBuffers[Page], &Character, UnitSize, Origin, @@ -480,6 +507,7 @@ { ULONG i; COORD Coordinates; + BYTE Page; WORD Attribute; DWORD CharsWritten; @@ -490,12 +518,18 @@ { /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); + + /* Get the page number */ + Page = BiosVideoAddressToPage(i); + + /* Make sure the page is valid */ + if (Page >= VideoModes[CurrentVideoMode].Pages) continue; /* Check if this is a character byte or an attribute byte */ if ((i - (VideoModes[CurrentVideoMode].Segment << 4)) % 2 == 0) { /* This is a regular character */ - ReadConsoleOutputCharacterA(BiosConsoleOutput, + ReadConsoleOutputCharacterA(ConsoleBuffers[Page], (LPSTR)((ULONG_PTR)BaseAddress + i), sizeof(CHAR), Coordinates, @@ -504,7 +538,7 @@ else { /* This is an attribute */ - ReadConsoleOutputAttribute(BiosConsoleOutput, + ReadConsoleOutputAttribute(ConsoleBuffers[Page], &Attribute, sizeof(CHAR), Coordinates, @@ -614,7 +648,7 @@ /* Set the cursor */ CursorInfo.dwSize = (CursorHeight * 100) / CONSOLE_FONT_HEIGHT; CursorInfo.bVisible = !Invisible; - SetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); + SetConsoleCursorInfo(ConsoleBuffers[CurrentVideoPage], &CursorInfo); break; } @@ -622,10 +656,13 @@ /* Set Cursor Position */ case 0x02: { + /* Make sure the selected video page exists */ + if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; + Position.X = LOBYTE(Edx); Position.Y = HIBYTE(Edx); - SetConsoleCursorPosition(BiosConsoleOutput, Position); + SetConsoleCursorPosition(ConsoleBuffers[HIBYTE(Ebx)], Position); break; } @@ -634,9 +671,13 @@ { INT StartLine; + /* Make sure the selected video page exists */ + if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; + /* Retrieve the data */ - GetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); + GetConsoleCursorInfo(ConsoleBuffers[HIBYTE(Ebx)], &CursorInfo); + GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], + &ScreenBufferInfo); /* Find the first line */ StartLine = 32 - ((CursorInfo.dwSize * 32) / 100); @@ -647,6 +688,28 @@ EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(ScreenBufferInfo.dwCursorPosition.Y) << 8 || LOWORD(ScreenBufferInfo.dwCursorPosition.X)); + break; + } + + /* Select Active Display Page */ + case 0x05: + { + /* Check if the page exists */ + if (LOBYTE(Eax) >= VideoModes[CurrentVideoMode].Pages) break; + + /* Check if this is the same page */ + if (LOBYTE(Eax) == CurrentVideoPage) break; + + /* Change the video page */ + CurrentVideoPage = LOBYTE(Eax); + + /* Set the active page console buffer */ + SetConsoleActiveScreenBuffer(ConsoleBuffers[CurrentVideoPage]); + + /* Restore the cursor to (0, 0) */ + Position.X = Position.Y = 0; + SetConsoleCursorPosition(BiosConsoleOutput, Position); + break; } @@ -664,7 +727,7 @@ if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); else Position.Y = Rect.Top + LOBYTE(Eax); - ScrollConsoleScreenBuffer(BiosConsoleOutput, + ScrollConsoleScreenBuffer(ConsoleBuffers[CurrentVideoPage], &Rect, &Rect, Position, @@ -677,15 +740,23 @@ { COORD BufferSize = { 1, 1 }, Origin = { 0, 0 }; + /* Make sure the selected video page exists */ + if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; + /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); + GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], + &ScreenBufferInfo); /* Read at cursor position */ Rect.Left = ScreenBufferInfo.dwCursorPosition.X; Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; /* Read the console output */ - ReadConsoleOutput(BiosConsoleOutput, &Character, BufferSize, Origin, &Rect); + ReadConsoleOutput(ConsoleBuffers[HIBYTE(Ebx)], + &Character, + BufferSize, + Origin, + &Rect); /* Return the result */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -700,18 +771,22 @@ { DWORD CharsWritten; + /* Make sure the selected video page exists */ + if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; + /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); + GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], + &ScreenBufferInfo); /* Write the attribute to the output */ - FillConsoleOutputAttribute(BiosConsoleOutput, + FillConsoleOutputAttribute(ConsoleBuffers[HIBYTE(Ebx)], LOBYTE(Ebx), LOWORD(Ecx), ScreenBufferInfo.dwCursorPosition, &CharsWritten); /* Write the character to the output */ - FillConsoleOutputCharacterA(BiosConsoleOutput, + FillConsoleOutputCharacterA(ConsoleBuffers[HIBYTE(Ebx)], LOBYTE(Eax), LOWORD(Ecx), ScreenBufferInfo.dwCursorPosition, @@ -725,11 +800,15 @@ { DWORD CharsWritten; + /* Make sure the selected video page exists */ + if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; + /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); + GetConsoleScreenBufferInfo(ConsoleBuffers[HIBYTE(Ebx)], + &ScreenBufferInfo); /* Write the character to the output */ - FillConsoleOutputCharacterA(BiosConsoleOutput, + FillConsoleOutputCharacterA(ConsoleBuffers[HIBYTE(Ebx)], LOBYTE(Eax), LOWORD(Ecx), ScreenBufferInfo.dwCursorPosition,
11 years, 5 months
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Results per page:
10
25
50
100
200