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
December 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
308 discussions
Start a n
N
ew thread
[hbelusca] 61419: [NTVDM] - Fix palette setting for EGA modes, fixes Rescue-Rover menu colors amongst others. Some of the palettes were adapted (read: translated from DAC registers settings) from D...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Dec 25 21:40:18 2013 New Revision: 61419 URL:
http://svn.reactos.org/svn/reactos?rev=61419&view=rev
Log: [NTVDM] - Fix palette setting for EGA modes, fixes Rescue-Rover menu colors amongst others. Some of the palettes were adapted (read: translated from DAC registers settings) from DOSBox; and I've also used
http://www.brokenthorn.com/Resources/OSDevVid2.html
for some settings. This should be reviewed to fix / remove redundancies or errors. - Attempt to implement basic palette enablig/disabling flag (via AC palette regs). - I've introduced (commented) DbgPrint's for testing AC regs setting. I will remove them when everything is ok. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h 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 Dec 25 21:40:18 2013 @@ -41,7 +41,7 @@ /* * VGA Register Configurations for BIOS Video Modes - * The configurations come from DosBox. + * The configurations come from DOSBox. */ static VGA_REGISTERS VideoMode_40x25_text = { @@ -144,8 +144,10 @@ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} +// {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, +// 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00} }; static VGA_REGISTERS VideoMode_640x200_16color = @@ -165,8 +167,10 @@ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, /* AC Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} +// {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, +// 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00} }; static VGA_REGISTERS VideoMode_640x350_16color = @@ -279,7 +283,7 @@ }; // FIXME: Are they computable with the previous data ?? -// Values taken from DosBox +// Values taken from DOSBox. static WORD VideoModePageSize[BIOS_MAX_VIDEO_MODE + 1] = { 0x0800, 0x0800, 0x1000, 0x1000, @@ -288,6 +292,322 @@ 0x0000, 0x2000, 0x4000, 0x8000, 0x8000, 0xA000, 0xA000, 0x2000 }; + +/* + * BIOS Mode Palettes + * + * Many people have different versions of those palettes + * (e.g. DOSBox,
http://www.brokenthorn.com/Resources/OSDevVid2.html
, + * etc...) A choice should be made at some point. + */ + +// This is the same as EgaPalette__HiRes +static CONST COLORREF TextPalette[VGA_MAX_COLORS / 4] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), + RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), + + RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), + RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), + RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), + RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), + + + RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), + RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), + RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), + + RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), + RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; + +// Unused at the moment +static CONST COLORREF mtext_palette[64] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), + + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) +}; + +// Unused at the moment +static CONST COLORREF mtext_s3_palette[64] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), + + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), RGB(0xAA, 0xAA, 0xAA), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), + RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) +}; + +// Unused at the moment +static CONST COLORREF CgaPalette[16] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; + +// Unused at the moment +static CONST COLORREF CgaPalette2[VGA_MAX_COLORS / 4] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; + +static CONST COLORREF EgaPalette___16ColorFixed_DOSBox[VGA_MAX_COLORS / 4] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + + + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + + + + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + + + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; + +// This is the same as TextPalette +static CONST COLORREF EgaPalette__HiRes[VGA_MAX_COLORS / 4] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), + RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), + + RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), + RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), + RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), + RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), + + + RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), + RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), + RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), + + RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), + RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; + +#define USE_REACTOS_COLORS +// #define USE_DOSBOX_COLORS + +/* + * Same palette as the default one 'VgaDefaultPalette' in vga.c + */ +#if defined(USE_REACTOS_COLORS) + +// ReactOS colors +static CONST COLORREF VgaPalette[VGA_MAX_COLORS] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0x00), RGB(0x10, 0x10, 0x10), RGB(0x20, 0x20, 0x20), RGB(0x35, 0x35, 0x35), + RGB(0x45, 0x45, 0x45), RGB(0x55, 0x55, 0x55), RGB(0x65, 0x65, 0x65), RGB(0x75, 0x75, 0x75), + RGB(0x8A, 0x8A, 0x8A), RGB(0x9A, 0x9A, 0x9A), RGB(0xAA, 0xAA, 0xAA), RGB(0xBA, 0xBA, 0xBA), + RGB(0xCA, 0xCA, 0xCA), RGB(0xDF, 0xDF, 0xDF), RGB(0xEF, 0xEF, 0xEF), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0xFF), RGB(0x41, 0x00, 0xFF), RGB(0x82, 0x00, 0xFF), RGB(0xBE, 0x00, 0xFF), + RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0x00, 0xBE), RGB(0xFF, 0x00, 0x82), RGB(0xFF, 0x00, 0x41), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x41, 0x00), RGB(0xFF, 0x82, 0x00), RGB(0xFF, 0xBE, 0x00), + RGB(0xFF, 0xFF, 0x00), RGB(0xBE, 0xFF, 0x00), RGB(0x82, 0xFF, 0x00), RGB(0x41, 0xFF, 0x00), + RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0x41), RGB(0x00, 0xFF, 0x82), RGB(0x00, 0xFF, 0xBE), + RGB(0x00, 0xFF, 0xFF), RGB(0x00, 0xBE, 0xFF), RGB(0x00, 0x82, 0xFF), RGB(0x00, 0x41, 0xFF), + RGB(0x82, 0x82, 0xFF), RGB(0x9E, 0x82, 0xFF), RGB(0xBE, 0x82, 0xFF), RGB(0xDF, 0x82, 0xFF), + RGB(0xFF, 0x82, 0xFF), RGB(0xFF, 0x82, 0xDF), RGB(0xFF, 0x82, 0xBE), RGB(0xFF, 0x82, 0x9E), + RGB(0xFF, 0x82, 0x82), RGB(0xFF, 0x9E, 0x82), RGB(0xFF, 0xBE, 0x82), RGB(0xFF, 0xDF, 0x82), + RGB(0xFF, 0xFF, 0x82), RGB(0xDF, 0xFF, 0x82), RGB(0xBE, 0xFF, 0x82), RGB(0x9E, 0xFF, 0x82), + RGB(0x82, 0xFF, 0x82), RGB(0x82, 0xFF, 0x9E), RGB(0x82, 0xFF, 0xBE), RGB(0x82, 0xFF, 0xDF), + RGB(0x82, 0xFF, 0xFF), RGB(0x82, 0xDF, 0xFF), RGB(0x82, 0xBE, 0xFF), RGB(0x82, 0x9E, 0xFF), + RGB(0xBA, 0xBA, 0xFF), RGB(0xCA, 0xBA, 0xFF), RGB(0xDF, 0xBA, 0xFF), RGB(0xEF, 0xBA, 0xFF), + RGB(0xFF, 0xBA, 0xFF), RGB(0xFF, 0xBA, 0xEF), RGB(0xFF, 0xBA, 0xDF), RGB(0xFF, 0xBA, 0xCA), + RGB(0xFF, 0xBA, 0xBA), RGB(0xFF, 0xCA, 0xBA), RGB(0xFF, 0xDF, 0xBA), RGB(0xFF, 0xEF, 0xBA), + RGB(0xFF, 0xFF, 0xBA), RGB(0xEF, 0xFF, 0xBA), RGB(0xDF, 0xFF, 0xBA), RGB(0xCA, 0xFF, 0xBA), + RGB(0xBA, 0xFF, 0xBA), RGB(0xBA, 0xFF, 0xCA), RGB(0xBA, 0xFF, 0xDF), RGB(0xBA, 0xFF, 0xEF), + RGB(0xBA, 0xFF, 0xFF), RGB(0xBA, 0xEF, 0xFF), RGB(0xBA, 0xDF, 0xFF), RGB(0xBA, 0xCA, 0xFF), + RGB(0x00, 0x00, 0x71), RGB(0x1C, 0x00, 0x71), RGB(0x39, 0x00, 0x71), RGB(0x55, 0x00, 0x71), + RGB(0x71, 0x00, 0x71), RGB(0x71, 0x00, 0x55), RGB(0x71, 0x00, 0x39), RGB(0x71, 0x00, 0x1C), + RGB(0x71, 0x00, 0x00), RGB(0x71, 0x1C, 0x00), RGB(0x71, 0x39, 0x00), RGB(0x71, 0x55, 0x00), + RGB(0x71, 0x71, 0x00), RGB(0x55, 0x71, 0x00), RGB(0x39, 0x71, 0x00), RGB(0x1C, 0x71, 0x00), + RGB(0x00, 0x71, 0x00), RGB(0x00, 0x71, 0x1C), RGB(0x00, 0x71, 0x39), RGB(0x00, 0x71, 0x55), + RGB(0x00, 0x71, 0x71), RGB(0x00, 0x55, 0x71), RGB(0x00, 0x39, 0x71), RGB(0x00, 0x1C, 0x71), + RGB(0x39, 0x39, 0x71), RGB(0x45, 0x39, 0x71), RGB(0x55, 0x39, 0x71), RGB(0x61, 0x39, 0x71), + RGB(0x71, 0x39, 0x71), RGB(0x71, 0x39, 0x61), RGB(0x71, 0x39, 0x55), RGB(0x71, 0x39, 0x45), + RGB(0x71, 0x39, 0x39), RGB(0x71, 0x45, 0x39), RGB(0x71, 0x55, 0x39), RGB(0x71, 0x61, 0x39), + RGB(0x71, 0x71, 0x39), RGB(0x61, 0x71, 0x39), RGB(0x55, 0x71, 0x39), RGB(0x45, 0x71, 0x39), + RGB(0x39, 0x71, 0x39), RGB(0x39, 0x71, 0x45), RGB(0x39, 0x71, 0x55), RGB(0x39, 0x71, 0x61), + RGB(0x39, 0x71, 0x71), RGB(0x39, 0x61, 0x71), RGB(0x39, 0x55, 0x71), RGB(0x39, 0x45, 0x71), + RGB(0x51, 0x51, 0x71), RGB(0x59, 0x51, 0x71), RGB(0x61, 0x51, 0x71), RGB(0x69, 0x51, 0x71), + RGB(0x71, 0x51, 0x71), RGB(0x71, 0x51, 0x69), RGB(0x71, 0x51, 0x61), RGB(0x71, 0x51, 0x59), + RGB(0x71, 0x51, 0x51), RGB(0x71, 0x59, 0x51), RGB(0x71, 0x61, 0x51), RGB(0x71, 0x69, 0x51), + RGB(0x71, 0x71, 0x51), RGB(0x69, 0x71, 0x51), RGB(0x61, 0x71, 0x51), RGB(0x59, 0x71, 0x51), + RGB(0x51, 0x71, 0x51), RGB(0x51, 0x71, 0x59), RGB(0x51, 0x71, 0x61), RGB(0x51, 0x71, 0x69), + RGB(0x51, 0x71, 0x71), RGB(0x51, 0x69, 0x71), RGB(0x51, 0x61, 0x71), RGB(0x51, 0x59, 0x71), + RGB(0x00, 0x00, 0x41), RGB(0x10, 0x00, 0x41), RGB(0x20, 0x00, 0x41), RGB(0x31, 0x00, 0x41), + RGB(0x41, 0x00, 0x41), RGB(0x41, 0x00, 0x31), RGB(0x41, 0x00, 0x20), RGB(0x41, 0x00, 0x10), + RGB(0x41, 0x00, 0x00), RGB(0x41, 0x10, 0x00), RGB(0x41, 0x20, 0x00), RGB(0x41, 0x31, 0x00), + RGB(0x41, 0x41, 0x00), RGB(0x31, 0x41, 0x00), RGB(0x20, 0x41, 0x00), RGB(0x10, 0x41, 0x00), + RGB(0x00, 0x41, 0x00), RGB(0x00, 0x41, 0x10), RGB(0x00, 0x41, 0x20), RGB(0x00, 0x41, 0x31), + RGB(0x00, 0x41, 0x41), RGB(0x00, 0x31, 0x41), RGB(0x00, 0x20, 0x41), RGB(0x00, 0x10, 0x41), + RGB(0x20, 0x20, 0x41), RGB(0x28, 0x20, 0x41), RGB(0x31, 0x20, 0x41), RGB(0x39, 0x20, 0x41), + RGB(0x41, 0x20, 0x41), RGB(0x41, 0x20, 0x39), RGB(0x41, 0x20, 0x31), RGB(0x41, 0x20, 0x28), + RGB(0x41, 0x20, 0x20), RGB(0x41, 0x28, 0x20), RGB(0x41, 0x31, 0x20), RGB(0x41, 0x39, 0x20), + RGB(0x41, 0x41, 0x20), RGB(0x39, 0x41, 0x20), RGB(0x31, 0x41, 0x20), RGB(0x28, 0x41, 0x20), + RGB(0x20, 0x41, 0x20), RGB(0x20, 0x41, 0x28), RGB(0x20, 0x41, 0x31), RGB(0x20, 0x41, 0x39), + RGB(0x20, 0x41, 0x41), RGB(0x20, 0x39, 0x41), RGB(0x20, 0x31, 0x41), RGB(0x20, 0x28, 0x41), + RGB(0x2D, 0x2D, 0x41), RGB(0x31, 0x2D, 0x41), RGB(0x35, 0x2D, 0x41), RGB(0x3D, 0x2D, 0x41), + RGB(0x41, 0x2D, 0x41), RGB(0x41, 0x2D, 0x3D), RGB(0x41, 0x2D, 0x35), RGB(0x41, 0x2D, 0x31), + RGB(0x41, 0x2D, 0x2D), RGB(0x41, 0x31, 0x2D), RGB(0x41, 0x35, 0x2D), RGB(0x41, 0x3D, 0x2D), + RGB(0x41, 0x41, 0x2D), RGB(0x3D, 0x41, 0x2D), RGB(0x35, 0x41, 0x2D), RGB(0x31, 0x41, 0x2D), + RGB(0x2D, 0x41, 0x2D), RGB(0x2D, 0x41, 0x31), RGB(0x2D, 0x41, 0x35), RGB(0x2D, 0x41, 0x3D), + RGB(0x2D, 0x41, 0x41), RGB(0x2D, 0x3D, 0x41), RGB(0x2D, 0x35, 0x41), RGB(0x2D, 0x31, 0x41), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00) +}; + +#elif defined(USE_DOSBOX_COLORS) + +// DOSBox colors +static CONST COLORREF VgaPalette[VGA_MAX_COLORS] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0x00), RGB(0x14, 0x14, 0x14), RGB(0x20, 0x20, 0x20), RGB(0x2C, 0x2C, 0x2C), + RGB(0x38, 0x38, 0x38), RGB(0x45, 0x45, 0x45), RGB(0x51, 0x51, 0x51), RGB(0x61, 0x61, 0x61), + RGB(0x71, 0x71, 0x71), RGB(0x82, 0x82, 0x82), RGB(0x92, 0x92, 0x92), RGB(0xA2, 0xA2, 0xA2), + RGB(0xB6, 0xB6, 0xB6), RGB(0xCB, 0xCB, 0xCB), RGB(0xE3, 0xE3, 0xE3), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0xFF), RGB(0x41, 0x00, 0xFF), RGB(0x7D, 0x00, 0xFF), RGB(0xBE, 0x00, 0xFF), + RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0x00, 0xBE), RGB(0xFF, 0x00, 0x7D), RGB(0xFF, 0x00, 0x41), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x41, 0x00), RGB(0xFF, 0x7D, 0x00), RGB(0xFF, 0xBE, 0x00), + RGB(0xFF, 0xFF, 0x00), RGB(0xBE, 0xFF, 0x00), RGB(0x7D, 0xFF, 0x00), RGB(0x41, 0xFF, 0x00), + RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0x41), RGB(0x00, 0xFF, 0x7D), RGB(0x00, 0xFF, 0xBE), + RGB(0x00, 0xFF, 0xFF), RGB(0x00, 0xBE, 0xFF), RGB(0x00, 0x7D, 0xFF), RGB(0x00, 0x41, 0xFF), + RGB(0x7D, 0x7D, 0xFF), RGB(0x9E, 0x7D, 0xFF), RGB(0xBE, 0x7D, 0xFF), RGB(0xDF, 0x7D, 0xFF), + RGB(0xFF, 0x7D, 0xFF), RGB(0xFF, 0x7D, 0xDF), RGB(0xFF, 0x7D, 0xBE), RGB(0xFF, 0x7D, 0x9E), + + RGB(0xFF, 0x7D, 0x7D), RGB(0xFF, 0x9E, 0x7D), RGB(0xFF, 0xBE, 0x7D), RGB(0xFF, 0xDF, 0x7D), + RGB(0xFF, 0xFF, 0x7D), RGB(0xDF, 0xFF, 0x7D), RGB(0xBE, 0xFF, 0x7D), RGB(0x9E, 0xFF, 0x7D), + RGB(0x7D, 0xFF, 0x7D), RGB(0x7D, 0xFF, 0x9E), RGB(0x7D, 0xFF, 0xBE), RGB(0x7D, 0xFF, 0xDF), + RGB(0x7D, 0xFF, 0xFF), RGB(0x7D, 0xDF, 0xFF), RGB(0x7D, 0xBE, 0xFF), RGB(0x7D, 0x9E, 0xFF), + RGB(0xB6, 0xB6, 0xFF), RGB(0xC7, 0xB6, 0xFF), RGB(0xDB, 0xB6, 0xFF), RGB(0xEB, 0xB6, 0xFF), + RGB(0xFF, 0xB6, 0xFF), RGB(0xFF, 0xB6, 0xEB), RGB(0xFF, 0xB6, 0xDB), RGB(0xFF, 0xB6, 0xC7), + RGB(0xFF, 0xB6, 0xB6), RGB(0xFF, 0xC7, 0xB6), RGB(0xFF, 0xDB, 0xB6), RGB(0xFF, 0xEB, 0xB6), + RGB(0xFF, 0xFF, 0xB6), RGB(0xEB, 0xFF, 0xB6), RGB(0xDB, 0xFF, 0xB6), RGB(0xC7, 0xFF, 0xB6), + RGB(0xB6, 0xFF, 0xB6), RGB(0xB6, 0xFF, 0xC7), RGB(0xB6, 0xFF, 0xDB), RGB(0xB6, 0xFF, 0xEB), + RGB(0xB6, 0xFF, 0xFF), RGB(0xB6, 0xEB, 0xFF), RGB(0xB6, 0xDB, 0xFF), RGB(0xB6, 0xC7, 0xFF), + RGB(0x00, 0x00, 0x71), RGB(0x1C, 0x00, 0x71), RGB(0x38, 0x00, 0x71), RGB(0x55, 0x00, 0x71), + RGB(0x71, 0x00, 0x71), RGB(0x71, 0x00, 0x55), RGB(0x71, 0x00, 0x38), RGB(0x71, 0x00, 0x1C), + RGB(0x71, 0x00, 0x00), RGB(0x71, 0x1C, 0x00), RGB(0x71, 0x38, 0x00), RGB(0x71, 0x55, 0x00), + RGB(0x71, 0x71, 0x00), RGB(0x55, 0x71, 0x00), RGB(0x38, 0x71, 0x00), RGB(0x1C, 0x71, 0x00), + RGB(0x00, 0x71, 0x00), RGB(0x00, 0x71, 0x1C), RGB(0x00, 0x71, 0x38), RGB(0x00, 0x71, 0x55), + RGB(0x00, 0x71, 0x71), RGB(0x00, 0x55, 0x71), RGB(0x00, 0x38, 0x71), RGB(0x00, 0x1C, 0x71), + + RGB(0x38, 0x38, 0x71), RGB(0x45, 0x38, 0x71), RGB(0x55, 0x38, 0x71), RGB(0x61, 0x38, 0x71), + RGB(0x71, 0x38, 0x71), RGB(0x71, 0x38, 0x61), RGB(0x71, 0x38, 0x55), RGB(0x71, 0x38, 0x45), + RGB(0x71, 0x38, 0x38), RGB(0x71, 0x45, 0x38), RGB(0x71, 0x55, 0x38), RGB(0x71, 0x61, 0x38), + RGB(0x71, 0x71, 0x38), RGB(0x61, 0x71, 0x38), RGB(0x55, 0x71, 0x38), RGB(0x45, 0x71, 0x38), + RGB(0x38, 0x71, 0x38), RGB(0x38, 0x71, 0x45), RGB(0x38, 0x71, 0x55), RGB(0x38, 0x71, 0x61), + RGB(0x38, 0x71, 0x71), RGB(0x38, 0x61, 0x71), RGB(0x38, 0x55, 0x71), RGB(0x38, 0x45, 0x71), + RGB(0x51, 0x51, 0x71), RGB(0x59, 0x51, 0x71), RGB(0x61, 0x51, 0x71), RGB(0x69, 0x51, 0x71), + RGB(0x71, 0x51, 0x71), RGB(0x71, 0x51, 0x69), RGB(0x71, 0x51, 0x61), RGB(0x71, 0x51, 0x59), + RGB(0x71, 0x51, 0x51), RGB(0x71, 0x59, 0x51), RGB(0x71, 0x61, 0x51), RGB(0x71, 0x69, 0x51), + RGB(0x71, 0x71, 0x51), RGB(0x69, 0x71, 0x51), RGB(0x61, 0x71, 0x51), RGB(0x59, 0x71, 0x51), + RGB(0x51, 0x71, 0x51), RGB(0x51, 0x71, 0x59), RGB(0x51, 0x71, 0x61), RGB(0x51, 0x71, 0x69), + RGB(0x51, 0x71, 0x71), RGB(0x51, 0x69, 0x71), RGB(0x51, 0x61, 0x71), RGB(0x51, 0x59, 0x71), + RGB(0x00, 0x00, 0x41), RGB(0x10, 0x00, 0x41), RGB(0x20, 0x00, 0x41), RGB(0x30, 0x00, 0x41), + RGB(0x41, 0x00, 0x41), RGB(0x41, 0x00, 0x30), RGB(0x41, 0x00, 0x20), RGB(0x41, 0x00, 0x10), + RGB(0x41, 0x00, 0x00), RGB(0x41, 0x10, 0x00), RGB(0x41, 0x20, 0x00), RGB(0x41, 0x30, 0x00), + RGB(0x41, 0x41, 0x00), RGB(0x30, 0x41, 0x00), RGB(0x20, 0x41, 0x00), RGB(0x10, 0x41, 0x00), + + RGB(0x00, 0x41, 0x00), RGB(0x00, 0x41, 0x10), RGB(0x00, 0x41, 0x20), RGB(0x00, 0x41, 0x30), + RGB(0x00, 0x41, 0x41), RGB(0x00, 0x30, 0x41), RGB(0x00, 0x20, 0x41), RGB(0x00, 0x10, 0x41), + RGB(0x20, 0x20, 0x41), RGB(0x28, 0x20, 0x41), RGB(0x30, 0x20, 0x41), RGB(0x38, 0x20, 0x41), + RGB(0x41, 0x20, 0x41), RGB(0x41, 0x20, 0x38), RGB(0x41, 0x20, 0x30), RGB(0x41, 0x20, 0x28), + RGB(0x41, 0x20, 0x20), RGB(0x41, 0x28, 0x20), RGB(0x41, 0x30, 0x20), RGB(0x41, 0x38, 0x20), + RGB(0x41, 0x41, 0x20), RGB(0x38, 0x41, 0x20), RGB(0x30, 0x41, 0x20), RGB(0x28, 0x41, 0x20), + RGB(0x20, 0x41, 0x20), RGB(0x20, 0x41, 0x28), RGB(0x20, 0x41, 0x30), RGB(0x20, 0x41, 0x38), + RGB(0x20, 0x41, 0x41), RGB(0x20, 0x38, 0x41), RGB(0x20, 0x30, 0x41), RGB(0x20, 0x28, 0x41), + RGB(0x2C, 0x2C, 0x41), RGB(0x30, 0x2C, 0x41), RGB(0x34, 0x2C, 0x41), RGB(0x3C, 0x2C, 0x41), + RGB(0x41, 0x2C, 0x41), RGB(0x41, 0x2C, 0x3C), RGB(0x41, 0x2C, 0x34), RGB(0x41, 0x2C, 0x30), + RGB(0x41, 0x2C, 0x2C), RGB(0x41, 0x30, 0x2C), RGB(0x41, 0x34, 0x2C), RGB(0x41, 0x3C, 0x2C), + RGB(0x41, 0x41, 0x2C), RGB(0x3C, 0x41, 0x2C), RGB(0x34, 0x41, 0x2C), RGB(0x30, 0x41, 0x2C), + RGB(0x2C, 0x41, 0x2C), RGB(0x2C, 0x41, 0x30), RGB(0x2C, 0x41, 0x34), RGB(0x2C, 0x41, 0x3C), + RGB(0x2C, 0x41, 0x41), RGB(0x2C, 0x3C, 0x41), RGB(0x2C, 0x34, 0x41), RGB(0x2C, 0x30, 0x41), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00) +}; + +#endif /* PRIVATE FUNCTIONS **********************************************************/ @@ -450,12 +770,15 @@ } /* Write the AC registers */ + // DbgPrint("\n"); for (i = 0; i < VGA_AC_MAX_REG; i++) { VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, i); VgaWritePort(VGA_AC_WRITE, Registers->Attribute[i]); - } + // DbgPrint("Registers->Attribute[%d] = %d\n", i, Registers->Attribute[i]); + } + // DbgPrint("\n"); /* Set the PEL mask */ VgaWritePort(VGA_DAC_MASK, 0xFF); @@ -470,50 +793,82 @@ return TRUE; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -BYTE BiosGetVideoMode(VOID) -{ - return Bda->VideoMode; -} - -BOOLEAN BiosSetVideoMode(BYTE ModeNumber) -{ - INT i; - BYTE Page; - - COORD Resolution; - PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; - - DPRINT1("Switching to mode %Xh; VgaMode = 0x%p\n", ModeNumber, VgaMode); - - if (!VgaSetRegisters(VgaMode)) return FALSE; +static VOID VgaSetPalette(const COLORREF* Palette, ULONG Size) +{ + ULONG i; // /* Disable screen and enable palette access */ // VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state // VgaWritePort(VGA_AC_INDEX, 0x00); - if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E) || (ModeNumber == 0x10)) - { - /* EGA modes */ - extern CONST COLORREF EgaPalette[VGA_MAX_COLORS / 4]; - for (i = 0; i < sizeof(EgaPalette)/sizeof(EgaPalette[0]); i++) - { - VgaWritePort(VGA_DAC_WRITE_INDEX, i); - VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetRValue(EgaPalette[i]))); - VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetGValue(EgaPalette[i]))); - VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetBValue(EgaPalette[i]))); - } - } - else - { - /* Reset the palette */ - VgaResetPalette(); - } - - // /* Enable screen and disable palette access */ + for (i = 0; i < Size; i++) + { + VgaWritePort(VGA_DAC_WRITE_INDEX, i); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetRValue(Palette[i]))); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetGValue(Palette[i]))); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetBValue(Palette[i]))); + } + + /* The following step might be optional */ + for (i = Size; i < VGA_MAX_COLORS; i++) + { + VgaWritePort(VGA_DAC_WRITE_INDEX, i); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(0x00)); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(0x00)); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(0x00)); + } + + /* Enable screen and disable palette access */ // VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state // VgaWritePort(VGA_AC_INDEX, 0x20); +} + +static VOID VgaChangePalette(BYTE ModeNumber) +{ + const COLORREF* Palette; + ULONG Size; + + if (ModeNumber >= 0x13) + { + /* VGA modes */ + Palette = VgaPalette; + Size = sizeof(VgaPalette)/sizeof(VgaPalette[0]); + } + else if (ModeNumber == 0x10) + { + /* EGA HiRes mode */ + Palette = EgaPalette__HiRes; + Size = sizeof(EgaPalette__HiRes)/sizeof(EgaPalette__HiRes[0]); + } + else // if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E)) + { + /* EGA modes */ + Palette = EgaPalette___16ColorFixed_DOSBox; + Size = sizeof(EgaPalette___16ColorFixed_DOSBox)/sizeof(EgaPalette___16ColorFixed_DOSBox[0]); + } + + VgaSetPalette(Palette, Size); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE BiosGetVideoMode(VOID) +{ + return Bda->VideoMode; +} + +BOOLEAN BiosSetVideoMode(BYTE ModeNumber) +{ + BYTE Page; + + COORD Resolution; + PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; + + DPRINT1("Switching to mode %Xh; VgaMode = 0x%p\n", ModeNumber, VgaMode); + + if (!VgaSetRegisters(VgaMode)) return FALSE; + + VgaChangePalette(ModeNumber); // Bda->CrtModeControl; // Bda->CrtColorPaletteMask; @@ -903,7 +1258,7 @@ /* Horizontal Tabulation control character */ do { - // Taken from DosBox + // Taken from DOSBox BiosPrintCharacter(' ', Attribute, Page); BiosGetCursorPosition(&Row, &Column, Page); } while (Column % 8); Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re…
============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Wed Dec 25 21:40:18 2013 @@ -21,28 +21,13 @@ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; - -/*static*/ CONST COLORREF EgaPalette[VGA_MAX_COLORS / 4] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), - RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), - RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), - RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), - RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), - RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), - RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), - RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), - RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), - RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), - RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) -}; - -static CONST COLORREF VgaDefaultPalette[VGA_MAX_COLORS] = +#define USE_REACTOS_COLORS +// #define USE_DOSBOX_COLORS + +#if defined(USE_REACTOS_COLORS) + +// ReactOS colors +static CONST COLORREF VgaDefaultPalette[VGA_MAX_COLORS] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), @@ -110,6 +95,82 @@ RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00) }; +#elif defined(USE_DOSBOX_COLORS) + +// DOSBox colors +static CONST COLORREF VgaDefaultPalette[VGA_MAX_COLORS] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0x00), RGB(0x14, 0x14, 0x14), RGB(0x20, 0x20, 0x20), RGB(0x2C, 0x2C, 0x2C), + RGB(0x38, 0x38, 0x38), RGB(0x45, 0x45, 0x45), RGB(0x51, 0x51, 0x51), RGB(0x61, 0x61, 0x61), + RGB(0x71, 0x71, 0x71), RGB(0x82, 0x82, 0x82), RGB(0x92, 0x92, 0x92), RGB(0xA2, 0xA2, 0xA2), + RGB(0xB6, 0xB6, 0xB6), RGB(0xCB, 0xCB, 0xCB), RGB(0xE3, 0xE3, 0xE3), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0xFF), RGB(0x41, 0x00, 0xFF), RGB(0x7D, 0x00, 0xFF), RGB(0xBE, 0x00, 0xFF), + RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0x00, 0xBE), RGB(0xFF, 0x00, 0x7D), RGB(0xFF, 0x00, 0x41), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x41, 0x00), RGB(0xFF, 0x7D, 0x00), RGB(0xFF, 0xBE, 0x00), + RGB(0xFF, 0xFF, 0x00), RGB(0xBE, 0xFF, 0x00), RGB(0x7D, 0xFF, 0x00), RGB(0x41, 0xFF, 0x00), + RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0x41), RGB(0x00, 0xFF, 0x7D), RGB(0x00, 0xFF, 0xBE), + RGB(0x00, 0xFF, 0xFF), RGB(0x00, 0xBE, 0xFF), RGB(0x00, 0x7D, 0xFF), RGB(0x00, 0x41, 0xFF), + RGB(0x7D, 0x7D, 0xFF), RGB(0x9E, 0x7D, 0xFF), RGB(0xBE, 0x7D, 0xFF), RGB(0xDF, 0x7D, 0xFF), + RGB(0xFF, 0x7D, 0xFF), RGB(0xFF, 0x7D, 0xDF), RGB(0xFF, 0x7D, 0xBE), RGB(0xFF, 0x7D, 0x9E), + + RGB(0xFF, 0x7D, 0x7D), RGB(0xFF, 0x9E, 0x7D), RGB(0xFF, 0xBE, 0x7D), RGB(0xFF, 0xDF, 0x7D), + RGB(0xFF, 0xFF, 0x7D), RGB(0xDF, 0xFF, 0x7D), RGB(0xBE, 0xFF, 0x7D), RGB(0x9E, 0xFF, 0x7D), + RGB(0x7D, 0xFF, 0x7D), RGB(0x7D, 0xFF, 0x9E), RGB(0x7D, 0xFF, 0xBE), RGB(0x7D, 0xFF, 0xDF), + RGB(0x7D, 0xFF, 0xFF), RGB(0x7D, 0xDF, 0xFF), RGB(0x7D, 0xBE, 0xFF), RGB(0x7D, 0x9E, 0xFF), + RGB(0xB6, 0xB6, 0xFF), RGB(0xC7, 0xB6, 0xFF), RGB(0xDB, 0xB6, 0xFF), RGB(0xEB, 0xB6, 0xFF), + RGB(0xFF, 0xB6, 0xFF), RGB(0xFF, 0xB6, 0xEB), RGB(0xFF, 0xB6, 0xDB), RGB(0xFF, 0xB6, 0xC7), + RGB(0xFF, 0xB6, 0xB6), RGB(0xFF, 0xC7, 0xB6), RGB(0xFF, 0xDB, 0xB6), RGB(0xFF, 0xEB, 0xB6), + RGB(0xFF, 0xFF, 0xB6), RGB(0xEB, 0xFF, 0xB6), RGB(0xDB, 0xFF, 0xB6), RGB(0xC7, 0xFF, 0xB6), + RGB(0xB6, 0xFF, 0xB6), RGB(0xB6, 0xFF, 0xC7), RGB(0xB6, 0xFF, 0xDB), RGB(0xB6, 0xFF, 0xEB), + RGB(0xB6, 0xFF, 0xFF), RGB(0xB6, 0xEB, 0xFF), RGB(0xB6, 0xDB, 0xFF), RGB(0xB6, 0xC7, 0xFF), + RGB(0x00, 0x00, 0x71), RGB(0x1C, 0x00, 0x71), RGB(0x38, 0x00, 0x71), RGB(0x55, 0x00, 0x71), + RGB(0x71, 0x00, 0x71), RGB(0x71, 0x00, 0x55), RGB(0x71, 0x00, 0x38), RGB(0x71, 0x00, 0x1C), + RGB(0x71, 0x00, 0x00), RGB(0x71, 0x1C, 0x00), RGB(0x71, 0x38, 0x00), RGB(0x71, 0x55, 0x00), + RGB(0x71, 0x71, 0x00), RGB(0x55, 0x71, 0x00), RGB(0x38, 0x71, 0x00), RGB(0x1C, 0x71, 0x00), + RGB(0x00, 0x71, 0x00), RGB(0x00, 0x71, 0x1C), RGB(0x00, 0x71, 0x38), RGB(0x00, 0x71, 0x55), + RGB(0x00, 0x71, 0x71), RGB(0x00, 0x55, 0x71), RGB(0x00, 0x38, 0x71), RGB(0x00, 0x1C, 0x71), + + RGB(0x38, 0x38, 0x71), RGB(0x45, 0x38, 0x71), RGB(0x55, 0x38, 0x71), RGB(0x61, 0x38, 0x71), + RGB(0x71, 0x38, 0x71), RGB(0x71, 0x38, 0x61), RGB(0x71, 0x38, 0x55), RGB(0x71, 0x38, 0x45), + RGB(0x71, 0x38, 0x38), RGB(0x71, 0x45, 0x38), RGB(0x71, 0x55, 0x38), RGB(0x71, 0x61, 0x38), + RGB(0x71, 0x71, 0x38), RGB(0x61, 0x71, 0x38), RGB(0x55, 0x71, 0x38), RGB(0x45, 0x71, 0x38), + RGB(0x38, 0x71, 0x38), RGB(0x38, 0x71, 0x45), RGB(0x38, 0x71, 0x55), RGB(0x38, 0x71, 0x61), + RGB(0x38, 0x71, 0x71), RGB(0x38, 0x61, 0x71), RGB(0x38, 0x55, 0x71), RGB(0x38, 0x45, 0x71), + RGB(0x51, 0x51, 0x71), RGB(0x59, 0x51, 0x71), RGB(0x61, 0x51, 0x71), RGB(0x69, 0x51, 0x71), + RGB(0x71, 0x51, 0x71), RGB(0x71, 0x51, 0x69), RGB(0x71, 0x51, 0x61), RGB(0x71, 0x51, 0x59), + RGB(0x71, 0x51, 0x51), RGB(0x71, 0x59, 0x51), RGB(0x71, 0x61, 0x51), RGB(0x71, 0x69, 0x51), + RGB(0x71, 0x71, 0x51), RGB(0x69, 0x71, 0x51), RGB(0x61, 0x71, 0x51), RGB(0x59, 0x71, 0x51), + RGB(0x51, 0x71, 0x51), RGB(0x51, 0x71, 0x59), RGB(0x51, 0x71, 0x61), RGB(0x51, 0x71, 0x69), + RGB(0x51, 0x71, 0x71), RGB(0x51, 0x69, 0x71), RGB(0x51, 0x61, 0x71), RGB(0x51, 0x59, 0x71), + RGB(0x00, 0x00, 0x41), RGB(0x10, 0x00, 0x41), RGB(0x20, 0x00, 0x41), RGB(0x30, 0x00, 0x41), + RGB(0x41, 0x00, 0x41), RGB(0x41, 0x00, 0x30), RGB(0x41, 0x00, 0x20), RGB(0x41, 0x00, 0x10), + RGB(0x41, 0x00, 0x00), RGB(0x41, 0x10, 0x00), RGB(0x41, 0x20, 0x00), RGB(0x41, 0x30, 0x00), + RGB(0x41, 0x41, 0x00), RGB(0x30, 0x41, 0x00), RGB(0x20, 0x41, 0x00), RGB(0x10, 0x41, 0x00), + + RGB(0x00, 0x41, 0x00), RGB(0x00, 0x41, 0x10), RGB(0x00, 0x41, 0x20), RGB(0x00, 0x41, 0x30), + RGB(0x00, 0x41, 0x41), RGB(0x00, 0x30, 0x41), RGB(0x00, 0x20, 0x41), RGB(0x00, 0x10, 0x41), + RGB(0x20, 0x20, 0x41), RGB(0x28, 0x20, 0x41), RGB(0x30, 0x20, 0x41), RGB(0x38, 0x20, 0x41), + RGB(0x41, 0x20, 0x41), RGB(0x41, 0x20, 0x38), RGB(0x41, 0x20, 0x30), RGB(0x41, 0x20, 0x28), + RGB(0x41, 0x20, 0x20), RGB(0x41, 0x28, 0x20), RGB(0x41, 0x30, 0x20), RGB(0x41, 0x38, 0x20), + RGB(0x41, 0x41, 0x20), RGB(0x38, 0x41, 0x20), RGB(0x30, 0x41, 0x20), RGB(0x28, 0x41, 0x20), + RGB(0x20, 0x41, 0x20), RGB(0x20, 0x41, 0x28), RGB(0x20, 0x41, 0x30), RGB(0x20, 0x41, 0x38), + RGB(0x20, 0x41, 0x41), RGB(0x20, 0x38, 0x41), RGB(0x20, 0x30, 0x41), RGB(0x20, 0x28, 0x41), + RGB(0x2C, 0x2C, 0x41), RGB(0x30, 0x2C, 0x41), RGB(0x34, 0x2C, 0x41), RGB(0x3C, 0x2C, 0x41), + RGB(0x41, 0x2C, 0x41), RGB(0x41, 0x2C, 0x3C), RGB(0x41, 0x2C, 0x34), RGB(0x41, 0x2C, 0x30), + RGB(0x41, 0x2C, 0x2C), RGB(0x41, 0x30, 0x2C), RGB(0x41, 0x34, 0x2C), RGB(0x41, 0x3C, 0x2C), + RGB(0x41, 0x41, 0x2C), RGB(0x3C, 0x41, 0x2C), RGB(0x34, 0x41, 0x2C), RGB(0x30, 0x41, 0x2C), + RGB(0x2C, 0x41, 0x2C), RGB(0x2C, 0x41, 0x30), RGB(0x2C, 0x41, 0x34), RGB(0x2C, 0x41, 0x3C), + RGB(0x2C, 0x41, 0x41), RGB(0x2C, 0x3C, 0x41), RGB(0x2C, 0x34, 0x41), RGB(0x2C, 0x30, 0x41), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x00) +}; + +#endif + static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; static LPVOID ConsoleFramebuffer = NULL; static HANDLE TextConsoleBuffer = NULL; @@ -133,6 +194,7 @@ static BYTE VgaGcRegisters[VGA_GC_MAX_REG]; static BOOLEAN VgaAcLatch = FALSE; +static BOOLEAN VgaAcPalDisable = TRUE; static BYTE VgaAcIndex = VGA_AC_PAL_0_REG; static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; @@ -388,10 +450,8 @@ Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); Entry.peFlags = 0; - /* Update the palette entry */ + /* Update the palette entry and set the palette change flag */ SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); - - /* Set the palette change flag */ PaletteChanged = TRUE; /* Update the index */ @@ -404,12 +464,21 @@ ASSERT(VgaAcIndex < VGA_AC_MAX_REG); /* Save the value */ - VgaAcRegisters[VgaAcIndex] = Data; - if (VgaAcIndex <= VGA_AC_PAL_F_REG) { - /* Set the palette change flag */ - PaletteChanged = TRUE; + if (VgaAcPalDisable) return; + + // DbgPrint(" AC Palette Writing %d to index %d\n", Data, VgaAcIndex); + if (VgaAcRegisters[VgaAcIndex] != Data) + { + /* Update the AC register and set the palette change flag */ + VgaAcRegisters[VgaAcIndex] = Data; + PaletteChanged = TRUE; + } + } + else + { + VgaAcRegisters[VgaAcIndex] = Data; } } @@ -778,8 +847,13 @@ if (!(VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT)) { - /* In 16 color mode, the value is an index to the AC registers */ - PixelData = VgaAcRegisters[PixelData]; + /* + * In 16 color mode, the value is an index to the AC registers + * if external palette access is disabled, otherwise (in case + * of palette loading) it is a blank pixel. + */ + PixelData = (VgaAcPalDisable ? VgaAcRegisters[PixelData & 0x0F] + : 0); } /* Take into account DoubleVision mode when checking for pixel updates */ @@ -1272,7 +1346,14 @@ if (!VgaAcLatch) { /* Change the index */ - if (Data < VGA_AC_MAX_REG) VgaAcIndex = Data; + BYTE Index = Data & 0x1F; + if (Index < VGA_AC_MAX_REG) VgaAcIndex = Index; + + /* + * Change palette protection by checking for + * the Palette Address Source bit. + */ + VgaAcPalDisable = (Data & 0x20) ? TRUE : FALSE; } else { @@ -1373,7 +1454,6 @@ /* Restore the default palette */ VgaRestoreDefaultPalette(Entries, VGA_MAX_COLORS); - SetPaletteEntries(PaletteHandle, 0, VGA_MAX_COLORS, Entries); PaletteChanged = TRUE; } @@ -1392,6 +1472,7 @@ /* Initialize the VGA palette and fail if it isn't successfully created */ if (!VgaInitializePalette()) return FALSE; + /***/ VgaResetPalette(); /***/ /* Set the global handle */ TextConsoleBuffer = TextHandle; Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re…
============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Wed Dec 25 21:40:18 2013 @@ -258,7 +258,6 @@ VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaClearMemory(VOID); -VOID VgaResetPalette(VOID); BOOLEAN VgaInitialize(HANDLE TextHandle); BYTE WINAPI VgaReadPort(ULONG Port);
10 years, 12 months
1
0
0
0
[akhaldi] 61418: [MSTASK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in ...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 21:09:20 2013 New Revision: 61418 URL:
http://svn.reactos.org/svn/reactos?rev=61418&view=rev
Log: [MSTASK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mstask/factory.c trunk/reactos/dll/win32/mstask/mstask_main.c trunk/reactos/dll/win32/mstask/mstask_private.h trunk/reactos/dll/win32/mstask/task.c trunk/reactos/dll/win32/mstask/task_scheduler.c trunk/reactos/dll/win32/mstask/task_trigger.c Modified: trunk/reactos/dll/win32/mstask/factory.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/factory.c…
============================================================================== --- trunk/reactos/dll/win32/mstask/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/factory.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -17,9 +17,6 @@ */ #include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask); struct ClassFactoryImpl { Modified: trunk/reactos/dll/win32/mstask/mstask_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/mstask_ma…
============================================================================== --- trunk/reactos/dll/win32/mstask/mstask_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/mstask_main.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -16,16 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> +#include "mstask_private.h" -#include "mstask_private.h" -//#include "objbase.h" #include <rpcproxy.h> - -#include <wine/debug.h> - - -WINE_DEFAULT_DEBUG_CHANNEL(mstask); static HINSTANCE hInst; LONG dll_ref = 0; Modified: trunk/reactos/dll/win32/mstask/mstask_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/mstask_pr…
============================================================================== --- trunk/reactos/dll/win32/mstask/mstask_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/mstask_private.h [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -19,19 +19,21 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H - -#include <stdarg.h> #define COBJMACROS #include <windef.h> #include <winbase.h> -//#include "winuser.h" -#include <ole2.h> +#include <objbase.h> #include <mstask.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mstask); extern LONG dll_ref DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/mstask/task.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task.c?re…
============================================================================== --- trunk/reactos/dll/win32/mstask/task.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -17,9 +17,6 @@ */ #include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask); typedef struct { Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_sche…
============================================================================== --- trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "mstask_private.h" #include <corerror.h> -#include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask); typedef struct { Modified: trunk/reactos/dll/win32/mstask/task_trigger.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_trig…
============================================================================== --- trunk/reactos/dll/win32/mstask/task_trigger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_trigger.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -16,16 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> +#include "mstask_private.h" + #include <winternl.h> -#include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask); typedef struct {
10 years, 12 months
1
0
0
0
[akhaldi] 61417: [MSPORTS] * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 21:02:45 2013 New Revision: 61417 URL:
http://svn.reactos.org/svn/reactos?rev=61417&view=rev
Log: [MSPORTS] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/msports/classinst.c trunk/reactos/dll/win32/msports/comdb.c trunk/reactos/dll/win32/msports/msports.c trunk/reactos/dll/win32/msports/parallel.c trunk/reactos/dll/win32/msports/precomp.h trunk/reactos/dll/win32/msports/serial.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins…
============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Wed Dec 25 21:02:45 2013 @@ -7,9 +7,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msports); - typedef enum _PORT_TYPE { Modified: trunk/reactos/dll/win32/msports/comdb.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?…
============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Wed Dec 25 21:02:45 2013 @@ -7,8 +7,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msports); #define BITS_PER_BYTE 8 #define BITMAP_SIZE_INCREMENT 0x400 Modified: trunk/reactos/dll/win32/msports/msports.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.…
============================================================================== --- trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] Wed Dec 25 21:02:45 2013 @@ -7,8 +7,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msports); HINSTANCE hInstance; Modified: trunk/reactos/dll/win32/msports/parallel.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/parallel…
============================================================================== --- trunk/reactos/dll/win32/msports/parallel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/parallel.c [iso-8859-1] Wed Dec 25 21:02:45 2013 @@ -7,9 +7,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msports); - static BOOL Modified: trunk/reactos/dll/win32/msports/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/precomp.…
============================================================================== --- trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] Wed Dec 25 21:02:45 2013 @@ -8,7 +8,9 @@ #include <cmtypes.h> #include <msports.h> #include <setupapi.h> + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msports); #include "internal.h" #include "resource.h" Modified: trunk/reactos/dll/win32/msports/serial.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/serial.c…
============================================================================== --- trunk/reactos/dll/win32/msports/serial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/serial.c [iso-8859-1] Wed Dec 25 21:02:45 2013 @@ -7,9 +7,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msports); - static BOOL
10 years, 12 months
1
0
0
0
[akhaldi] 61416: [MSI] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 20:42:59 2013 New Revision: 61416 URL:
http://svn.reactos.org/svn/reactos?rev=61416&view=rev
Log: [MSI] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/alter.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/create.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/delete.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/distinct.c trunk/reactos/dll/win32/msi/drop.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/font.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/handle.c trunk/reactos/dll/win32/msi/insert.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi_main.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/patch.c trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/script.c trunk/reactos/dll/win32/msi/select.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/dll/win32/msi/update.c trunk/reactos/dll/win32/msi/upgrade.c trunk/reactos/dll/win32/msi/where.c Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t…
============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -56,10 +56,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msi.def) -if(MSVC) - set_source_files_properties(custom.c PROPERTIES COMPILE_FLAGS /FImsvchelper.h) -endif() - add_library(msi SHARED ${SOURCE}) add_idl_headers(msi_idlheader msiserver.idl) add_typelib(msiserver.idl) Modified: trunk/reactos/dll/win32/msi/action.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,31 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -//#include "winbase.h" -//#include "winerror.h" -#include <winreg.h> +#include "msipriv.h" + #include <winsvc.h> #include <odbcinst.h> -#include <wine/debug.h> -//#include "msidefs.h" -#include "msipriv.h" -//#include "winuser.h" -#include <shlobj.h> -//#include "objbase.h" -//#include "mscoree.h" -//#include "shlwapi.h" #include <imagehlp.h> -#include <wine/unicode.h> -//#include "winver.h" #define REG_PROGRESS_VALUE 13200 #define COMPONENT_PROGRESS_VALUE 24000 Modified: trunk/reactos/dll/win32/msi/alter.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/alter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/alter.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" - -#include "query.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/appsearch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?…
============================================================================== --- trunk/reactos/dll/win32/msi/appsearch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/appsearch.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -17,24 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "msidefs.h" -//#include "winver.h" -#include <shlwapi.h> -#include <wine/unicode.h> -#include <wine/debug.h> + #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/assembly.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/assembly.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,19 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> -#include <wine/debug.h> -#include <wine/unicode.h> #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/automation.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c…
============================================================================== --- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,27 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -//#include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -//#include "winerror.h" -//#include "winuser.h" -#include <winreg.h> -//#include "msidefs.h" #include "msipriv.h" -#include <activscp.h> -#include <oleauto.h> -#include <shlwapi.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -#include <msiserver.h> #include "msiserver_dispids.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/classes.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -30,20 +30,7 @@ * UnregisterMIMEInfo */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" -//#include "winerror.h" -#include <winreg.h> -#include <wine/debug.h> #include "msipriv.h" -//#include "winuser.h" -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/cond.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/cond.tab.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -97,31 +97,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -//#include "msi.h" -//#include "msiquery.h" -#include <objbase.h> -#include <oleauto.h> - #include "msipriv.h" -#include <msiserver.h> -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/create.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/create.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,28 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" -//#include "winnls.h" - -#include "query.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); - /* below is the query interface to a table */ Modified: trunk/reactos/dll/win32/msi/custom.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,28 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "msidefs.h" -#include <winuser.h> -#include <objbase.h> -#include <oleauto.h> - #include "msipriv.h" -#include <msiserver.h> -#include <wine/debug.h> -#include <wine/unicode.h> + #include <wine/exception.h> + +#ifdef _MSC_VER +#include "msvchelper.h" +#endif WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/database.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,31 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> +#include "msipriv.h" + #include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION - -//#include "windef.h" -//#include "winbase.h" -//#include "winreg.h" -//#include "winnls.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -#include "msiquery.h" -//#include "msipriv.h" -//#include "objidl.h" -#include <objbase.h> -#include <msiserver.h> -#include "query.h" - -//#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/delete.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/delete.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/delete.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,27 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" #include "msipriv.h" -//#include "winnls.h" - -//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); - /* * Code to delete rows from a table. Modified: trunk/reactos/dll/win32/msi/dialog.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -19,35 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "msi.h" #include "msipriv.h" -//#include "msidefs.h" -//#include "ocidl.h" + #include <olectl.h> #include <richedit.h> -#include <commctrl.h> -#include <winreg.h> -#include <shlwapi.h> -#include <msiserver.h> #include <shellapi.h> - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/distinct.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/distinct.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/distinct.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/distinct.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" #include "msipriv.h" -//#include "winnls.h" - -//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/drop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/drop.c?rev=6…
============================================================================== --- trunk/reactos/dll/win32/msi/drop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/drop.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" - -#include "query.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/files.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/files.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -30,24 +30,7 @@ * RemoveFiles */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "fdi.h" -//#include "msi.h" -//#include "msidefs.h" #include "msipriv.h" -//#include "winuser.h" -#include <winreg.h> -#include <shlwapi.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/font.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=6…
============================================================================== --- trunk/reactos/dll/win32/msi/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/font.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -//#include "winerror.h" -#include <winreg.h> -#include <wine/debug.h> #include "msipriv.h" -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/format.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/format.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -19,27 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "winnls.h" -#include <objbase.h> -#include <oleauto.h> - #include "msipriv.h" -#include <msiserver.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/handle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/handle.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/handle.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,21 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winreg.h" -//#include "shlwapi.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/insert.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/insert.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/insert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/insert.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,28 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" -//#include "winnls.h" - -#include "query.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); - /* below is the query interface to a table */ Modified: trunk/reactos/dll/win32/msi/install.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/install.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -20,26 +20,7 @@ /* Msi top level apis directly related to installs */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msidefs.h" -#include <objbase.h> -#include <oleauto.h> - #include "msipriv.h" -#include <msiserver.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/media.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,24 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "fdi.h" #include "msipriv.h" -#include <winuser.h> -#include <winreg.h> -#include <shlwapi.h> -//#include "objidl.h" -#include <wine/unicode.h> + +#include <fdi.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/msi.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=61…
============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,39 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "winnls.h" -#include <shlwapi.h> -//#include "msi.h" -//#include "msidefs.h" -//#include "msiquery.h" #include "msipriv.h" -#include <msiserver.h> -//#include "wincrypt.h" -//#include "winver.h" -//#include "winuser.h" -#include <shlobj.h> -//#include "shobjidl.h" -//#include "objidl.h" -//#include "wintrust.h" + #include <softpub.h> - #include <initguid.h> #include <msxml2.h> - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/msi_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,25 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <shlwapi.h> -//#include "oleauto.h" +#include "msipriv.h" + #include <rpcproxy.h> -#include "msipriv.h" -#include <msiserver.h> - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/msipriv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re…
============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -22,21 +22,35 @@ #ifndef __WINE_MSI_PRIVATE__ #define __WINE_MSI_PRIVATE__ +#include <config.h> + #include <stdarg.h> - -#include "windef.h" +#include <assert.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> #include <winbase.h> -#include "fdi.h" -#include "msi.h" +#include <winreg.h> +#include <wincon.h> +#include <winver.h> #include <msiquery.h> #include <msidefs.h> -#include "objbase.h" -#include "objidl.h" +#include <objbase.h> +#include <msiserver.h> +#include <shlobj.h> +#include <shlwapi.h> #include <fusion.h> -#include "winnls.h" -#include "winver.h" +#include <sddl.h> + #include <wine/list.h> -#include "wine/debug.h" +#include <wine/debug.h> +#include <wine/unicode.h> static const BOOL is_64bit = sizeof(void *) > sizeof(int); BOOL is_wow64; @@ -1251,4 +1265,6 @@ return dest; } +#include "query.h" + #endif /* __WINE_MSI_PRIVATE__ */ Modified: trunk/reactos/dll/win32/msi/msiquery.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" -//#include "winnls.h" - -#include "query.h" -#include <msiserver.h> - -//#include "initguid.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/package.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,39 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "winnls.h" -#include <shlwapi.h> -#include <wingdi.h> -#include <wincon.h> -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objidl.h" -//#include "wincrypt.h" -//#include "winuser.h" +#include "msipriv.h" + #include <wininet.h> -//#include "winver.h" -//#include "urlmon.h" -#include <shlobj.h> -#include <wine/unicode.h> -//#include "objbase.h" -//#include "msidefs.h" -#include <sddl.h> - -#include "msipriv.h" -#include <msiserver.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/patch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -19,19 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> -#include <shlwapi.h> -#include <wine/debug.h> -#include <wine/unicode.h> #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/query.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/query.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/query.h [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -20,18 +20,6 @@ #ifndef __WINE_MSI_QUERY_H #define __WINE_MSI_QUERY_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msi.h" -//#include "msiquery.h" -#include "msipriv.h" -//#include "wine/list.h" - #define OP_EQ 1 #define OP_AND 2 Modified: trunk/reactos/dll/win32/msi/record.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/record.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/record.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -//#include "msiquery.h" #include "msipriv.h" -//#include "objidl.h" -//#include "winnls.h" -#include <ole2.h> - -#include <winreg.h> -#include <shlwapi.h> - -//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/registry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -19,28 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> -//#include "winnls.h" -//#include "shlwapi.h" -#include <wine/debug.h> -//#include "msi.h" #include "msipriv.h" -//#include "wincrypt.h" -#include <wine/unicode.h> -//#include "winver.h" -//#include "winuser.h" -#include <sddl.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/script.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/script.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/script.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,25 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -//#include "winerror.h" -//#include "winuser.h" -//#include "msidefs.h" #include "msipriv.h" + #include <activscp.h> -#include <oleauto.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -//#include "msiserver.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/select.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/select.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,27 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" #include "msipriv.h" -//#include "winnls.h" - -//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); - /* below is the query interface to a table */ Modified: trunk/reactos/dll/win32/msi/source.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/source.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/source.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,29 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> -//#include "winnls.h" -//#include "shlwapi.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" #include "msipriv.h" -//#include "wincrypt.h" -//#include "winver.h" -//#include "winuser.h" -#include <wine/unicode.h> -#include <sddl.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/sql.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/sql.tab.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -97,22 +97,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> - -#include <windef.h> -//#include "winbase.h" -#include "query.h" -//#include "wine/list.h" -#include <wine/debug.h> -#include <wine/unicode.h> +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/storages.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winerror.h" -#include <ole2.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" #include "msipriv.h" -//#include "query.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/streams.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" #include "msipriv.h" -//#include "query.h" - -#include <wine/debug.h> -//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/string.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/string.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -20,28 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -//#include <stdarg.h> -//#include <assert.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" #include "msipriv.h" -//#include "winnls.h" - -//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/suminfo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,31 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> -//#include "winnls.h" -//#include "shlwapi.h" -#include <wine/debug.h> -#include <wine/unicode.h> -#include <objbase.h> -//#include "objidl.h" +#include "msipriv.h" + #include <propvarutil.h> -//#include "msi.h" -//#include "msiquery.h" -#include <msidefs.h> -#include "msipriv.h" - -#include <msiserver.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/table.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "winnls.h" -//#include "msipriv.h" -#include "query.h" - -#include <wine/debug.h> -#include <wine/unicode.h> +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); Modified: trunk/reactos/dll/win32/msi/tokenize.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r…
============================================================================== --- trunk/reactos/dll/win32/msi/tokenize.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/tokenize.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -16,18 +16,7 @@ ** parser for analysis. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <ctype.h> -//#include <stdarg.h> -//#include <stdlib.h> - -//#include "windef.h" -//#include "winbase.h" -#include <wine/unicode.h> -#include "query.h" +#include "msipriv.h" #include "sql.tab.h" /* Modified: trunk/reactos/dll/win32/msi/update.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msi/update.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/update.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -18,27 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" -//#include "winnls.h" - -#include "query.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); - /* below is the query interface to a table */ Modified: trunk/reactos/dll/win32/msi/upgrade.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re…
============================================================================== --- trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -26,21 +26,7 @@ * RemoveExistingProducts (TODO) */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" -//#include "winerror.h" -#include <winreg.h> -#include <wine/debug.h> -//#include "msidefs.h" #include "msipriv.h" -//#include "winuser.h" -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(msi); Modified: trunk/reactos/dll/win32/msi/where.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/msi/where.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/where.c [iso-8859-1] Wed Dec 25 20:42:59 2013 @@ -19,26 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <assert.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "msi.h" -//#include "msiquery.h" -//#include "objbase.h" -//#include "objidl.h" -//#include "msipriv.h" -//#include "winnls.h" - -#include "query.h" +#include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb);
10 years, 12 months
1
0
0
0
[ekohl] 61415: [][LSASRV][MSV1_0] - Move the creation of the token owner SID from msv1_0 to lsasrv. - If the user is a member of the administrators group, the adminstrators group becomes the owner ...
by ekohl@svn.reactos.org
Author: ekohl Date: Wed Dec 25 18:15:53 2013 New Revision: 61415 URL:
http://svn.reactos.org/svn/reactos?rev=61415&view=rev
Log: [][LSASRV][MSV1_0] - Move the creation of the token owner SID from msv1_0 to lsasrv. - If the user is a member of the administrators group, the adminstrators group becomes the owner of the token. Otheriwse, the user is the owner of the token. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lookup.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Wed Dec 25 18:15:53 2013 @@ -645,6 +645,47 @@ static NTSTATUS +LsapSetTokenOwner( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + PSID OwnerSid = NULL; + ULONG i, Length; + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + if (TokenInfo1->Owner.Owner != NULL) + return STATUS_SUCCESS; + + OwnerSid = TokenInfo1->User.User.Sid; + for (i = 0; i < TokenInfo1->Groups->GroupCount; i++) + { + if (EqualSid(TokenInfo1->Groups->Groups[i].Sid, LsapAdministratorsSid)) + { + OwnerSid = LsapAdministratorsSid; + break; + } + } + + Length = RtlLengthSid(OwnerSid); + TokenInfo1->Owner.Owner = DispatchTable.AllocateLsaHeap(Length); + if (TokenInfo1->Owner.Owner == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(TokenInfo1->Owner.Owner, + OwnerSid, + Length); + } + + return STATUS_SUCCESS; +} + + +static +NTSTATUS LsapAddTokenDefaultDacl( IN PVOID TokenInformation, IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) @@ -821,6 +862,13 @@ goto done; } + Status = LsapSetTokenOwner(TokenInformation, + TokenInformationType); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetTokenOwner() failed (Status 0x%08lx)\n", Status); + goto done; + } Status = LsapAddTokenDefaultDacl(TokenInformation, TokenInformationType); Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Wed Dec 25 18:15:53 2013 @@ -81,6 +81,7 @@ LIST_ENTRY WellKnownSidListHead; PSID LsapLocalSystemSid = NULL; +PSID LsapAdministratorsSid = NULL; /* FUNCTIONS ***************************************************************/ @@ -521,7 +522,7 @@ szAccountName, szDomainName, SidTypeAlias, - NULL); + &LsapAdministratorsSid); /* Users Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, 80); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Wed Dec 25 18:15:53 2013 @@ -92,6 +92,7 @@ extern UNICODE_STRING AccountDomainName; extern PSID LsapLocalSystemSid; +extern PSID LsapAdministratorsSid; /* authpackage.c */ Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?…
============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Wed Dec 25 18:15:53 2013 @@ -271,8 +271,7 @@ BuildTokenGroups(IN PSID AccountDomainSid, IN PLUID LogonId, OUT PTOKEN_GROUPS *Groups, - OUT PSID *PrimaryGroupSid, - OUT PSID *OwnerSid) + OUT PSID *PrimaryGroupSid) { SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; @@ -374,7 +373,6 @@ TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY | SE_GROUP_LOGON_ID; GroupCount++; - *OwnerSid = Sid; /* Member of 'Local users */ RtlAllocateAndInitializeSid(&LocalAuthority, @@ -548,38 +546,12 @@ static NTSTATUS -BuildTokenOwner(PTOKEN_OWNER Owner, - PSID OwnerSid) -{ - ULONG RidCount; - ULONG Size; - - RidCount = *RtlSubAuthorityCountSid(OwnerSid); - Size = RtlLengthRequiredSid(RidCount); - - Owner->Owner = DispatchTable.AllocateLsaHeap(Size); - if (Owner->Owner == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(Owner->Owner, - OwnerSid, - Size); - - return STATUS_SUCCESS; -} - - -static -NTSTATUS BuildTokenInformationBuffer(PLSA_TOKEN_INFORMATION_V1 *TokenInformation, PRPC_SID AccountDomainSid, ULONG RelativeId, PLUID LogonId) { PLSA_TOKEN_INFORMATION_V1 Buffer = NULL; - PSID OwnerSid = NULL; PSID PrimaryGroupSid = NULL; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -604,8 +576,7 @@ Status = BuildTokenGroups((PSID)AccountDomainSid, LogonId, &Buffer->Groups, - &PrimaryGroupSid, - &OwnerSid); + &PrimaryGroupSid); if (!NT_SUCCESS(Status)) goto done; @@ -615,11 +586,6 @@ goto done; Status = BuildTokenPrivileges(&Buffer->Privileges); - if (!NT_SUCCESS(Status)) - goto done; - - Status = BuildTokenOwner(&Buffer->Owner, - OwnerSid); if (!NT_SUCCESS(Status)) goto done; @@ -649,9 +615,6 @@ if (Buffer->Privileges != NULL) DispatchTable.FreeLsaHeap(Buffer->Privileges); - - if (Buffer->Owner.Owner != NULL) - DispatchTable.FreeLsaHeap(Buffer->Owner.Owner); if (Buffer->DefaultDacl.DefaultDacl != NULL) DispatchTable.FreeLsaHeap(Buffer->DefaultDacl.DefaultDacl);
10 years, 12 months
1
0
0
0
[akhaldi] 61414: [MSHTML] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in ...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 17:40:49 2013 New Revision: 61414 URL:
http://svn.reactos.org/svn/reactos?rev=61414&view=rev
Log: [MSHTML] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mshtml/guid.c (with props) Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/mshtml/conpoint.c trunk/reactos/dll/win32/mshtml/dispex.c trunk/reactos/dll/win32/mshtml/editor.c trunk/reactos/dll/win32/mshtml/hlink.c trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlattr.c trunk/reactos/dll/win32/mshtml/htmlbody.c trunk/reactos/dll/win32/mshtml/htmlcomment.c trunk/reactos/dll/win32/mshtml/htmlcurstyle.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmldoc3.c trunk/reactos/dll/win32/mshtml/htmldoc5.c trunk/reactos/dll/win32/mshtml/htmlelem.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlelem3.c trunk/reactos/dll/win32/mshtml/htmlelemcol.c trunk/reactos/dll/win32/mshtml/htmlembed.c trunk/reactos/dll/win32/mshtml/htmlevent.c trunk/reactos/dll/win32/mshtml/htmlform.c trunk/reactos/dll/win32/mshtml/htmlframe.c trunk/reactos/dll/win32/mshtml/htmlframebase.c trunk/reactos/dll/win32/mshtml/htmlgeneric.c trunk/reactos/dll/win32/mshtml/htmlhead.c trunk/reactos/dll/win32/mshtml/htmliframe.c trunk/reactos/dll/win32/mshtml/htmlimg.c trunk/reactos/dll/win32/mshtml/htmlinput.c trunk/reactos/dll/win32/mshtml/htmllink.c trunk/reactos/dll/win32/mshtml/htmllocation.c trunk/reactos/dll/win32/mshtml/htmlmeta.c trunk/reactos/dll/win32/mshtml/htmlnode.c trunk/reactos/dll/win32/mshtml/htmlobject.c trunk/reactos/dll/win32/mshtml/htmloption.c trunk/reactos/dll/win32/mshtml/htmlscreen.c trunk/reactos/dll/win32/mshtml/htmlscript.c trunk/reactos/dll/win32/mshtml/htmlselect.c trunk/reactos/dll/win32/mshtml/htmlstorage.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle2.c trunk/reactos/dll/win32/mshtml/htmlstyle3.c trunk/reactos/dll/win32/mshtml/htmlstyleelem.c trunk/reactos/dll/win32/mshtml/htmlstylesheet.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltablecell.c trunk/reactos/dll/win32/mshtml/htmltablerow.c trunk/reactos/dll/win32/mshtml/htmltextarea.c trunk/reactos/dll/win32/mshtml/htmltextcont.c trunk/reactos/dll/win32/mshtml/htmltextnode.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/ifacewrap.c trunk/reactos/dll/win32/mshtml/ipwindow.c trunk/reactos/dll/win32/mshtml/lang/Bg.rc trunk/reactos/dll/win32/mshtml/lang/Da.rc trunk/reactos/dll/win32/mshtml/lang/De.rc trunk/reactos/dll/win32/mshtml/lang/En.rc trunk/reactos/dll/win32/mshtml/lang/Es.rc trunk/reactos/dll/win32/mshtml/lang/Fi.rc trunk/reactos/dll/win32/mshtml/lang/Fr.rc trunk/reactos/dll/win32/mshtml/lang/He.rc trunk/reactos/dll/win32/mshtml/lang/Hu.rc trunk/reactos/dll/win32/mshtml/lang/It.rc trunk/reactos/dll/win32/mshtml/lang/Ja.rc trunk/reactos/dll/win32/mshtml/lang/Ko.rc trunk/reactos/dll/win32/mshtml/lang/Lt.rc trunk/reactos/dll/win32/mshtml/lang/Nl.rc trunk/reactos/dll/win32/mshtml/lang/No.rc trunk/reactos/dll/win32/mshtml/lang/Pl.rc trunk/reactos/dll/win32/mshtml/lang/Pt.rc trunk/reactos/dll/win32/mshtml/lang/Ro.rc trunk/reactos/dll/win32/mshtml/lang/Ru.rc trunk/reactos/dll/win32/mshtml/lang/Si.rc trunk/reactos/dll/win32/mshtml/lang/Sv.rc trunk/reactos/dll/win32/mshtml/lang/Tr.rc trunk/reactos/dll/win32/mshtml/lang/Uk.rc trunk/reactos/dll/win32/mshtml/lang/Zh.rc trunk/reactos/dll/win32/mshtml/loadopts.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/mutation.c trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/npplugin.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsevents.c trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/nsservice.c trunk/reactos/dll/win32/mshtml/olecmd.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/olewnd.c trunk/reactos/dll/win32/mshtml/omnavigator.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/pluginhost.c trunk/reactos/dll/win32/mshtml/propbag.c trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/mshtml/resource.h trunk/reactos/dll/win32/mshtml/rsrc.rc trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/dll/win32/mshtml/secmgr.c trunk/reactos/dll/win32/mshtml/selection.c trunk/reactos/dll/win32/mshtml/service.c trunk/reactos/dll/win32/mshtml/task.c trunk/reactos/dll/win32/mshtml/txtrange.c trunk/reactos/dll/win32/mshtml/view.c Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList…
============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -85,6 +85,7 @@ task.c txtrange.c view.c + guid.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) Modified: trunk/reactos/dll/win32/mshtml/conpoint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/conpoint.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/conpoint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/conpoint.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const char *debugstr_cp_guid(REFIID riid) { Modified: trunk/reactos/dll/win32/mshtml/dispex.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/dispex.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define MAX_ARGS 16 Modified: trunk/reactos/dll/win32/mshtml/editor.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/editor.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/editor.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <mshtmcid.h> -#include <shlguid.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_ALIGN "cmd_align" #define NSCMD_BEGINLINE "cmd_beginLine" Added: trunk/reactos/dll/win32/mshtml/guid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/guid.c?re…
============================================================================== --- trunk/reactos/dll/win32/mshtml/guid.c (added) +++ trunk/reactos/dll/win32/mshtml/guid.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -0,0 +1,29 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <nsiface.h> + +DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_MailtoProtocol, 0x3050F3DA, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_SysimageProtocol, 0x76E67A63, 0x06E9, 0x11D2, 0xA8,0x40, 0x00,0x60,0x08,0x05,0x93,0x82); + +DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); + +DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); + +DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58); +DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8); + +DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mshtml/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mshtml/hlink.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/hlink.c?r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/hlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/hlink.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /********************************************************** * IHlinkTarget implementation Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlanchor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlanchor.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <stdio.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" -#include "htmlevent.h" -#include "binding.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlattr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlattr.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlattr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlattr.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlbody.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlbody.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLTextContainer textcont; Modified: trunk/reactos/dll/win32/mshtml/htmlcomment.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcomme…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlcomment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlcomment.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLCommentElement { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlcurstyle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcurst…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlcurstyle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlcurstyle.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" -#include "htmlstyle.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLCurrentStyle { DispatchEx dispex; Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmldoc.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,33 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wininet.h> -#include <ole2.h> -//#include "perhist.h" -#include <mshtmdid.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" -#include "pluginhost.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLDocument *impl_from_IHTMLDocument2(IHTMLDocument2 *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmldoc3.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmldoc3.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmldoc3.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,28 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret) { Modified: trunk/reactos/dll/win32/mshtml/htmldoc5.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc5.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmldoc5.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmldoc5.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLDocument *impl_from_IHTMLDocument5(IHTMLDocument5 *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlelem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlelem.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,28 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> -//#include "shlwapi.h" - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" -#include "htmlstyle.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR aW[] = {'A',0}; static const WCHAR bodyW[] = {'B','O','D','Y',0}; Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlelem2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlelem2.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> -#include <math.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" -#include "htmlstyle.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; Modified: trunk/reactos/dll/win32/mshtml/htmlelem3.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem3…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlelem3.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlelem3.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLElement *impl_from_IHTMLElement3(IHTMLElement3 *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmlelemcol.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelemc…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlelemcol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlelemcol.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; Modified: trunk/reactos/dll/win32/mshtml/htmlembed.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlembed…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlembed.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlembed.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlevent.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlevent.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlevent.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <mshtmdid.h> - #include "mshtml_private.h" -#include "htmlevent.h" -#include "htmlscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IDispatch *handler_prop; Modified: trunk/reactos/dll/win32/mshtml/htmlform.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlform.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlform.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLFormElement { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlframe.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlframe.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLFrameBase framebase; Modified: trunk/reactos/dll/win32/mshtml/htmlframebase.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlframebase.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlframebase.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" -#include "binding.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR autoW[] = {'a','u','t','o',0}; static const WCHAR yesW[] = {'y','e','s',0}; Modified: trunk/reactos/dll/win32/mshtml/htmlgeneric.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlgener…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlgeneric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlgeneric.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlhead.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlhead.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlhead.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlhead.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmliframe.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlifram…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmliframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmliframe.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLFrameBase framebase; Modified: trunk/reactos/dll/win32/mshtml/htmlimg.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlimg.c…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlimg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlimg.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlinput.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlinput.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> +#include "mshtml_private.h" + #include <limits.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - -#include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmllink.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllink.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmllink.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <assert.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmllocation.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmllocation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmllocation.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,28 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> -#include <wininet.h> -//#include "shlwapi.h" - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "binding.h" -//#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) { Modified: trunk/reactos/dll/win32/mshtml/htmlmeta.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlmeta.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlmeta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlmeta.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlnode.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlnode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlnode.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HTMLDOMNode *get_node_obj(IHTMLDOMNode*); static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); Modified: trunk/reactos/dll/win32/mshtml/htmlobject.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlobjec…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlobject.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <assert.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "pluginhost.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLPluginContainer plugin_container; Modified: trunk/reactos/dll/win32/mshtml/htmloption.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmloptio…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmloption.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmloption.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLOptionElement { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlscreen.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscree…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlscreen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlscreen.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlscript.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlscript.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmlselect.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlselect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlselect.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlstorage.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstora…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlstorage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlstorage.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlstyle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlstyle.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> -#include <math.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <mshtmdid.h> - #include "mshtml_private.h" -#include "htmlstyle.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR attrBackground[] = {'b','a','c','k','g','r','o','u','n','d',0}; Modified: trunk/reactos/dll/win32/mshtml/htmlstyle2.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlstyle2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlstyle2.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" -#include "htmlstyle.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLStyle *impl_from_IHTMLStyle2(IHTMLStyle2 *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmlstyle3.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlstyle3.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlstyle3.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" -#include "htmlstyle.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLStyle *impl_from_IHTMLStyle3(IHTMLStyle3 *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmlstyleelem.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlstyleelem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlstyleelem.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <assert.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlstylesheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlstylesheet.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLStyleSheet { DispatchEx dispex; Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmltable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmltable.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLTable { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmltablecell.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmltablecell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmltablecell.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmltablerow.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmltablerow.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmltablerow.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmltextarea.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltexta…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmltextarea.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmltextarea.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; Modified: trunk/reactos/dll/win32/mshtml/htmltextcont.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextc…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmltextcont.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmltextcont.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static inline HTMLTextContainer *impl_from_IHTMLTextContainer(IHTMLTextContainer *iface) { Modified: trunk/reactos/dll/win32/mshtml/htmltextnode.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmltextnode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmltextnode.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - #include "mshtml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLDOMTextNode { HTMLDOMNode node; Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo…
============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlwindow.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlwindow.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,35 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <mshtmdid.h> -#include <shlguid.h> -#include <shobjidl.h> +#include "mshtml_private.h" + #include <exdispid.h> - -#define NO_SHLWAPI_REG -#include "shlwapi.h" - -#include <wine/debug.h> - -#include "mshtml_private.h" -#include "htmlevent.h" -#include "htmlscript.h" -#include "binding.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static struct list window_list = LIST_INIT(window_list); Modified: trunk/reactos/dll/win32/mshtml/ifacewrap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ifacewrap…
============================================================================== --- trunk/reactos/dll/win32/mshtml/ifacewrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/ifacewrap.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* * This object wraps any unrecognized interface overriding its IUnknown methods, allowing Modified: trunk/reactos/dll/win32/mshtml/ipwindow.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ipwindow.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/ipwindow.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/ipwindow.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "shlobj.h" - #include "mshtml_private.h" -#include "pluginhost.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IOleInPlaceFrame IOleInPlaceFrame_iface; Modified: trunk/reactos/dll/win32/mshtml/lang/Bg.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Bg.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Bg.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Da.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Da.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Da.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/De.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/De.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/De.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mshtml/lang/En.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/En.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/En.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Es.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Es.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Es.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mshtml/lang/Fi.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Fi.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Fi.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Fr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Fr.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Fr.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/He.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/He.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/He.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Hu.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Hu.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Hu.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/It.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/It.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/It.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /*UTF-8*/ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Ja.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ja.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Ja.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Ko.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ko.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Ko.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Lt.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Lt.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Lt.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Nl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Nl.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Nl.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mshtml/lang/No.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/No.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/No.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Pl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Pl.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Pl.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Pt.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Pt.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Pt.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Ro.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ro.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Ro.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mshtml/lang/Ru.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ru.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Ru.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Si.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Si.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Si.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Sv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Sv.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Sv.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mshtml/lang/Tr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Tr.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Tr.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mshtml/lang/Uk.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Uk.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Uk.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/lang/Zh.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Zh.r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/lang/Zh.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "resource.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mshtml/loadopts.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/loadopts.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/loadopts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/loadopts.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <optary.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct load_opt { DWORD option; Modified: trunk/reactos/dll/win32/mshtml/main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re…
============================================================================== --- trunk/reactos/dll/win32/mshtml/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/main.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -20,32 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winreg.h> -#include <ole2.h> +#include "mshtml_private.h" + #include <advpub.h> -//#include "shlwapi.h" -#include <optary.h> -#include "rpcproxy.h" -#include <shlguid.h> - -#include <wine/debug.h> - -#define INIT_GUID -#include "mshtml_private.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#include <rpcproxy.h> +#include <initguid.h> HINSTANCE hInst; DWORD mshtml_tls = TLS_OUT_OF_INDEXES; Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr…
============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml_private.h [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,28 +16,47 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <math.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> #include <wingdi.h> -#include "docobj.h" -#include "docobjectservice.h" -#include <comcat.h> -#include <mshtml.h> +#include <ole2.h> +#include <docobjectservice.h> #include <mshtmhst.h> -#include <hlink.h> +#include <mshtmcid.h> +#include <mshtmdid.h> #include <perhist.h> -#include <dispex.h> -#include "objsafe.h" -#include "htiframe.h" -#include "tlogstg.h" +#include <objsafe.h> +#include <htiframe.h> +#include <tlogstg.h> #include <shdeprecated.h> +#include <shlguid.h> +#define NO_SHLWAPI_REG +#include <shlwapi.h> +#include <optary.h> +#include <idispids.h> +#include <wininet.h> +#include <nsiface.h> #include <wine/list.h> #include <wine/unicode.h> -#ifdef INIT_GUID -#include <initguid.h> -#endif - -#include <nsiface.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_ERROR_GENERATE_FAILURE(module,code) \ ((nsresult) (((UINT32)(1<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) @@ -1178,3 +1197,10 @@ void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; + +#include "binding.h" +#include "htmlevent.h" +#include "htmlscript.h" +#include "htmlstyle.h" +#include "pluginhost.h" +#include "resource.h" Modified: trunk/reactos/dll/win32/mshtml/mutation.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/mutation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mutation.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,31 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> -#include <shlguid.h> - #include "mshtml_private.h" -#include "htmlscript.h" -#include "htmlevent.h" -#include "binding.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define IE_MAJOR_VERSION 7 #define IE_MINOR_VERSION 0 Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/navigate.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,37 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winreg.h> -#include <ole2.h> +#include "mshtml_private.h" + #include <hlguids.h> -#include <shlguid.h> -#include <wininet.h> -#include <shlwapi.h> -#include "htiface.h" -#include "shdeprecated.h" - -#include <wine/debug.h> - -#include "mshtml_private.h" -#include "htmlscript.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#include <htiface.h> #define CONTENT_LENGTH "Content-Length" #define UTF8_STR "utf-8" Modified: trunk/reactos/dll/win32/mshtml/npplugin.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/npplugin.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/npplugin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/npplugin.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "shlobj.h" - #include "mshtml_private.h" -#include "pluginhost.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* Parts of npapi.h */ Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c…
============================================================================== --- trunk/reactos/dll/win32/mshtml/nsembed.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsembed.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,31 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winreg.h> -#include <ole2.h> -#include "shlobj.h" -#include "shlwapi.h" - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlevent.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#include <wincon.h> +#include <shlobj.h> + WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" Modified: trunk/reactos/dll/win32/mshtml/nsevents.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/nsevents.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsevents.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,31 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <mshtmcid.h> -#include <shlguid.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlscript.h" -#include "htmlevent.h" -#include "binding.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const PRUnichar blurW[] = {'b','l','u','r',0}; static const PRUnichar focusW[] = {'f','o','c','u','s',0}; Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re…
============================================================================== --- trunk/reactos/dll/win32/mshtml/nsio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsio.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,31 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winreg.h> -#include <ole2.h> -#include <shlguid.h> -#include <wininet.h> -#include <shlwapi.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_IOSERVICE_CLASSNAME "nsIOService" #define NS_IOSERVICE_CONTRACTID "@mozilla.org/network/io-service;1" Modified: trunk/reactos/dll/win32/mshtml/nsservice.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsservice…
============================================================================== --- trunk/reactos/dll/win32/mshtml/nsservice.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsservice.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_PROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/prompt-service;1" #define NS_TOOLTIPTEXTPROVIDER_CONTRACTID "@mozilla.org/embedcomp/tooltiptextprovider;1" Modified: trunk/reactos/dll/win32/mshtml/olecmd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/olecmd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/olecmd.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,29 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <shlguid.h> -//#include "mshtmdid.h" -//#include "idispids.h" -#include <mshtmcid.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "binding.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_COPY "cmd_copy" Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/oleobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/oleobj.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,30 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <shlguid.h> -#include <shdeprecated.h> -#include <mshtmdid.h> -#include <idispids.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOCHOST_DOCCANNAVIGATE 0 Modified: trunk/reactos/dll/win32/mshtml/olewnd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olewnd.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/olewnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/olewnd.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" -//#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /********************************************************** * IOleInPlaceActiveObject implementation Modified: trunk/reactos/dll/win32/mshtml/omnavigator.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat…
============================================================================== --- trunk/reactos/dll/win32/mshtml/omnavigator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/omnavigator.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #ifdef __REACTOS__ /* HACK This is a Vista+ API */ Modified: trunk/reactos/dll/win32/mshtml/persist.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c…
============================================================================== --- trunk/reactos/dll/win32/mshtml/persist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/persist.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,37 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <shlguid.h> -#include <idispids.h> - -#define NO_SHLWAPI_REG -#include "shlwapi.h" - -#include <wine/debug.h> - #include "mshtml_private.h" -#include "htmlscript.h" -#include "htmlevent.h" -#include "binding.h" -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* Undocumented notification, see tests */ #define CMDID_EXPLORER_UPDATEHISTORY 38 Modified: trunk/reactos/dll/win32/mshtml/pluginhost.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos…
============================================================================== --- trunk/reactos/dll/win32/mshtml/pluginhost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/pluginhost.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,29 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <stdarg.h> -#include <assert.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "shlobj.h" -#include <mshtmdid.h> - #include "mshtml_private.h" -#include "pluginhost.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); const IID IID_HTMLPluginContainer = {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; Modified: trunk/reactos/dll/win32/mshtml/propbag.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/propbag.c…
============================================================================== --- trunk/reactos/dll/win32/mshtml/propbag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/propbag.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "shlobj.h" - #include "mshtml_private.h" -#include "pluginhost.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IPropertyBag IPropertyBag_iface; Modified: trunk/reactos/dll/win32/mshtml/protocol.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/protocol.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /******************************************************************** * common ProtocolFactory implementation Modified: trunk/reactos/dll/win32/mshtml/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/resource.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/resource.h [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,9 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> -#include <commctrl.h> +#pragma once #define IDS_HTMLDOCUMENT 7501 Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r…
============================================================================== --- trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,10 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" +#include <windef.h> #include <winuser.h> #include <commctrl.h> -//#include "mshtmcid.h" #include "resource.h" Modified: trunk/reactos/dll/win32/mshtml/script.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/script.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/script.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,32 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "activscp.h" +#include "mshtml_private.h" + #include <activdbg.h> - -#include <wine/debug.h> - -#include "mshtml_private.h" -#include "htmlscript.h" -#include "pluginhost.h" -#include "htmlevent.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #ifdef _WIN64 Modified: trunk/reactos/dll/win32/mshtml/secmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/secmgr.c?…
============================================================================== --- trunk/reactos/dll/win32/mshtml/secmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/secmgr.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,28 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> +#include "mshtml_private.h" + #include <activscp.h> - -#include <wine/debug.h> - -#include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; Modified: trunk/reactos/dll/win32/mshtml/selection.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/selection…
============================================================================== --- trunk/reactos/dll/win32/mshtml/selection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/selection.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IHTMLSelectionObject IHTMLSelectionObject_iface; Modified: trunk/reactos/dll/win32/mshtml/service.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/service.c…
============================================================================== --- trunk/reactos/dll/win32/mshtml/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/service.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IOleUndoManager IOleUndoManager_iface; Modified: trunk/reactos/dll/win32/mshtml/task.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re…
============================================================================== --- trunk/reactos/dll/win32/mshtml/task.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/task.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,27 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -#include <stdio.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define WM_PROCESSTASK 0x8008 #define TIMER_ID 0x3000 Modified: trunk/reactos/dll/win32/mshtml/txtrange.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.…
============================================================================== --- trunk/reactos/dll/win32/mshtml/txtrange.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/txtrange.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <mshtmcid.h> - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR brW[] = {'b','r',0}; static const WCHAR hrW[] = {'h','r',0}; Modified: trunk/reactos/dll/win32/mshtml/view.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re…
============================================================================== --- trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] Wed Dec 25 17:40:49 2013 @@ -16,28 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "commctrl.h" -#include <ole2.h> -#include "resource.h" - -#include <wine/debug.h> - #include "mshtml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define TIMER_ID 0x1000
10 years, 12 months
1
0
0
0
[akhaldi] 61413: [MSGINA] * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 15:55:48 2013 New Revision: 61413 URL:
http://svn.reactos.org/svn/reactos?rev=61413&view=rev
Log: [MSGINA] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msgina/stubs.c trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed Dec 25 15:55:48 2013 @@ -6,8 +6,6 @@ */ #include "msgina.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msgina); typedef struct _DISPLAYSTATUSMSG { Modified: trunk/reactos/dll/win32/msgina/msgina.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?…
============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Wed Dec 25 15:55:48 2013 @@ -25,8 +25,6 @@ */ #include "msgina.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msgina); HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?…
============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Wed Dec 25 15:55:48 2013 @@ -1,3 +1,6 @@ +#ifndef _MSGINA_H +#define _MSGINA_H + #define WIN32_NO_STATUS #include <stdarg.h> @@ -12,7 +15,9 @@ #include <winuser.h> #include <userenv.h> #include <winwlx.h> + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msgina); #include "resource.h" @@ -76,4 +81,6 @@ IN PWSTR Domain, IN PWSTR Password); +#endif /* _MSGINA_H */ + /* EOF */ Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc…
============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Wed Dec 25 15:55:48 2013 @@ -65,4 +65,4 @@ #endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" -#endif +#endif Modified: trunk/reactos/dll/win32/msgina/stubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r…
============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Wed Dec 25 15:55:48 2013 @@ -10,8 +10,6 @@ */ #include "msgina.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msgina); /* * @unimplemented Modified: trunk/reactos/dll/win32/msgina/tui.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev…
============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] Wed Dec 25 15:55:48 2013 @@ -6,8 +6,6 @@ */ #include "msgina.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msgina); static BOOL TUIInitialize(
10 years, 12 months
1
0
0
0
[akhaldi] 61412: [MSCTF] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in t...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 15:51:35 2013 New Revision: 61412 URL:
http://svn.reactos.org/svn/reactos?rev=61412&view=rev
Log: [MSCTF] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/msctf/categorymgr.c trunk/reactos/dll/win32/msctf/compartmentmgr.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/displayattributemgr.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/langbarmgr.c trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/range.c trunk/reactos/dll/win32/msctf/threadmgr.c Modified: trunk/reactos/dll/win32/msctf/categorymgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg…
============================================================================== --- trunk/reactos/dll/win32/msctf/categorymgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/categorymgr.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -#include <winreg.h> -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> - -#include <wine/unicode.h> - -#include <msctf.h> #include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagCategoryMgr { ITfCategoryMgr ITfCategoryMgr_iface; Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen…
============================================================================== --- trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,34 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> +#include "msctf_internal.h" + #include <oleauto.h> -#include <olectl.h> - -//#include "wine/unicode.h" -#include <wine/list.h> - -#include <msctf.h> -#include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagCompartmentValue { struct list entry; Modified: trunk/reactos/dll/win32/msctf/context.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?…
============================================================================== --- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,33 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> -#include <olectl.h> - -//#include "wine/unicode.h" -#include <wine/list.h> - -#include <msctf.h> #include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagContextSink { struct list entry; Modified: trunk/reactos/dll/win32/msctf/displayattributemgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/displayatt…
============================================================================== --- trunk/reactos/dll/win32/msctf/displayattributemgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/displayattributemgr.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <wine/debug.h> -#include <winbase.h> -#include <winreg.h> -#include <shlwapi.h> - -#include <msctf.h> -//#include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); +#include "msctf_internal.h" typedef struct tagDisplayAttributeMgr { ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface; Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg…
============================================================================== --- trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> - -//#include "wine/unicode.h" - -#include <msctf.h> #include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagDocumentMgr { ITfDocumentMgr ITfDocumentMgr_iface; Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce…
============================================================================== --- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,33 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -#include <winreg.h> -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> -#include <olectl.h> - -#include <wine/unicode.h> -#include <wine/list.h> - -#include <msctf.h> #include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0}; Modified: trunk/reactos/dll/win32/msctf/langbarmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr…
============================================================================== --- trunk/reactos/dll/win32/msctf/langbarmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/langbarmgr.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <wine/debug.h> -#include <winbase.h> -#include <winreg.h> -#include <shlwapi.h> - -#include <msctf.h> -//#include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); +#include "msctf_internal.h" typedef struct tagLangBarMgr { ITfLangBarMgr ITfLangBarMgr_iface; Modified: trunk/reactos/dll/win32/msctf/msctf.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re…
============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,32 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <wine/debug.h> -#include <wine/list.h> -//#include "windef.h" -#include <winbase.h> -#include <winreg.h> -#include <shlwapi.h> -//#include "shlguid.h" -//#include "comcat.h" +#include "msctf_internal.h" + #include <rpcproxy.h> -#include <msctf.h> #include <inputscope.h> - -#include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); static LONG MSCTF_refCount; Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte…
============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -20,6 +20,30 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <olectl.h> +#include <msctf.h> +#include <shlwapi.h> + +#include <wine/list.h> +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msctf); #define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 @@ -67,4 +91,5 @@ extern const WCHAR szwSystemTIPKey[]; extern const WCHAR szwSystemCTFKey[]; + #endif /* __WINE_MSCTF_I_H */ Modified: trunk/reactos/dll/win32/msctf/range.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/range.c?re…
============================================================================== --- trunk/reactos/dll/win32/msctf/range.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/range.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> - -//#include "wine/unicode.h" - -#include <msctf.h> -//#include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); +#include "msctf_internal.h" typedef struct tagRange { ITfRange ITfRange_iface; Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.…
============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Wed Dec 25 15:51:35 2013 @@ -18,33 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "shlwapi.h" -//#include "winerror.h" -#include <objbase.h> -#include <olectl.h> - -//#include "wine/unicode.h" -#include <wine/list.h> - -#include <msctf.h> #include "msctf_internal.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagThreadMgrSink { struct list entry;
10 years, 12 months
1
0
0
0
[akhaldi] 61411: [MSCOREE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 15:31:19 2013 New Revision: 61411 URL:
http://svn.reactos.org/svn/reactos?rev=61411&view=rev
Log: [MSCOREE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mscoree/guid.c (with props) Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt trunk/reactos/dll/win32/mscoree/assembly.c trunk/reactos/dll/win32/mscoree/config.c trunk/reactos/dll/win32/mscoree/cordebug.c trunk/reactos/dll/win32/mscoree/corruntimehost.c trunk/reactos/dll/win32/mscoree/metadata.c trunk/reactos/dll/win32/mscoree/metahost.c trunk/reactos/dll/win32/mscoree/mscoree_main.c trunk/reactos/dll/win32/mscoree/mscoree_private.h Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/CMakeLis…
============================================================================== --- trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -15,12 +15,13 @@ metadata.c metahost.c mscoree_main.c + guid.c mscoree.rc ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) add_library(mscoree SHARED ${SOURCE}) set_module_type(mscoree win32dll) -target_link_libraries(mscoree wine uuid) +target_link_libraries(mscoree uuid wine) add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mscoree/assembly.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/assembly…
============================================================================== --- trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,28 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" +#include "mscoree_private.h" + #include <winver.h> #include <dbghelp.h> -#include <ole2.h> -//#include "mscoree.h" -#include <corhdr.h> -#include <metahost.h> -#include <cordebug.h> -#include <wine/list.h> -#include "mscoree_private.h" - -//#include "wine/debug.h" -//#include "wine/unicode.h" typedef struct { Modified: trunk/reactos/dll/win32/mscoree/config.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/config.c…
============================================================================== --- trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,30 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include "mscoree_private.h" + #include <ole2.h> +#include <shlwapi.h> +#include <initguid.h> #include <msxml2.h> -//#include "mscoree.h" -#include <corhdr.h> -#include <metahost.h> -#include <cordebug.h> -#include <wine/list.h> -#include "mscoree_private.h" -#include <shlwapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); enum parse_state { Modified: trunk/reactos/dll/win32/mscoree/cordebug.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/cordebug…
============================================================================== --- trunk/reactos/dll/win32/mscoree/cordebug.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/cordebug.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -17,32 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> - -//#include "winuser.h" -//#include "winnls.h" -//#include "winreg.h" -#include <ole2.h> -//#include "shellapi.h" -//#include "mscoree.h" -#include <corhdr.h> -#include <metahost.h> -#include <cordebug.h> -#include <wine/list.h> #include "mscoree_private.h" -#include <wine/debug.h> - - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); typedef struct DebugProcess { Modified: trunk/reactos/dll/win32/mscoree/corruntimehost.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/corrunti…
============================================================================== --- trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -17,37 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS +#include "mscoree_private.h" #include <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <winreg.h> -#include <ole2.h> #include <shellapi.h> - -#include <cor.h> -//#include "mscoree.h" -#include <metahost.h> -//#include "corhdr.h" -#include <cordebug.h> -#include <wine/list.h> -#include "mscoree_private.h" - -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); - #include <initguid.h> DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13); Added: trunk/reactos/dll/win32/mscoree/guid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/guid.c?r…
============================================================================== --- trunk/reactos/dll/win32/mscoree/guid.c (added) +++ trunk/reactos/dll/win32/mscoree/guid.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -0,0 +1,17 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <cor.h> +#include <cordebug.h> +#include <metahost.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mscoree/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mscoree/metadata.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metadata…
============================================================================== --- trunk/reactos/dll/win32/mscoree/metadata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/metadata.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,32 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdio.h> -#include <stdarg.h> -//#include <assert.h> - -#define COBJMACROS - -//#include "wine/library.h" -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <ole2.h> -#include <cor.h> -//#include "mscoree.h" -//#include "corhdr.h" -//#include "cordebug.h" -//#include "metahost.h" -//#include "wine/list.h" -//#include "mscoree_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +#include "mscoree_private.h" typedef struct MetaDataDispenser { Modified: trunk/reactos/dll/win32/mscoree/metahost.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metahost…
============================================================================== --- trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -18,36 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "mscoree_private.h" #include <stdio.h> -//#include <stdarg.h> #include <assert.h> -#define COBJMACROS - -#include <wine/unicode.h> #include <wine/library.h> -//#include "windef.h" -//#include "winbase.h" -#include <winreg.h> -#include <ole2.h> - -//#include "corerror.h" -#include <cor.h> -//#include "mscoree.h" -//#include "corhdr.h" -#include <cordebug.h> -#include <metahost.h> + #include <fusion.h> -#include <wine/list.h> -#include "mscoree_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0}; Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_…
============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -19,40 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> - -#define COBJMACROS -#include <wine/unicode.h> -//#include "wine/library.h" -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" -#include <winreg.h> -#include <ole2.h> -#include <ocidl.h> -//#include "shellapi.h" - -#include <initguid.h> -#include <msxml2.h> -//#include "corerror.h" -#include <cor.h> -//#include "mscoree.h" -//#include "corhdr.h" -#include <cordebug.h> -#include <metahost.h> -//#include "fusion.h" -#include <wine/list.h> #include "mscoree_private.h" + #include <rpcproxy.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); static HINSTANCE MSCOREE_hInstance; Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_…
============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] Wed Dec 25 15:31:19 2013 @@ -19,6 +19,29 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <cor.h> +#include <corhdr.h> +#include <cordebug.h> +#include <metahost.h> + +#include <wine/list.h> +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); extern char *WtoA(LPCWSTR wstr) DECLSPEC_HIDDEN;
10 years, 12 months
1
0
0
0
[akhaldi] 61410: [MMDEVAPI] * Improve the GUIDs situation. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Dec 25 15:19:53 2013 New Revision: 61410 URL:
http://svn.reactos.org/svn/reactos?rev=61410&view=rev
Log: [MMDEVAPI] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mmdevapi/guid.c (with props) Modified: trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h Modified: trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/CMakeLi…
============================================================================== --- trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/CMakeLists.txt [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -10,6 +10,7 @@ audiovolume.c devenum.c main.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi.def) Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum…
============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -18,12 +18,13 @@ #include "mmdevapi.h" +#include <wine/list.h> + +#include <ole2.h> +#include <initguid.h> #define _WINDOWS_H -#include <ole2.h> #include <dshow.h> #include <devpkey.h> - -#include <wine/list.h> static const WCHAR software_mmdevapi[] = { 'S','o','f','t','w','a','r','e','\\', Added: trunk/reactos/dll/win32/mmdevapi/guid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/guid.c?…
============================================================================== --- trunk/reactos/dll/win32/mmdevapi/guid.c (added) +++ trunk/reactos/dll/win32/mmdevapi/guid.c [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -0,0 +1,18 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <audiopolicy.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mmdevapi/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap…
============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Wed Dec 25 15:19:53 2013 @@ -32,7 +32,6 @@ #include <winbase.h> #include <wingdi.h> #include <winreg.h> -#include <initguid.h> #include <objbase.h> #include <audiopolicy.h> #include <endpointvolume.h>
10 years, 12 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Results per page:
10
25
50
100
200