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
June 2006
----- 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
19 participants
595 discussions
Start a n
N
ew thread
[janderwald] 22643: * move english resource file to own file * add german translation * patch provided by Daniel "EmuandCo" Reimer
by janderwald@svn.reactos.org
Author: janderwald Date: Tue Jun 27 00:14:36 2006 New Revision: 22643 URL:
http://svn.reactos.org/svn/reactos?rev=22643&view=rev
Log: * move english resource file to own file * add german translation * patch provided by Daniel "EmuandCo" Reimer Added: trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc Modified: trunk/reactos/base/applications/games/solitaire/sol.rc Added: trunk/reactos/base/applications/games/solitaire/de.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
============================================================================== --- trunk/reactos/base/applications/games/solitaire/de.rc (added) +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 00:14:36 2006 @@ -1,0 +1,129 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/de.rc + * PURPOSE: German Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ + +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// German resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,129,24,50,14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Spiel" + BEGIN + MENUITEM "&Karten geben\t F2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Deckblatt...", IDM_GAME_DECK + MENUITEM "&Optionen...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Beenden", IDM_GAME_EXIT + END + POPUP "&?" + BEGIN + MENUITEM "&Inhalt\tF1", IDM_HELP_CONTENTS + MENUITEM "Inf&o", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // German resources + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Added: trunk/reactos/base/applications/games/solitaire/en.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
============================================================================== --- trunk/reactos/base/applications/games/solitaire/en.rc (added) +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 00:14:36 2006 @@ -1,0 +1,129 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/en.rc + * PURPOSE: English Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ + +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// English (U.K.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Game" + BEGIN + MENUITEM "&Deal\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "De&ck...", IDM_GAME_DECK + MENUITEM "&Options...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Exit", IDM_GAME_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "&Contents\tF1", IDM_HELP_CONTENTS + MENUITEM "&About", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // English (U.K.) resources + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/games/solitaire/sol.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
============================================================================== --- trunk/reactos/base/applications/games/solitaire/sol.rc (original) +++ trunk/reactos/base/applications/games/solitaire/sol.rc Tue Jun 27 00:14:36 2006 @@ -1,144 +1,4 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MENU1 MENU DISCARDABLE -BEGIN - POPUP "&Game" - BEGIN - MENUITEM "&Deal\tF2", IDM_GAME_NEW - MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK - MENUITEM "&Options...", IDM_GAME_OPTIONS - MENUITEM SEPARATOR - MENUITEM "&Exit", IDM_GAME_EXIT - END - POPUP "&Help" - BEGIN - MENUITEM "&Contents\tF1", IDM_HELP_CONTENTS - MENUITEM "&About", IDM_HELP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE -BEGIN - VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT - VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // English (U.K.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +#include "De.rc" +#include "En.rc"
18 years, 6 months
1
0
0
0
[janderwald] 22642: fix include
by janderwald@svn.reactos.org
Author: janderwald Date: Mon Jun 26 23:37:26 2006 New Revision: 22642 URL:
http://svn.reactos.org/svn/reactos?rev=22642&view=rev
Log: fix include Modified: trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild Modified: trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/powrpro…
============================================================================== --- trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild (original) +++ trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild Mon Jun 26 23:37:26 2006 @@ -1,5 +1,5 @@ <module name="powrprof_winetest" type="win32cui" installbase="bin" installname="powrprof_winetest.exe" allowwarnings="true"> - <include base="setupapi_winetest">.</include> + <include base="powrprof_winetest">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" />
18 years, 6 months
1
0
0
0
[janderwald] 22641: remove unecessary include
by janderwald@svn.reactos.org
Author: janderwald Date: Mon Jun 26 23:30:49 2006 New Revision: 22641 URL:
http://svn.reactos.org/svn/reactos?rev=22641&view=rev
Log: remove unecessary include Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Mon Jun 26 23:30:49 2006 @@ -1,7 +1,7 @@ <module name="powercfg" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32" installname="powercfg.cpl" allowwarnings="true"> <importlibrary definition="powercfg.def" /> <include base="powercfg">.</include> - <include base="ReactOS">include/wine</include> + <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__REACTOS__" />
18 years, 6 months
1
0
0
0
[ion] 22640: - Fix the build...I hope/think
by ion@svn.reactos.org
Author: ion Date: Mon Jun 26 21:18:20 2006 New Revision: 22640 URL:
http://svn.reactos.org/svn/reactos?rev=22640&view=rev
Log: - Fix the build...I hope/think Modified: trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wpp/wpp.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/tools/unicode/unicode.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?…
============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Mon Jun 26 21:18:20 2006 @@ -97,7 +97,7 @@ UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude \ + -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk \ $(TOOLS_CFLAGS) .PHONY: unicode Modified: trunk/reactos/tools/widl/widl.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=22…
============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Mon Jun 26 21:18:20 2006 @@ -56,7 +56,7 @@ WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \ -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/winebuild/winebuild.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.…
============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Mon Jun 26 21:18:20 2006 @@ -32,7 +32,7 @@ WINEBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) -WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude/reactos/wine -Iinclude -Iinclude/reactos +WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/wmc/wmc.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=2264…
============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Mon Jun 26 21:18:20 2006 @@ -36,7 +36,7 @@ -DLONG="int" -DULONG="unsigned int" \ -DPULONG="unsigned int *" -DLONG_DEFINED \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/wpp/wpp.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.mak?rev=2264…
============================================================================== --- trunk/reactos/tools/wpp/wpp.mak (original) +++ trunk/reactos/tools/wpp/wpp.mak Mon Jun 26 21:18:20 2006 @@ -28,7 +28,7 @@ WPP_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WPP_SOURCES:.c=.o)) -WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -Iinclude/reactos -Iinclude $(TOOLS_CFLAGS) +WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk $(TOOLS_CFLAGS) .PHONY: wpp wpp: $(WPP_TARGET) Modified: trunk/reactos/tools/wrc/wrc.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2264…
============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Mon Jun 26 21:18:20 2006 @@ -59,7 +59,7 @@ -DPULONG="unsigned int *" -DLONG_DEFINED \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk WRC_HOST_LFLAGS = $(TOOLS_LFLAGS)
18 years, 6 months
1
0
0
0
[ion] 22639: - Sync with WINE's latest Heap implementation and try to remove some of the differences we had, and also document the ones which must be kept (our support for RTL_HEAP_COMMIT_ROUTINE and usage of user/kernel-mode lock APIs, etc). This reduces the heap/alloc regression tests to only 1 issue (which I'm working on fixing).
by ion@svn.reactos.org
Author: ion Date: Mon Jun 26 21:03:17 2006 New Revision: 22639 URL:
http://svn.reactos.org/svn/reactos?rev=22639&view=rev
Log: - Sync with WINE's latest Heap implementation and try to remove some of the differences we had, and also document the ones which must be kept (our support for RTL_HEAP_COMMIT_ROUTINE and usage of user/kernel-mode lock APIs, etc). This reduces the heap/alloc regression tests to only 1 issue (which I'm working on fixing). Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=22639&r…
============================================================================== --- trunk/reactos/lib/rtl/heap.c (original) +++ trunk/reactos/lib/rtl/heap.c Mon Jun 26 21:03:17 2006 @@ -6,18 +6,45 @@ * Copyright 1998 Ulrich Weigand */ -/* Note: the heap data structures are based on what Pietrek describes in his - * book 'Windows 95 System Programming Secrets'. The layout is not exactly - * the same, but could be easily adapted if it turns out some programs - * require it. - */ +// +// Note: This is a slightly modified implementation of WINE's. +// +// WINE's implementation is a hack based on Windows 95's heap implementation, +// itself a hack of DOS memory management.It supports 3 out of the 18 possible +// NT Heap Flags, does not support custom allocation/deallocation routines, +// and is about 50-80x slower with fragmentation rates up to 500x higher when +// compared to NT's LFH. WINE is lucky because the advanced NT Heap features are +// used in kernel-mode usually, not in user-mode, and they are crossing their +// fingers for this being the same. Note that several high-end SQL/Database +// applications would significantly benefit from custom heap features provided +// by NT. +// +// ROS's changes include: +// - Using Zw instead of Nt calls, because this matters when in Kernel Mode +// - Not using per-process heap lists while in Kernel Mode +// - Using a macro to handle the Critical Section, because it's meaningless +// in Kernel Mode. +// - Crappy support for a custom Commit routine. +// - Crappy support for User-defined flags and the User-defined value. +// - Ripping out all the code for shared heaps, because those don't exist on NT. +// +// Be aware of these changes when you try to sync something back. +// /* INCLUDES *****************************************************************/ #include <rtl.h> +#undef LIST_FOR_EACH +#undef LIST_FOR_EACH_SAFE +#include <wine/list.h> #define NDEBUG #include <debug.h> + +#define TRACE DPRINT +#define WARN DPRINT1 +#define ERR DPRINT1 +#define DPRINTF DPRINT /* FUNCTIONS *****************************************************************/ @@ -29,310 +56,377 @@ #define TRACE_ON(x) (1) #endif -static RTL_CRITICAL_SECTION RtlpProcessHeapsListLock; - +/* Note: the heap data structures are based on what Pietrek describes in his + * book 'Windows 95 System Programming Secrets'. The layout is not exactly + * the same, but could be easily adapted if it turns out some programs + * require it. + */ + +/* FIXME: use SIZE_T for 'size' structure members, but we need to make sure + * that there is no unaligned accesses to structure fields. + */ typedef struct tagARENA_INUSE { - ULONG size; /* Block size; must be the first field */ - USHORT threadId; /* Allocating thread id */ - USHORT magic; /* Magic number */ -} -ARENA_INUSE; + DWORD size; /* Block size; must be the first field */ + DWORD magic : 24; /* Magic number */ + DWORD unused_bytes : 8; /* Number of bytes in the block not used by user data (max value is HEAP_MIN_DATA_SIZE+HEAP_MIN_SHRINK_SIZE) */ +} ARENA_INUSE; typedef struct tagARENA_FREE { - ULONG size; /* Block size; must be the first field */ - USHORT threadId; /* Freeing thread id */ - USHORT magic; /* Magic number */ - struct tagARENA_FREE *next; /* Next free arena */ - struct tagARENA_FREE *prev; /* Prev free arena */ -} -ARENA_FREE; + DWORD size; /* Block size; must be the first field */ + DWORD magic; /* Magic number */ + struct list entry; /* Entry in free list */ +} ARENA_FREE; #define ARENA_FLAG_FREE 0x00000001 /* flags OR'ed with arena size */ #define ARENA_FLAG_PREV_FREE 0x00000002 -#define ARENA_SIZE_MASK 0xfffffffc -#define ARENA_INUSE_MAGIC 0x4842 /* Value for arena 'magic' field */ -#define ARENA_FREE_MAGIC 0x4846 /* Value for arena 'magic' field */ +#define ARENA_SIZE_MASK (~3) +#define ARENA_INUSE_MAGIC 0x455355 /* Value for arena 'magic' field */ +#define ARENA_FREE_MAGIC 0x45455246 /* Value for arena 'magic' field */ #define ARENA_INUSE_FILLER 0x55 #define ARENA_FREE_FILLER 0xaa +#define ALIGNMENT 8 /* everything is aligned on 8 byte boundaries */ +#define ROUND_SIZE(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + #define QUIET 1 /* Suppress messages */ #define NOISY 0 /* Report all errors */ +/* minimum data size (without arenas) of an allocated block */ +#define HEAP_MIN_DATA_SIZE 16 +/* minimum size that must remain to shrink an allocated block */ +#define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) + #define HEAP_NB_FREE_LISTS 4 /* Number of free lists */ /* Max size of the blocks on the free lists */ -static const ULONG HEAP_freeListSizes[HEAP_NB_FREE_LISTS] = - { - 0x20, 0x80, 0x200, 0xffffffff - }; +static const DWORD HEAP_freeListSizes[HEAP_NB_FREE_LISTS] = +{ + 0x20, 0x80, 0x200, ~0UL +}; typedef struct { - ULONG size; - ARENA_FREE arena; -} -FREE_LIST_ENTRY; + ARENA_FREE arena; +} FREE_LIST_ENTRY; struct tagHEAP; typedef struct tagSUBHEAP { - ULONG size; /* Size of the whole sub-heap */ - ULONG commitSize; /* Committed size of the sub-heap */ - ULONG headerSize; /* Size of the heap header */ - struct tagSUBHEAP *next; /* Next sub-heap */ - struct tagHEAP *heap; /* Main heap structure */ - ULONG magic; /* Magic number */ - ULONG UserFlags; - PVOID UserValue; -} -SUBHEAP, *PSUBHEAP; - -#define SUBHEAP_MAGIC ((ULONG)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) + DWORD size; /* Size of the whole sub-heap */ + DWORD commitSize; /* Committed size of the sub-heap */ + DWORD headerSize; /* Size of the heap header */ + struct tagSUBHEAP *next; /* Next sub-heap */ + struct tagHEAP *heap; /* Main heap structure */ + DWORD magic; /* Magic number */ + ULONG UserFlags; + PVOID UserValue; +} SUBHEAP; + +#define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) typedef struct tagHEAP { - SUBHEAP subheap; /* First sub-heap */ - struct tagHEAP *next; /* Next heap for this process */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ - RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - ULONG flags; /* Heap flags */ - ULONG magic; /* Magic number */ - PRTL_HEAP_COMMIT_ROUTINE commitRoutine; -} -HEAP, *PHEAP; - -#define HEAP_MAGIC ((ULONG)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) + SUBHEAP subheap; /* First sub-heap */ + struct list entry; /* Entry in process heap list */ + RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ + FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ + DWORD flags; /* Heap flags */ + DWORD magic; /* Magic number */ + PRTL_HEAP_COMMIT_ROUTINE commitRoutine; +} HEAP; + +#define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) #define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ -#define HEAP_MIN_BLOCK_SIZE (sizeof(ARENA_FREE) + 8) /* Min. heap block size */ #define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ - -static BOOLEAN HEAP_IsRealArena( HANDLE heap, ULONG flags, PVOID block, BOOLEAN quiet ); - +static HEAP *processHeap; /* main process heap */ + +static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL quiet ); + +/* mark a block of memory as free for debugging purposes */ +static __inline void mark_block_free( void *ptr, SIZE_T size ) +{ + if (TRACE_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); +#ifdef VALGRIND_MAKE_NOACCESS + VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); +#endif +} + +/* mark a block of memory as initialized for debugging purposes */ +static __inline void mark_block_initialized( void *ptr, SIZE_T size ) +{ +#ifdef VALGRIND_MAKE_READABLE + VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); +#endif +} + +/* mark a block of memory as uninitialized for debugging purposes */ +static __inline void mark_block_uninitialized( void *ptr, SIZE_T size ) +{ +#ifdef VALGRIND_MAKE_WRITABLE + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); +#endif + if (TRACE_ON(heap)) + { + memset( ptr, ARENA_INUSE_FILLER, size ); +#ifdef VALGRIND_MAKE_WRITABLE + /* make it uninitialized to valgrind again */ + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); +#endif + } +} + +/* clear contents of a block of memory */ +static __inline void clear_block( void *ptr, SIZE_T size ) +{ + mark_block_initialized( ptr, size ); + memset( ptr, 0, size ); +} + +/* locate a free list entry of the appropriate size */ +/* size is the size of the whole block including the arena header */ +static __inline unsigned int get_freelist_index( SIZE_T size ) +{ + unsigned int i; + + size -= sizeof(ARENA_FREE); + for (i = 0; i < HEAP_NB_FREE_LISTS - 1; i++) if (size <= HEAP_freeListSizes[i]) break; + return i; +} + +static RTL_CRITICAL_SECTION_DEBUG process_heap_critsect_debug = +{ + 0, 0, NULL, /* will be set later */ + { &process_heap_critsect_debug.ProcessLocksList, &process_heap_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": main process heap section") } +}; /*********************************************************************** * HEAP_Dump */ -VOID -HEAP_Dump(PHEAP heap) -{ - int i; - SUBHEAP *subheap; - char *ptr; - - DPRINT( "Heap: %p\n", heap ); - DPRINT( "Next: %p Sub-heaps: %p", - heap->next, &heap->subheap ); - subheap = &heap->subheap; - while (subheap->next) - { - DPRINT( " -> %p", subheap->next ); - subheap = subheap->next; - } - - DPRINT( "\nFree lists:\n Block Stat Size Id\n" ); - for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - DPRINT( "%p free %08lx %04x prev=%p next=%p\n", - &heap->freeList[i].arena, - heap->freeList[i].arena.size, - heap->freeList[i].arena.threadId, - heap->freeList[i].arena.prev, - heap->freeList[i].arena.next ); - - subheap = &heap->subheap; - while (subheap) - { - ULONG freeSize = 0, usedSize = 0, arenaSize = subheap->headerSize; - DPRINT( "\n\nSub-heap %p: size=%08lx committed=%08lx\n", - subheap, subheap->size, subheap->commitSize ); - - DPRINT( "\n Block Stat Size Id\n" ); - ptr = (char*)subheap + subheap->headerSize; - while (ptr < (char *)subheap + subheap->size) - { - if (*(PULONG)ptr & ARENA_FLAG_FREE) - { - ARENA_FREE *pArena = (ARENA_FREE *)ptr; - DPRINT( "%p free %08lx %04x prev=%p next=%p\n", - pArena, pArena->size & ARENA_SIZE_MASK, - pArena->threadId, pArena->prev, - pArena->next); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - arenaSize += sizeof(ARENA_FREE); - freeSize += pArena->size & ARENA_SIZE_MASK; - } - else if (*(PULONG)ptr & ARENA_FLAG_PREV_FREE) - { - ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINT( "%p Used %08lx %04x back=%08lx\n", - pArena, pArena->size & ARENA_SIZE_MASK, - pArena->threadId, *((PULONG)pArena - 1)); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - arenaSize += sizeof(ARENA_INUSE); - usedSize += pArena->size & ARENA_SIZE_MASK; - } - else - { - ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINT( "%p used %08lx %04x\n", - pArena, pArena->size & ARENA_SIZE_MASK, - pArena->threadId); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - arenaSize += sizeof(ARENA_INUSE); - usedSize += pArena->size & ARENA_SIZE_MASK; - } - } - DPRINT( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", - subheap->size, subheap->commitSize, freeSize, usedSize, - arenaSize, (arenaSize * 100) / subheap->size ); - subheap = subheap->next; - } -} - +static void HEAP_Dump( HEAP *heap ) +{ + int i; + SUBHEAP *subheap; + char *ptr; + + DPRINTF( "Heap: %p\n", heap ); + DPRINTF( "Next: %p Sub-heaps: %p", + LIST_ENTRY( heap->entry.next, HEAP, entry ), &heap->subheap ); + subheap = &heap->subheap; + while (subheap->next) + { + DPRINTF( " -> %p", subheap->next ); + subheap = subheap->next; + } + + DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); + for (i = 0; i < HEAP_NB_FREE_LISTS; i++) + DPRINTF( "%p free %08lx prev=%p next=%p\n", + &heap->freeList[i].arena, HEAP_freeListSizes[i], + LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), + LIST_ENTRY( heap->freeList[i].arena.entry.next, ARENA_FREE, entry )); + + subheap = &heap->subheap; + while (subheap) + { + SIZE_T freeSize = 0, usedSize = 0, arenaSize = subheap->headerSize; + DPRINTF( "\n\nSub-heap %p: size=%08lx committed=%08lx\n", + subheap, subheap->size, subheap->commitSize ); + + DPRINTF( "\n Block Stat Size Id\n" ); + ptr = (char*)subheap + subheap->headerSize; + while (ptr < (char *)subheap + subheap->size) + { + if (*(DWORD *)ptr & ARENA_FLAG_FREE) + { + ARENA_FREE *pArena = (ARENA_FREE *)ptr; + DPRINTF( "%p free %08lx prev=%p next=%p\n", + pArena, pArena->size & ARENA_SIZE_MASK, + LIST_ENTRY( pArena->entry.prev, ARENA_FREE, entry ), + LIST_ENTRY( pArena->entry.next, ARENA_FREE, entry ) ); + ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); + arenaSize += sizeof(ARENA_FREE); + freeSize += pArena->size & ARENA_SIZE_MASK; + } + else if (*(DWORD *)ptr & ARENA_FLAG_PREV_FREE) + { + ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; + DPRINTF( "%p Used %08lx back=%p\n", + pArena, pArena->size & ARENA_SIZE_MASK, *((ARENA_FREE **)pArena - 1) ); + ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); + arenaSize += sizeof(ARENA_INUSE); + usedSize += pArena->size & ARENA_SIZE_MASK; + } + else + { + ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; + DPRINTF( "%p used %08lx\n", pArena, pArena->size & ARENA_SIZE_MASK ); + ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); + arenaSize += sizeof(ARENA_INUSE); + usedSize += pArena->size & ARENA_SIZE_MASK; + } + } + DPRINTF( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", + subheap->size, subheap->commitSize, freeSize, usedSize, + arenaSize, (arenaSize * 100) / subheap->size ); + subheap = subheap->next; + } +} + +#if 0 +static void HEAP_DumpEntry( LPPROCESS_HEAP_ENTRY entry ) +{ + WORD rem_flags; + TRACE( "Dumping entry %p\n", entry ); + TRACE( "lpData\t\t: %p\n", entry->lpData ); + TRACE( "cbData\t\t: %08lx\n", entry->cbData); + TRACE( "cbOverhead\t: %08x\n", entry->cbOverhead); + TRACE( "iRegionIndex\t: %08x\n", entry->iRegionIndex); + TRACE( "WFlags\t\t: "); + if (entry->wFlags & PROCESS_HEAP_REGION) + TRACE( "PROCESS_HEAP_REGION "); + if (entry->wFlags & PROCESS_HEAP_UNCOMMITTED_RANGE) + TRACE( "PROCESS_HEAP_UNCOMMITTED_RANGE "); + if (entry->wFlags & PROCESS_HEAP_ENTRY_BUSY) + TRACE( "PROCESS_HEAP_ENTRY_BUSY "); + if (entry->wFlags & PROCESS_HEAP_ENTRY_MOVEABLE) + TRACE( "PROCESS_HEAP_ENTRY_MOVEABLE "); + if (entry->wFlags & PROCESS_HEAP_ENTRY_DDESHARE) + TRACE( "PROCESS_HEAP_ENTRY_DDESHARE "); + rem_flags = entry->wFlags & + ~(PROCESS_HEAP_REGION | PROCESS_HEAP_UNCOMMITTED_RANGE | + PROCESS_HEAP_ENTRY_BUSY | PROCESS_HEAP_ENTRY_MOVEABLE| + PROCESS_HEAP_ENTRY_DDESHARE); + if (rem_flags) + TRACE( "Unknown %08x", rem_flags); + TRACE( "\n"); + if ((entry->wFlags & PROCESS_HEAP_ENTRY_BUSY ) + && (entry->wFlags & PROCESS_HEAP_ENTRY_MOVEABLE)) + { + /* Treat as block */ + TRACE( "BLOCK->hMem\t\t:%p\n", entry->Block.hMem); + } + if (entry->wFlags & PROCESS_HEAP_REGION) + { + TRACE( "Region.dwCommittedSize\t:%08lx\n",entry->Region.dwCommittedSize); + TRACE( "Region.dwUnCommittedSize\t:%08lx\n",entry->Region.dwUnCommittedSize); + TRACE( "Region.lpFirstBlock\t:%p\n",entry->Region.lpFirstBlock); + TRACE( "Region.lpLastBlock\t:%p\n",entry->Region.lpLastBlock); + } +} +#endif /*********************************************************************** * HEAP_GetPtr * RETURNS - * Pointer to the heap - * NULL: Failure - */ -static PHEAP -HEAP_GetPtr(HANDLE heap) /* [in] Handle to the heap */ -{ - HEAP *heapPtr = (HEAP *)heap; - if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) + * Pointer to the heap + * NULL: Failure + */ +static HEAP *HEAP_GetPtr( + HANDLE heap /* [in] Handle to the heap */ +) { + HEAP *heapPtr = (HEAP *)heap; + if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) + { + ERR("Invalid heap %p!\n", heap ); + return NULL; + } + if (TRACE_ON(heap) && !HEAP_IsRealArena( heapPtr, 0, NULL, NOISY )) + { + HEAP_Dump( heapPtr ); + assert( FALSE ); + return NULL; + } + return heapPtr; +} + + +/*********************************************************************** + * HEAP_InsertFreeBlock + * + * Insert a free block into the free list. + */ +static __inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL last ) +{ + FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( pArena->size + sizeof(*pArena) ); + if (last) + { + /* insert at end of free list, i.e. before the next free list entry */ + pEntry++; + if (pEntry == &heap->freeList[HEAP_NB_FREE_LISTS]) pEntry = heap->freeList; + list_add_before( &pEntry->arena.entry, &pArena->entry ); + } + else + { + /* insert at head of free list */ + list_add_after( &pEntry->arena.entry, &pArena->entry ); + } + pArena->size |= ARENA_FLAG_FREE; +} + + +/*********************************************************************** + * HEAP_FindSubHeap + * Find the sub-heap containing a given address. + * + * RETURNS + * Pointer: Success + * NULL: Failure + */ +static SUBHEAP *HEAP_FindSubHeap( + const HEAP *heap, /* [in] Heap pointer */ + LPCVOID ptr /* [in] Address */ +) { + const SUBHEAP *sub = &heap->subheap; + while (sub) + { + if (((const char *)ptr >= (const char *)sub) && + ((const char *)ptr < (const char *)sub + sub->size)) return (SUBHEAP*)sub; + sub = sub->next; + } + return NULL; +} + +/*********************************************************************** + * HEAP_Commit + * + * Make sure the heap storage is committed for a given size in the specified arena. + */ +static __inline BOOL HEAP_Commit( SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T data_size ) +{ + NTSTATUS Status; + void *ptr = (char *)(pArena + 1) + data_size + sizeof(ARENA_FREE); + SIZE_T size = (char *)ptr - (char *)subheap; + size = (size + COMMIT_MASK) & ~COMMIT_MASK; + if (size > subheap->size) size = subheap->size; + if (size <= subheap->commitSize) return TRUE; + size -= subheap->commitSize; + ptr = (char *)subheap + subheap->commitSize; + if (subheap->heap->commitRoutine != NULL) { - DPRINT("Invalid heap %p!\n", heap ); - return NULL; - } - if (TRACE_ON(heap) && !HEAP_IsRealArena( heap, 0, NULL, NOISY )) - { - HEAP_Dump( heapPtr ); - ASSERT( FALSE ); - return NULL; - } - return heapPtr; -} - - -/*********************************************************************** - * HEAP_InsertFreeBlock - * - * Insert a free block into the free list. - */ -static VOID -HEAP_InsertFreeBlock(PHEAP heap, - ARENA_FREE *pArena, - BOOLEAN last) -{ - FREE_LIST_ENTRY *pEntry = heap->freeList; - while (pEntry->size < pArena->size) - pEntry++; - if (last) - { - /* insert at end of free list, i.e. before next free list entry */ - pEntry++; - if (pEntry == &heap->freeList[HEAP_NB_FREE_LISTS]) - { - pEntry = heap->freeList; - } - pArena->prev = pEntry->arena.prev; - pArena->prev->next = pArena; - pArena->next = &pEntry->arena; - pEntry->arena.prev = pArena; + Status = subheap->heap->commitRoutine(subheap->heap, &ptr, &size); } else { - /* insert at head of free list */ - pArena->next = pEntry->arena.next; - pArena->next->prev = pArena; - pArena->prev = &pEntry->arena; - pEntry->arena.next = pArena; + Status = ZwAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, + &size, MEM_COMMIT, PAGE_READWRITE ); } - pArena->size |= ARENA_FLAG_FREE; -} - - -/*********************************************************************** - * HEAP_FindSubHeap - * Find the sub-heap containing a given address. - * - * RETURNS - * Pointer: Success - * NULL: Failure - */ -static PSUBHEAP -HEAP_FindSubHeap(HEAP *heap, /* [in] Heap pointer */ - PVOID ptr) /* [in] Address */ -{ - PSUBHEAP sub = &heap->subheap; - while (sub) - { - if (((char *)ptr >= (char *)sub) && - ((char *)ptr < (char *)sub + sub->size)) - return sub; - sub = sub->next; - } - return NULL; -} - - -/*********************************************************************** - * HEAP_Commit - * - * Make sure the heap storage is committed up to (not including) ptr. - */ -static __inline BOOLEAN -HEAP_Commit(SUBHEAP *subheap, - PVOID ptr, - ULONG flags) -{ - SIZE_T size = (SIZE_T)((char *)ptr - (char *)subheap); - NTSTATUS Status; - PVOID address; - SIZE_T commitsize; - - size = (size + COMMIT_MASK) & ~COMMIT_MASK; - if (size > subheap->size) - size = subheap->size; - if (size <= subheap->commitSize) - return TRUE; - - address = (PVOID)((char *)subheap + subheap->commitSize); - commitsize = size - subheap->commitSize; - - if (subheap->heap->commitRoutine != NULL) - { - Status = subheap->heap->commitRoutine(subheap->heap, &address, &commitsize); - } - else - { - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &address, - 0, - &commitsize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - } - if (!NT_SUCCESS(Status)) - { - DPRINT( "Could not commit %08lx bytes at %p for heap %p\n", - size - subheap->commitSize, - ((char *)subheap + subheap->commitSize), - subheap->heap ); - return FALSE; - } - - subheap->commitSize += commitsize; - return TRUE; -} - + if (!NT_SUCCESS(Status)) + { + WARN("Could not commit %08lx bytes at %p for heap %p\n", + size, ptr, subheap->heap ); + return FALSE; + } + subheap->commitSize += size; + return TRUE; +} #if 0 /*********************************************************************** @@ -340,35 +434,26 @@ * * If possible, decommit the heap storage from (including) 'ptr'. */ -static inline BOOLEAN HEAP_Decommit( SUBHEAP *subheap, PVOID ptr, ULONG flags ) -{ - ULONG size = (ULONG)((char *)ptr - (char *)subheap); - PVOID address; - ULONG decommitsize; - NTSTATUS Status; - /* round to next block and add one full block */ - size = ((size + COMMIT_MASK) & ~COMMIT_MASK) + COMMIT_MASK + 1; - if (size >= subheap->commitSize) - return TRUE; - - address = (PVOID)((char *)subheap + size); - decommitsize = subheap->commitSize - size; - - Status = ZwFreeVirtualMemory(NtCurrentProcess(), - &address, - &decommitsize, - MEM_DECOMMIT); - if (!NT_SUCCESS(Status)) - { - DPRINT( "Could not decommit %08lx bytes at %p for heap %p\n", - subheap->commitSize - size, - ((char *)subheap + size), - subheap->heap ); - return FALSE; - } - - subheap->commitSize -= decommitsize; - return TRUE; +static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) +{ + void *addr; + SIZE_T decommit_size; + SIZE_T size = (char *)ptr - (char *)subheap; + + /* round to next block and add one full block */ + size = ((size + COMMIT_MASK) & ~COMMIT_MASK) + COMMIT_MASK + 1; + if (size >= subheap->commitSize) return TRUE; + decommit_size = subheap->commitSize - size; + addr = (char *)subheap + size; + + if (ZwFreeVirtualMemory( NtCurrentProcess(), &addr, &decommit_size, MEM_DECOMMIT )) + { + WARN("Could not decommit %08lx bytes at %p for heap %p\n", + decommit_size, (char *)subheap + size, subheap->heap ); + return FALSE; + } + subheap->commitSize -= decommit_size; + return TRUE; } #endif @@ -378,56 +463,50 @@ * Create a free block at a specified address. 'size' is the size of the * whole block, including the new arena. */ -static VOID HEAP_CreateFreeBlock( SUBHEAP *subheap, PVOID ptr, ULONG size ) -{ - ARENA_FREE *pFree; - BOOLEAN last; - - /* Create a free arena */ - - pFree = (ARENA_FREE *)ptr; - pFree->threadId = (ULONG)NtCurrentTeb()->Cid.UniqueThread; - pFree->magic = ARENA_FREE_MAGIC; - - /* If debugging, erase the freed block content */ - - if (TRACE_ON(heap)) - { - char *pEnd = (char *)ptr + size; - if (pEnd > (char *)subheap + subheap->commitSize) - pEnd = (char *)subheap + subheap->commitSize; - if (pEnd > (char *)(pFree + 1)) - memset( pFree + 1, ARENA_FREE_FILLER, pEnd - (char *)(pFree + 1) ); - } - - /* Check if next block is free also */ - - if (((char *)ptr + size < (char *)subheap + subheap->size) && - (*(PULONG)((char *)ptr + size) & ARENA_FLAG_FREE)) - { - /* Remove the next arena from the free list */ - ARENA_FREE *pNext = (ARENA_FREE *)((char *)ptr + size); - pNext->next->prev = pNext->prev; - pNext->prev->next = pNext->next; - size += (pNext->size & ARENA_SIZE_MASK) + sizeof(*pNext); - if (TRACE_ON(heap)) - memset( pNext, ARENA_FREE_FILLER, sizeof(ARENA_FREE) ); - } - - /* Set the next block PREV_FREE flag and pointer */ - - last = ((char *)ptr + size >= (char *)subheap + subheap->size); - if (!last) - { - PULONG pNext = (PULONG)((char *)ptr + size); - *pNext |= ARENA_FLAG_PREV_FREE; - *(ARENA_FREE **)(pNext - 1) = pFree; - } - - /* Last, insert the new block into the free list */ - - pFree->size = size - sizeof(*pFree); - HEAP_InsertFreeBlock( subheap->heap, pFree, last ); +static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) +{ + ARENA_FREE *pFree; + char *pEnd; + BOOL last; + + /* Create a free arena */ + mark_block_uninitialized( ptr, sizeof( ARENA_FREE ) ); + pFree = (ARENA_FREE *)ptr; + pFree->magic = ARENA_FREE_MAGIC; + + /* If debugging, erase the freed block content */ + + pEnd = (char *)ptr + size; + if (pEnd > (char *)subheap + subheap->commitSize) pEnd = (char *)subheap + subheap->commitSize; + if (pEnd > (char *)(pFree + 1)) mark_block_free( pFree + 1, pEnd - (char *)(pFree + 1) ); + + /* Check if next block is free also */ + + if (((char *)ptr + size < (char *)subheap + subheap->size) && + (*(DWORD *)((char *)ptr + size) & ARENA_FLAG_FREE)) + { + /* Remove the next arena from the free list */ + ARENA_FREE *pNext = (ARENA_FREE *)((char *)ptr + size); + list_remove( &pNext->entry ); + size += (pNext->size & ARENA_SIZE_MASK) + sizeof(*pNext); + mark_block_free( pNext, sizeof(ARENA_FREE) ); + } + + /* Set the next block PREV_FREE flag and pointer */ + + last = ((char *)ptr + size >= (char *)subheap + subheap->size); + if (!last) + { + DWORD *pNext = (DWORD *)((char *)ptr + size); + *pNext |= ARENA_FLAG_PREV_FREE; + mark_block_initialized( pNext - 1, sizeof( ARENA_FREE * ) ); + *((ARENA_FREE **)pNext - 1) = pFree; + } + + /* Last, insert the new block into the free list */ + + pFree->size = size - sizeof(*pFree); + HEAP_InsertFreeBlock( subheap->heap, pFree, last ); } @@ -437,150 +516,154 @@ * Turn an in-use block into a free block. Can also decommit the end of * the heap, and possibly even free the sub-heap altogether. */ -static VOID HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena, - ULONG flags) -{ - ARENA_FREE *pFree; - ULONG size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); - ULONG dummySize = 0; - - /* Check if we can merge with previous block */ - - if (pArena->size & ARENA_FLAG_PREV_FREE) - { - pFree = *((ARENA_FREE **)pArena - 1); - size += (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); - /* Remove it from the free list */ - pFree->next->prev = pFree->prev; - pFree->prev->next = pFree->next; - } - else - pFree = (ARENA_FREE *)pArena; - - /* Create a free block */ - - HEAP_CreateFreeBlock( subheap, pFree, size ); - size = (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); - if ((char *)pFree + size < (char *)subheap + subheap->size) - return; /* Not the last block, so nothing more to do */ - - /* Free the whole sub-heap if it's empty and not the original one */ - - if (((char *)pFree == (char *)subheap + subheap->headerSize) && - (subheap != &subheap->heap->subheap)) - { - SUBHEAP *pPrev = &subheap->heap->subheap; - /* Remove the free block from the list */ - pFree->next->prev = pFree->prev; - pFree->prev->next = pFree->next; - /* Remove the subheap from the list */ - while (pPrev && (pPrev->next != subheap)) - pPrev = pPrev->next; - if (pPrev) - pPrev->next = subheap->next; - /* Free the memory */ - subheap->magic = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&subheap, - &dummySize, - MEM_RELEASE); - return; - } - - /* Decommit the end of the heap */ -} - +static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) +{ + ARENA_FREE *pFree; + SIZE_T size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + + /* Check if we can merge with previous block */ + + if (pArena->size & ARENA_FLAG_PREV_FREE) + { + pFree = *((ARENA_FREE **)pArena - 1); + size += (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); + /* Remove it from the free list */ + list_remove( &pFree->entry ); + } + else pFree = (ARENA_FREE *)pArena; + + /* Create a free block */ + + HEAP_CreateFreeBlock( subheap, pFree, size ); + size = (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); + if ((char *)pFree + size < (char *)subheap + subheap->size) + return; /* Not the last block, so nothing more to do */ + + /* Free the whole sub-heap if it's empty and not the original one */ + + if (((char *)pFree == (char *)subheap + subheap->headerSize) && + (subheap != &subheap->heap->subheap)) + { + SIZE_T size = 0; + SUBHEAP *pPrev = &subheap->heap->subheap; + /* Remove the free block from the list */ + list_remove( &pFree->entry ); + /* Remove the subheap from the list */ + while (pPrev && (pPrev->next != subheap)) pPrev = pPrev->next; + if (pPrev) pPrev->next = subheap->next; + /* Free the memory */ + subheap->magic = 0; + ZwFreeVirtualMemory( NtCurrentProcess(), (void **)&subheap, &size, MEM_RELEASE ); + return; + } + + /* Decommit the end of the heap */ +} /*********************************************************************** * HEAP_ShrinkBlock * * Shrink an in-use block. */ -static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, ULONG size) -{ - if ((pArena->size & ARENA_SIZE_MASK) >= size + HEAP_MIN_BLOCK_SIZE) - { - HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, - (pArena->size & ARENA_SIZE_MASK) - size ); - /* assign size plus previous arena flags */ - pArena->size = size | (pArena->size & ~ARENA_SIZE_MASK); - } - else - { - /* Turn off PREV_FREE flag in next block */ - char *pNext = (char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK); - if (pNext < (char *)subheap + subheap->size) - *(PULONG)pNext &= ~ARENA_FLAG_PREV_FREE; - } +static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) +{ + if ((pArena->size & ARENA_SIZE_MASK) >= size + HEAP_MIN_SHRINK_SIZE) + { + HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, + (pArena->size & ARENA_SIZE_MASK) - size ); + /* assign size plus previous arena flags */ + pArena->size = size | (pArena->size & ~ARENA_SIZE_MASK); + } + else + { + /* Turn off PREV_FREE flag in next block */ + char *pNext = (char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK); + if (pNext < (char *)subheap + subheap->size) + *(DWORD *)pNext &= ~ARENA_FLAG_PREV_FREE; + } } /*********************************************************************** * HEAP_InitSubHeap */ -static BOOLEAN HEAP_InitSubHeap( HEAP *heap, PVOID address, ULONG flags, - SIZE_T commitSize, ULONG totalSize, - PRTL_HEAP_PARAMETERS Parameters ) -{ - SUBHEAP *subheap = (SUBHEAP *)address; - FREE_LIST_ENTRY *pEntry; - int i; - NTSTATUS Status; - - /* Fill the sub-heap structure */ - - subheap = (PSUBHEAP)address; - subheap->heap = heap; - subheap->size = totalSize; - subheap->commitSize = commitSize; - subheap->magic = SUBHEAP_MAGIC; - - if ( subheap != (SUBHEAP *)heap ) - { - /* If this is a secondary subheap, insert it into list */ - - subheap->headerSize = sizeof(SUBHEAP); - subheap->next = heap->subheap.next; - heap->subheap.next = subheap; - } - else - { - /* If this is a primary subheap, initialize main heap */ - - subheap->headerSize = sizeof(HEAP); - subheap->next = NULL; - heap->next = NULL; - heap->flags = flags; - heap->magic = HEAP_MAGIC; +static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, + SIZE_T commitSize, SIZE_T totalSize, + PRTL_HEAP_PARAMETERS Parameters) +{ + SUBHEAP *subheap; + FREE_LIST_ENTRY *pEntry; + int i; + NTSTATUS Status; + +#if 0 + if (ZwAllocateVirtualMemory( NtCurrentProcess(), &address, 0, + &commitSize, MEM_COMMIT, PAGE_READWRITE )) + { + WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); + return FALSE; + } +#endif + + /* Fill the sub-heap structure */ + + subheap = (SUBHEAP *)address; + subheap->heap = heap; + subheap->size = totalSize; + subheap->commitSize = commitSize; + subheap->magic = SUBHEAP_MAGIC; + + if ( subheap != (SUBHEAP *)heap ) + { + /* If this is a secondary subheap, insert it into list */ + + subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); + subheap->next = heap->subheap.next; + heap->subheap.next = subheap; + } + else + { + /* If this is a primary subheap, initialize main heap */ + + subheap->headerSize = ROUND_SIZE( sizeof(HEAP) ); + subheap->next = NULL; + heap->flags = flags; + heap->magic = HEAP_MAGIC; if (Parameters) heap->commitRoutine = Parameters->CommitRoutine; else heap->commitRoutine = NULL; - /* Build the free lists */ - - for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) - { - pEntry->size = HEAP_freeListSizes[i]; - pEntry->arena.size = 0 | ARENA_FLAG_FREE; - pEntry->arena.next = i < HEAP_NB_FREE_LISTS-1 ? - &heap->freeList[i+1].arena : &heap->freeList[0].arena; - pEntry->arena.prev = i ? &heap->freeList[i-1].arena : - &heap->freeList[HEAP_NB_FREE_LISTS-1].arena; - pEntry->arena.threadId = 0; - pEntry->arena.magic = ARENA_FREE_MAGIC; - } - - /* Initialize critical section */ - - if (RtlpGetMode() == UserMode) - { - RtlInitializeHeapLock( &heap->critSection ); - } - } - - /* Commit memory */ - if (heap->commitRoutine) - { + /* Build the free lists */ + + list_init( &heap->freeList[0].arena.entry ); + for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) + { + pEntry->arena.size = 0 | ARENA_FLAG_FREE; + pEntry->arena.magic = ARENA_FREE_MAGIC; + if (i) list_add_after( &pEntry[-1].arena.entry, &pEntry->arena.entry ); + } + + /* Initialize critical section */ + + if (RtlpGetMode() == UserMode) + { + if (!processHeap) /* do it by hand to avoid memory allocations */ + { + heap->critSection.DebugInfo = &process_heap_critsect_debug; + heap->critSection.LockCount = -1; + heap->critSection.RecursionCount = 0; + heap->critSection.OwningThread = 0; + heap->critSection.LockSemaphore = 0; + heap->critSection.SpinCount = 0; + process_heap_critsect_debug.CriticalSection = &heap->critSection; + } + else RtlInitializeHeapLock( &heap->critSection ); + } + } + + /* Commit memory */ + if (heap->commitRoutine) + { if (subheap != (SUBHEAP *)heap) { Status = heap->commitRoutine(heap, &address, &commitSize); @@ -590,29 +673,29 @@ /* the caller is responsible for committing the first page! */ Status = STATUS_SUCCESS; } - } - else - { + } + else + { Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &address, 0, &commitSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); - } - if (!NT_SUCCESS(Status)) - { + } + if (!NT_SUCCESS(Status)) + { DPRINT("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address); return FALSE; - } - - /* Create the first free block */ - - HEAP_CreateFreeBlock( subheap, (PUCHAR)subheap + subheap->headerSize, - subheap->size - subheap->headerSize ); - - return TRUE; + } + + /* Create the first free block */ + + HEAP_CreateFreeBlock( subheap, (LPBYTE)subheap + subheap->headerSize, + subheap->size - subheap->headerSize ); + + return TRUE; } /*********************************************************************** @@ -621,60 +704,40 @@ * Create a sub-heap of the given size. * If heap == NULL, creates a main heap. */ -static PSUBHEAP -HEAP_CreateSubHeap(PVOID BaseAddress, - HEAP *heap, ULONG flags, - SIZE_T commitSize, ULONG totalSize, - PRTL_HEAP_PARAMETERS Parameters ) -{ - PVOID address; - NTSTATUS Status; - - /* Round-up sizes on a 64K boundary */ - - totalSize = (totalSize + 0xffff) & 0xffff0000; - commitSize = (commitSize + 0xffff) & 0xffff0000; - if (!commitSize) - commitSize = 0x10000; - if (totalSize < commitSize) - totalSize = commitSize; - - /* Allocate the memory block */ - address = BaseAddress; - if (!address) - { - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &address, - 0, - (PULONG)&totalSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not VirtualAlloc %08lx bytes\n", - totalSize ); - return NULL; - } - } - - /* Initialize subheap */ - - if (!HEAP_InitSubHeap( heap ? heap : (HEAP *)address, - address, flags, commitSize, totalSize, - Parameters )) - { - if (!BaseAddress) - { - ULONG dummySize = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - &address, - &dummySize, - MEM_RELEASE); - } - return NULL; - } - - return (SUBHEAP *)address; +static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, void *base, DWORD flags, + SIZE_T commitSize, SIZE_T totalSize, + IN PRTL_HEAP_PARAMETERS Parameters) +{ + LPVOID address = base; + + /* round-up sizes on a 64K boundary */ + totalSize = (totalSize + 0xffff) & 0xffff0000; + commitSize = (commitSize + 0xffff) & 0xffff0000; + if (!commitSize) commitSize = 0x10000; + if (totalSize < commitSize) totalSize = commitSize; + + if (!address) + { + /* allocate the memory block */ + if (ZwAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) + { + WARN("Could not allocate %08lx bytes\n", totalSize ); + return NULL; + } + } + + /* Initialize subheap */ + + if (!HEAP_InitSubHeap( heap ? heap : (HEAP *)address, + address, flags, commitSize, totalSize, Parameters )) + { + SIZE_T size = 0; + if (!base) ZwFreeVirtualMemory( NtCurrentProcess(), &address, &size, MEM_RELEASE ); + return NULL; + } + + return (SUBHEAP *)address; } @@ -687,302 +750,249 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, SUBHEAP **ppSubHeap ) { - SUBHEAP *subheap; - ARENA_FREE *pArena; - FREE_LIST_ENTRY *pEntry = heap->freeList; - - /* Find a suitable free list, and in it find a block large enough */ - - while (pEntry->size < size) - pEntry++; - pArena = pEntry->arena.next; - while (pArena != &heap->freeList[0].arena) - { - ULONG arena_size = (pArena->size & ARENA_SIZE_MASK) + - sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - if (arena_size >= size) - { - subheap = HEAP_FindSubHeap( heap, pArena ); - if (!HEAP_Commit( subheap, (char *)pArena + sizeof(ARENA_INUSE) - + size + HEAP_MIN_BLOCK_SIZE, - heap->flags)) - return NULL; - *ppSubHeap = subheap; - return pArena; - } - - pArena = pArena->next; - } - - /* If no block was found, attempt to grow the heap */ - - if (!(heap->flags & HEAP_GROWABLE)) - { - DPRINT("Not enough space in heap %p for %08lx bytes\n", - heap, size ); - return NULL; - } - /* make sure that we have a big enough size *committed* to fit another - * last free arena in ! - * So just one heap struct, one first free arena which will eventually - * get inuse, and HEAP_MIN_BLOCK_SIZE for the second free arena that - * might get assigned all remaining free space in HEAP_ShrinkBlock() */ - size += sizeof(SUBHEAP) + sizeof(ARENA_FREE) + HEAP_MIN_BLOCK_SIZE; - if (!(subheap = HEAP_CreateSubHeap( NULL, heap, heap->flags, size, - max( HEAP_DEF_SIZE, size ), NULL ))) - return NULL; - - DPRINT("created new sub-heap %p of %08lx bytes for heap %p\n", - subheap, size, heap ); - - *ppSubHeap = subheap; - return (ARENA_FREE *)(subheap + 1); -} - + SUBHEAP *subheap; + struct list *ptr; + FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( size + sizeof(ARENA_INUSE) ); + + /* Find a suitable free list, and in it find a block large enough */ + + ptr = &pEntry->arena.entry; + while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) + { + ARENA_FREE *pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); + SIZE_T arena_size = (pArena->size & ARENA_SIZE_MASK) + + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); + if (arena_size >= size) + { + subheap = HEAP_FindSubHeap( heap, pArena ); + if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, size )) return NULL; + *ppSubHeap = subheap; + return pArena; + } + } + + /* If no block was found, attempt to grow the heap */ + + if (!(heap->flags & HEAP_GROWABLE)) + { + WARN("Not enough space in heap %p for %08lx bytes\n", heap, size ); + return NULL; + } + /* make sure that we have a big enough size *committed* to fit another + * last free arena in ! + * So just one heap struct, one first free arena which will eventually + * get used, and a second free arena that might get assigned all remaining + * free space in HEAP_ShrinkBlock() */ + size += ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); + if (!(subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, size, + max( HEAP_DEF_SIZE, size ), NULL ))) + return NULL; + + TRACE("created new sub-heap %p of %08lx bytes for heap %p\n", + subheap, size, heap ); + + *ppSubHeap = subheap; + return (ARENA_FREE *)(subheap + 1); +} /*********************************************************************** * HEAP_IsValidArenaPtr * * Check that the pointer is inside the range possible for arenas. */ -static BOOLEAN HEAP_IsValidArenaPtr( HEAP *heap, PVOID ptr ) -{ - int i; - SUBHEAP *subheap = HEAP_FindSubHeap( heap, ptr ); - if (!subheap) - return FALSE; - if ((char *)ptr >= (char *)subheap + subheap->headerSize) - return TRUE; - if (subheap != &heap->subheap) - return FALSE; - for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - if (ptr == (PVOID)&heap->freeList[i].arena) - return TRUE; - return FALSE; +static BOOL HEAP_IsValidArenaPtr( const HEAP *heap, const void *ptr ) +{ + int i; + const SUBHEAP *subheap = HEAP_FindSubHeap( heap, ptr ); + if (!subheap) return FALSE; + if ((const char *)ptr >= (const char *)subheap + subheap->headerSize) return TRUE; + if (subheap != &heap->subheap) return FALSE; + for (i = 0; i < HEAP_NB_FREE_LISTS; i++) + if (ptr == (const void *)&heap->freeList[i].arena) return TRUE; + return FALSE; } /*********************************************************************** * HEAP_ValidateFreeArena */ -static BOOLEAN HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena ) -{ - char *heapEnd = (char *)subheap + subheap->size; - - /* Check magic number */ - if (pArena->magic != ARENA_FREE_MAGIC) - { - DPRINT("Heap %p: invalid free arena magic for %p\n", - subheap->heap, pArena); - return FALSE; - } - /* Check size flags */ - if (!(pArena->size & ARENA_FLAG_FREE) || - (pArena->size & ARENA_FLAG_PREV_FREE)) - { - DPRINT("Heap %p: bad flags %lx for free arena %p\n", - subheap->heap, pArena->size & ~ARENA_SIZE_MASK, pArena); - } - /* Check arena size */ - if ((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) > heapEnd) - { - DPRINT("Heap %p: bad size %08lx for free arena %p\n", - subheap->heap, (ULONG)pArena->size & ARENA_SIZE_MASK, pArena ); - return FALSE; - } - /* Check that next pointer is valid */ - if (!HEAP_IsValidArenaPtr( subheap->heap, pArena->next )) - { - DPRINT("Heap %p: bad next ptr %p for arena %p\n", - subheap->heap, pArena->next, pArena); - return FALSE; - } - /* Check that next arena is free */ - if (!(pArena->next->size & ARENA_FLAG_FREE) || - (pArena->next->magic != ARENA_FREE_MAGIC)) - { - DPRINT("Heap %p: next arena %p invalid for %p\n", - subheap->heap, pArena->next, pArena); - return FALSE; - } - /* Check that prev pointer is valid */ - if (!HEAP_IsValidArenaPtr( subheap->heap, pArena->prev )) - { - DPRINT("Heap %p: bad prev ptr %p for arena %p\n", - subheap->heap, pArena->prev, pArena); - return FALSE; - } - /* Check that prev arena is free */ - if (!(pArena->prev->size & ARENA_FLAG_FREE) || - (pArena->prev->magic != ARENA_FREE_MAGIC)) - { - DPRINT("Heap %p: prev arena %p invalid for %p\n", - subheap->heap, pArena->prev, pArena); - return FALSE; - } - /* Check that next block has PREV_FREE flag */ - if ((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) < heapEnd) - { - if (!(*(PULONG)((char *)(pArena + 1) + - (pArena->size & ARENA_SIZE_MASK)) & ARENA_FLAG_PREV_FREE)) - { - DPRINT("Heap %p: free arena %p next block has no PREV_FREE flag\n", - subheap->heap, pArena); - return FALSE; - } - /* Check next block back pointer */ - if (*((ARENA_FREE **)((char *)(pArena + 1) + - (pArena->size & ARENA_SIZE_MASK)) - 1) != pArena) - { - DPRINT("Heap %p: arena %p has wrong back ptr %lx\n", +static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena ) +{ + ARENA_FREE *prev, *next; + char *heapEnd = (char *)subheap + subheap->size; + + /* Check for unaligned pointers */ + if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + { + ERR("Heap %p: unaligned arena pointer %p\n", subheap->heap, pArena ); + return FALSE; + } + + /* Check magic number */ + if (pArena->magic != ARENA_FREE_MAGIC) + { + ERR("Heap %p: invalid free arena magic for %p\n", subheap->heap, pArena ); + return FALSE; + } + /* Check size flags */ + if (!(pArena->size & ARENA_FLAG_FREE) || + (pArena->size & ARENA_FLAG_PREV_FREE)) + { + ERR("Heap %p: bad flags %08lx for free arena %p\n", + subheap->heap, pArena->size & ~ARENA_SIZE_MASK, pArena ); + return FALSE; + } + /* Check arena size */ + if ((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) > heapEnd) + { + ERR("Heap %p: bad size %08lx for free arena %p\n", + subheap->heap, pArena->size & ARENA_SIZE_MASK, pArena ); + return FALSE; + } + /* Check that next pointer is valid */ + next = LIST_ENTRY( pArena->entry.next, ARENA_FREE, entry ); + if (!HEAP_IsValidArenaPtr( subheap->heap, next )) + { + ERR("Heap %p: bad next ptr %p for arena %p\n", + subheap->heap, next, pArena ); + return FALSE; + } + /* Check that next arena is free */ + if (!(next->size & ARENA_FLAG_FREE) || (next->magic != ARENA_FREE_MAGIC)) + { + ERR("Heap %p: next arena %p invalid for %p\n", + subheap->heap, next, pArena ); + return FALSE; + } + /* Check that prev pointer is valid */ + prev = LIST_ENTRY( pArena->entry.prev, ARENA_FREE, entry ); + if (!HEAP_IsValidArenaPtr( subheap->heap, prev )) + { + ERR("Heap %p: bad prev ptr %p for arena %p\n", + subheap->heap, prev, pArena ); + return FALSE; + } + /* Check that prev arena is free */ + if (!(prev->size & ARENA_FLAG_FREE) || (prev->magic != ARENA_FREE_MAGIC)) + { + /* this often means that the prev arena got overwritten + * by a memory write before that prev arena */ + ERR("Heap %p: prev arena %p invalid for %p\n", + subheap->heap, prev, pArena ); + return FALSE; + } + /* Check that next block has PREV_FREE flag */ + if ((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) < heapEnd) + { + if (!(*(DWORD *)((char *)(pArena + 1) + + (pArena->size & ARENA_SIZE_MASK)) & ARENA_FLAG_PREV_FREE)) + { + ERR("Heap %p: free arena %p next block has no PREV_FREE flag\n", + subheap->heap, pArena ); + return FALSE; + } + /* Check next block back pointer */ + if (*((ARENA_FREE **)((char *)(pArena + 1) + + (pArena->size & ARENA_SIZE_MASK)) - 1) != pArena) + { + ERR("Heap %p: arena %p has wrong back ptr %p\n", subheap->heap, pArena, - *((PULONG)((char *)(pArena+1)+ (pArena->size & ARENA_SIZE_MASK)) - 1)); - return FALSE; - } - } - return TRUE; -} - + *((ARENA_FREE **)((char *)(pArena+1) + (pArena->size & ARENA_SIZE_MASK)) - 1)); + return FALSE; + } + } + return TRUE; +} /*********************************************************************** * HEAP_ValidateInUseArena */ -static BOOLEAN HEAP_ValidateInUseArena( SUBHEAP *subheap, ARENA_INUSE *pArena, BOOLEAN quiet ) -{ - char *heapEnd = (char *)subheap + subheap->size; - - /* Check magic number */ - if (pArena->magic != ARENA_INUSE_MAGIC) - { - if (quiet == NOISY) - { - DPRINT("Heap %p: invalid in-use arena magic for %p\n", - subheap->heap, pArena); - if (TRACE_ON(heap)) - HEAP_Dump( subheap->heap ); - } - else if (WARN_ON(heap)) - { - DPRINT("Heap %p: invalid in-use arena magic for %p\n", - subheap->heap, pArena); - if (TRACE_ON(heap)) - HEAP_Dump( subheap->heap ); - } - return FALSE; - } - /* Check size flags */ - if (pArena->size & ARENA_FLAG_FREE) - { - DPRINT("Heap %p: bad flags %lx for in-use arena %p\n", - subheap->heap, pArena->size & ~ARENA_SIZE_MASK, pArena); - return FALSE; - } - /* Check arena size */ - if ((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) > heapEnd) - { - DPRINT("Heap %p: bad size %08lx for in-use arena %p\n", - subheap->heap, (ULONG)pArena->size & ARENA_SIZE_MASK, pArena); - return FALSE; - } - /* Check next arena PREV_FREE flag */ - if (((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) < heapEnd) && - (*(PULONG)((char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK)) & ARENA_FLAG_PREV_FREE)) - { - DPRINT("Heap %p: in-use arena %p next block has PREV_FREE flag\n", - subheap->heap, pArena); - return FALSE; - } - /* Check prev free arena */ - if (pArena->size & ARENA_FLAG_PREV_FREE) - { - ARENA_FREE *pPrev = *((ARENA_FREE **)pArena - 1); - /* Check prev pointer */ - if (!HEAP_IsValidArenaPtr( subheap->heap, pPrev )) - { - DPRINT("Heap %p: bad back ptr %p for arena %p\n", +static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE *pArena, BOOL quiet ) +{ + const char *heapEnd = (const char *)subheap + subheap->size; + + /* Check for unaligned pointers */ + if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + { + if ( quiet == NOISY ) + { + ERR( "Heap %p: unaligned arena pointer %p\n", subheap->heap, pArena ); + if ( TRACE_ON(heap) ) + HEAP_Dump( subheap->heap ); + } + else if ( WARN_ON(heap) ) + { + WARN( "Heap %p: unaligned arena pointer %p\n", subheap->heap, pArena ); + if ( TRACE_ON(heap) ) + HEAP_Dump( subheap->heap ); + } + return FALSE; + } + + /* Check magic number */ + if (pArena->magic != ARENA_INUSE_MAGIC) + { + if (quiet == NOISY) { + ERR("Heap %p: invalid in-use arena magic for %p\n", subheap->heap, pArena ); + if (TRACE_ON(heap)) + HEAP_Dump( subheap->heap ); + } else if (WARN_ON(heap)) { + WARN("Heap %p: invalid in-use arena magic for %p\n", subheap->heap, pArena ); + if (TRACE_ON(heap)) + HEAP_Dump( subheap->heap ); + } + return FALSE; + } + /* Check size flags */ + if (pArena->size & ARENA_FLAG_FREE) + { + ERR("Heap %p: bad flags %08lx for in-use arena %p\n", + subheap->heap, pArena->size & ~ARENA_SIZE_MASK, pArena ); + return FALSE; + } + /* Check arena size */ + if ((const char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) > heapEnd) + { + ERR("Heap %p: bad size %08lx for in-use arena %p\n", + subheap->heap, pArena->size & ARENA_SIZE_MASK, pArena ); + return FALSE; + } + /* Check next arena PREV_FREE flag */ + if (((const char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK) < heapEnd) && + (*(const DWORD *)((const char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK)) & ARENA_FLAG_PREV_FREE)) + { + ERR("Heap %p: in-use arena %p next block has PREV_FREE flag\n", + subheap->heap, pArena ); + return FALSE; + } + /* Check prev free arena */ + if (pArena->size & ARENA_FLAG_PREV_FREE) + { + const ARENA_FREE *pPrev = *((const ARENA_FREE * const*)pArena - 1); + /* Check prev pointer */ + if (!HEAP_IsValidArenaPtr( subheap->heap, pPrev )) + { + ERR("Heap %p: bad back ptr %p for arena %p\n", subheap->heap, pPrev, pArena ); - return FALSE; - } - /* Check that prev arena is free */ - if (!(pPrev->size & ARENA_FLAG_FREE) || + return FALSE; + } + /* Check that prev arena is free */ + if (!(pPrev->size & ARENA_FLAG_FREE) || (pPrev->magic != ARENA_FREE_MAGIC)) - { - DPRINT("Heap %p: prev arena %p invalid for in-use %p\n", - subheap->heap, pPrev, pArena); - return FALSE; - } - /* Check that prev arena is really the previous block */ - if ((char *)(pPrev + 1) + (pPrev->size & ARENA_SIZE_MASK) != (char *)pArena) - { - DPRINT("Heap %p: prev arena %p is not prev for in-use %p\n", + { + ERR("Heap %p: prev arena %p invalid for in-use %p\n", subheap->heap, pPrev, pArena ); - return FALSE; - } - } - return TRUE; -} - - -/*********************************************************************** - * HEAP_IsInsideHeap - * Checks whether the pointer points to a block inside a given heap. - * - * NOTES - * Should this return BOOL32? - * - * RETURNS - * !0: Success - * 0: Failure - */ -int HEAP_IsInsideHeap( - HANDLE heap, /* [in] Heap */ - ULONG flags, /* [in] Flags */ - PVOID ptr /* [in] Pointer */ -) -{ - HEAP *heapPtr = HEAP_GetPtr( heap ); - SUBHEAP *subheap; - int ret; - - /* Validate the parameters */ - - if (!heapPtr) - return 0; - flags |= heapPtr->flags; - if (!(flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - ret = (((subheap = HEAP_FindSubHeap( heapPtr, ptr )) != NULL) && - (((char *)ptr >= (char *)subheap + subheap->headerSize - + sizeof(ARENA_INUSE)))); - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - return ret; -} - - -void DumpStackFrames ( PULONG Frame, ULONG FrameCount ) -{ - ULONG i=0; - - DbgPrint("Frames: "); - if ( !Frame ) - { -#if defined __GNUC__ - __asm__("mov %%ebp, %0" : "=r" (Frame) : ); -#elif defined(_MSC_VER) - __asm mov [Frame], ebp -#endif - Frame = (PULONG)Frame[0]; // step out of DumpStackFrames - } - while ( Frame != 0 && (ULONG)Frame != 0xDEADBEEF && (ULONG)Frame != 0xcdcdcdcd && (ULONG)Frame != 0xcccccccc && i++ < FrameCount ) - { - DbgPrint("<%p>", (PVOID)Frame[1]); - if (Frame[1] == 0xdeadbeef) - break; - Frame = (PULONG)Frame[0]; - DbgPrint(" "); - } - DbgPrint("\n"); + return FALSE; + } + /* Check that prev arena is really the previous block */ + if ((const char *)(pPrev + 1) + (pPrev->size & ARENA_SIZE_MASK) != (const char *)pArena) + { + ERR("Heap %p: prev arena %p is not prev for in-use %p\n", + subheap->heap, pPrev, pArena ); + return FALSE; + } + } + return TRUE; } /*********************************************************************** @@ -990,96 +1000,79 @@ * Validates a block is a valid arena. * * RETURNS - * TRUE: Success - * FALSE: Failure - */ -static BOOLEAN HEAP_IsRealArena( - HANDLE heap, /* [in] Handle to the heap */ - ULONG flags, /* [in] Bit flags that control access during operation */ - PVOID block, /* [in] Optional pointer to memory block to validate */ - BOOLEAN quiet /* [in] Flag - if true, HEAP_ValidateInUseArena - * does not complain */ -) -{ - SUBHEAP *subheap; - HEAP *heapPtr = (HEAP *)(heap); - BOOLEAN ret = TRUE; - - if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) - { - DPRINT("Invalid heap %p!\n", heap ); - return FALSE; - } - - flags &= HEAP_NO_SERIALIZE; - flags |= heapPtr->flags; - /* calling HeapLock may result in infinite recursion, so do the critsect directly */ - if (!(flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - - if (block) - { - /* Only check this single memory block */ - - /* The following code is really HEAP_IsInsideHeap * - * with serialization already done. */ - if (!(subheap = HEAP_FindSubHeap( heapPtr, block )) || - ((char *)block < (char *)subheap + subheap->headerSize - + sizeof(ARENA_INUSE))) - { - if (quiet == NOISY) - { - DPRINT("Heap %p: block %p is not inside heap\n", - heap, block ); - DumpStackFrames(NULL,10); - } - else if (WARN_ON(heap)) - { - DPRINT1("Heap %p: block %p is not inside heap\n", - heap, block ); - DumpStackFrames(NULL,10); - } - ret = FALSE; - } - else - ret = HEAP_ValidateInUseArena( subheap, (ARENA_INUSE *)block - 1, quiet ); - - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - return ret; - } - - subheap = &heapPtr->subheap; - while (subheap && ret) - { - char *ptr = (char *)subheap + subheap->headerSize; - while (ptr < (char *)subheap + subheap->size) - { - if (*(PULONG)ptr & ARENA_FLAG_FREE) - { - if (!HEAP_ValidateFreeArena( subheap, (ARENA_FREE *)ptr )) + * TRUE: Success + * FALSE: Failure + */ +static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ + DWORD flags, /* [in] Bit flags that control access during operation */ + LPCVOID block, /* [in] Optional pointer to memory block to validate */ + BOOL quiet ) /* [in] Flag - if true, HEAP_ValidateInUseArena + * does not complain */ +{ + SUBHEAP *subheap; + BOOL ret = TRUE; + + if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) + { + ERR("Invalid heap %p!\n", heapPtr ); + return FALSE; + } + + flags &= HEAP_NO_SERIALIZE; + flags |= heapPtr->flags; + /* calling HeapLock may result in infinite recursion, so do the critsect directly */ + if (!(flags & HEAP_NO_SERIALIZE)) + RtlEnterHeapLock( &heapPtr->critSection ); + + if (block) + { + /* Only check this single memory block */ + + if (!(subheap = HEAP_FindSubHeap( heapPtr, block )) || + ((const char *)block < (char *)subheap + subheap->headerSize + + sizeof(ARENA_INUSE))) + { + if (quiet == NOISY) + ERR("Heap %p: block %p is not inside heap\n", heapPtr, block ); + else if (WARN_ON(heap)) + WARN("Heap %p: block %p is not inside heap\n", heapPtr, block ); + ret = FALSE; + } else + ret = HEAP_ValidateInUseArena( subheap, (const ARENA_INUSE *)block - 1, quiet ); + + if (!(flags & HEAP_NO_SERIALIZE)) + RtlLeaveHeapLock( &heapPtr->critSection ); + return ret; + } + + subheap = &heapPtr->subheap; + while (subheap && ret) + { + char *ptr = (char *)subheap + subheap->headerSize; + while (ptr < (char *)subheap + subheap->size) + { + if (*(DWORD *)ptr & ARENA_FLAG_FREE) { - ret = FALSE; - break; + if (!HEAP_ValidateFreeArena( subheap, (ARENA_FREE *)ptr )) { + ret = FALSE; + break; + } + ptr += sizeof(ARENA_FREE) + (*(DWORD *)ptr & ARENA_SIZE_MASK); } - ptr += sizeof(ARENA_FREE) + (*(PULONG)ptr & ARENA_SIZE_MASK); - } - else - { - if (!HEAP_ValidateInUseArena( subheap, (ARENA_INUSE *)ptr, NOISY )) + else { - ret = FALSE; - break; + if (!HEAP_ValidateInUseArena( subheap, (ARENA_INUSE *)ptr, NOISY )) { + ret = FALSE; + break; + } + ptr += sizeof(ARENA_INUSE) + (*(DWORD *)ptr & ARENA_SIZE_MASK); } - ptr += sizeof(ARENA_INUSE) + (*(PULONG)ptr & ARENA_SIZE_MASK); - } - } - subheap = subheap->next; - } - - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - return ret; + } + subheap = subheap->next; + } + + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + return ret; } @@ -1093,39 +1086,38 @@ */ HANDLE NTAPI RtlCreateHeap(ULONG flags, - PVOID BaseAddress, - SIZE_T maxSize, - SIZE_T initialSize, + PVOID addr, + SIZE_T totalSize, + SIZE_T commitSize, PVOID Lock, PRTL_HEAP_PARAMETERS Parameters) { SUBHEAP *subheap; - HEAP *heapPtr; /* Allocate the heap block */ - if (!maxSize) - { - maxSize = HEAP_DEF_SIZE; - flags |= HEAP_GROWABLE; - } - if (!(subheap = HEAP_CreateSubHeap( BaseAddress, NULL, flags, initialSize, - maxSize, Parameters ))) - { - return 0; - } + if (!totalSize) + { + totalSize = HEAP_DEF_SIZE; + flags |= HEAP_GROWABLE; + } + if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize, Parameters ))) return 0; if (RtlpGetMode() == UserMode) { - /* link it into the per-process heap list */ - RtlEnterHeapLock (&RtlpProcessHeapsListLock); - - heapPtr = subheap->heap; - heapPtr->next = (HEAP*)NtCurrentPeb()->ProcessHeaps; - NtCurrentPeb()->ProcessHeaps = (HANDLE)heapPtr; - NtCurrentPeb()->NumberOfHeaps++; - - RtlLeaveHeapLock (&RtlpProcessHeapsListLock); + /* link it into the per-process heap list */ + if (processHeap) + { + HEAP *heapPtr = subheap->heap; + RtlEnterHeapLock( &processHeap->critSection ); + list_add_head( &processHeap->entry, &heapPtr->entry ); + RtlLeaveHeapLock( &processHeap->critSection ); + } + else + { + processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ + list_init( &processHeap->entry ); + } } return (HANDLE)subheap; @@ -1148,8 +1140,6 @@ { HEAP *heapPtr = HEAP_GetPtr( heap ); SUBHEAP *subheap; - ULONG flags; - HEAP **pptr; DPRINT("%p\n", heap ); if (!heapPtr) @@ -1161,32 +1151,21 @@ return heap; /* cannot delete the main process heap */ /* remove it from the per-process list */ - RtlEnterHeapLock (&RtlpProcessHeapsListLock); - - pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; - while (*pptr && *pptr != heapPtr) pptr = &(*pptr)->next; - if (*pptr) *pptr = (*pptr)->next; - NtCurrentPeb()->NumberOfHeaps--; - - RtlLeaveHeapLock (&RtlpProcessHeapsListLock); + RtlEnterHeapLock( &processHeap->critSection ); + list_remove( &heapPtr->entry ); + RtlLeaveHeapLock( &processHeap->critSection ); } - RtlDeleteHeapLock( &heapPtr->critSection ); - subheap = &heapPtr->subheap; - // We must save the flags. The first subheap is located after - // the heap structure. If we release the first subheap, - // we release also the heap structure. - flags = heapPtr->flags; - while (subheap) - { - SUBHEAP *next = subheap->next; - ULONG dummySize = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&subheap, - &dummySize, - MEM_RELEASE); - subheap = next; - } + RtlDeleteHeapLock( &heapPtr->critSection ); + subheap = &heapPtr->subheap; + while (subheap) + { + SUBHEAP *next = subheap->next; + SIZE_T size = 0; + void *addr = subheap; + ZwFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); + subheap = next; + } return (HANDLE)NULL; } @@ -1208,6 +1187,7 @@ ARENA_INUSE *pInUse; SUBHEAP *subheap; HEAP *heapPtr = HEAP_GetPtr( heap ); + SIZE_T rounded_size; /* Validate the parameters */ @@ -1218,57 +1198,54 @@ return NULL; } //flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; - flags |= heapPtr->flags; - if (!(flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - size = (size + 7) & ~7; - if (size < HEAP_MIN_BLOCK_SIZE) - size = HEAP_MIN_BLOCK_SIZE; + flags |= heapPtr->flags; + rounded_size = ROUND_SIZE(size); + if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; + + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + /* Locate a suitable free block */ /* Locate a suitable free block */ - if (!(pArena = HEAP_FindFreeBlock( heapPtr, size, &subheap ))) - { - DPRINT("(%p,%08lx,%08lx): returning NULL\n", - heap, flags, size ); - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - if (flags & HEAP_GENERATE_EXCEPTIONS) - RtlRaiseStatus( STATUS_NO_MEMORY ); - return NULL; - } + if (!(pArena = HEAP_FindFreeBlock( heapPtr, rounded_size, &subheap ))) + { + TRACE("(%p,%08lx,%08lx): returning NULL\n", + heap, flags, size ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); + return NULL; + } /* Remove the arena from the free list */ - pArena->next->prev = pArena->prev; - pArena->prev->next = pArena->next; - - /* Build the in-use arena */ - - pInUse = (ARENA_INUSE *)pArena; - pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) - + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - pInUse->threadId = (ULONG)NtCurrentTeb()->Cid.UniqueThread; - pInUse->magic = ARENA_INUSE_MAGIC; - - /* Save user flags */ - subheap->UserFlags = flags & HEAP_SETTABLE_USER_FLAGS; - - /* Shrink the block */ - - HEAP_ShrinkBlock( subheap, pInUse, size ); - - if (flags & HEAP_ZERO_MEMORY) - memset( pInUse + 1, 0, pInUse->size & ARENA_SIZE_MASK ); - else if (TRACE_ON(heap)) - memset( pInUse + 1, ARENA_INUSE_FILLER, pInUse->size & ARENA_SIZE_MASK ); - - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - - DPRINT("(%p,%08lx,%08lx): returning %p\n", - heap, flags, size, (PVOID)(pInUse + 1) ); - return (PVOID)(pInUse + 1); + list_remove( &pArena->entry ); + + /* Build the in-use arena */ + + pInUse = (ARENA_INUSE *)pArena; + + /* in-use arena is smaller than free arena, + * so we have to add the difference to the size */ + pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); + pInUse->magic = ARENA_INUSE_MAGIC; + + /* Save user flags */ + subheap->UserFlags = flags & HEAP_SETTABLE_USER_FLAGS; + + /* Shrink the block */ + + HEAP_ShrinkBlock( subheap, pInUse, rounded_size ); + pInUse->unused_bytes = (pInUse->size & ARENA_SIZE_MASK) - size; + + if (flags & HEAP_ZERO_MEMORY) + clear_block( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); + else + mark_block_uninitialized( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); + + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + + TRACE("(%p,%08lx,%08lx): returning %p\n", heap, flags, size, pInUse + 1 ); + return (LPVOID)(pInUse + 1); } @@ -1286,46 +1263,42 @@ PVOID ptr /* [in] Address of memory to free */ ) { - ARENA_INUSE *pInUse; - SUBHEAP *subheap; - HEAP *heapPtr = HEAP_GetPtr( heap ); - - /* Validate the parameters */ - - if (!heapPtr) - return FALSE; - if (!ptr) /* Freeing a NULL ptr is doesn't indicate an error in Win2k */ - { - DPRINT("(%p,%08lx,%p): asked to free NULL\n", - heap, flags, ptr ); - return TRUE; - } - - flags &= HEAP_NO_SERIALIZE; - flags |= heapPtr->flags; - if (!(flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - if (!HEAP_IsRealArena( heap, HEAP_NO_SERIALIZE, ptr, QUIET )) - { - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - DPRINT("(%p,%08lx,%p): returning FALSE\n", - heap, flags, ptr ); - return FALSE; - } - - /* Turn the block into a free block */ - - pInUse = (ARENA_INUSE *)ptr - 1; - subheap = HEAP_FindSubHeap( heapPtr, pInUse ); - HEAP_MakeInUseBlockFree( subheap, pInUse, heapPtr->flags ); - - if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - - DPRINT("(%p,%08lx,%p): returning TRUE\n", - heap, flags, ptr ); - return TRUE; + ARENA_INUSE *pInUse; + SUBHEAP *subheap; + HEAP *heapPtr; + + /* Validate the parameters */ + + if (!ptr) return TRUE; /* freeing a NULL ptr isn't an error in Win2k */ + + heapPtr = HEAP_GetPtr( heap ); + if (!heapPtr) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); + return FALSE; + } + + flags &= HEAP_NO_SERIALIZE; + flags |= heapPtr->flags; + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) + { + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + TRACE("(%p,%08lx,%p): returning FALSE\n", heap, flags, ptr ); + return FALSE; + } + + /* Turn the block into a free block */ + + pInUse = (ARENA_INUSE *)ptr - 1; + subheap = HEAP_FindSubHeap( heapPtr, pInUse ); + HEAP_MakeInUseBlockFree( subheap, pInUse ); + + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + + TRACE("(%p,%08lx,%p): returning TRUE\n", heap, flags, ptr ); + return TRUE; } @@ -1344,133 +1317,119 @@ * @implemented */ PVOID NTAPI RtlReAllocateHeap( - HANDLE Heap, - ULONG Flags, - PVOID Ptr, - ULONG Size + HANDLE heap, + ULONG flags, + PVOID ptr, + SIZE_T size ) { - ARENA_INUSE *pArena; - ULONG oldSize; - HEAP *heapPtr; - SUBHEAP *subheap; - - if (!Ptr) - return FALSE; - if (!(heapPtr = HEAP_GetPtr( Heap ))) - return FALSE; + ARENA_INUSE *pArena; + HEAP *heapPtr; + SUBHEAP *subheap; + SIZE_T oldSize, rounded_size; + + if (!ptr) return NULL; + if (!(heapPtr = HEAP_GetPtr( heap ))) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); + return NULL; + } /* Validate the parameters */ //Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | // HEAP_REALLOC_IN_PLACE_ONLY; - Flags |= heapPtr->flags; - Size = (Size + 7) & ~7; - if (Size < HEAP_MIN_BLOCK_SIZE) - Size = HEAP_MIN_BLOCK_SIZE; - - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - if (!HEAP_IsRealArena( Heap, HEAP_NO_SERIALIZE, Ptr, QUIET )) - { - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - DPRINT("(%p,%08lx,%p,%08lx): returning NULL\n", - Heap, Flags, Ptr, Size ); - if (Flags & HEAP_GENERATE_EXCEPTIONS) - RtlRaiseStatus( STATUS_NO_MEMORY ); - return NULL; - } - - /* Check if we need to grow the block */ - - pArena = (ARENA_INUSE *)Ptr - 1; - pArena->threadId = (ULONG)NtCurrentTeb()->Cid.UniqueThread; - - subheap = HEAP_FindSubHeap( heapPtr, pArena ); - oldSize = (pArena->size & ARENA_SIZE_MASK); - if (Size > oldSize) - { - char *pNext = (char *)(pArena + 1) + oldSize; - if ((pNext < (char *)subheap + subheap->size) && - (*(PULONG)pNext & ARENA_FLAG_FREE) && - (oldSize + (*(PULONG)pNext & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) >= Size)) - { - /* The next block is free and large enough */ - ARENA_FREE *pFree = (ARENA_FREE *)pNext; - pFree->next->prev = pFree->prev; - pFree->prev->next = pFree->next; - pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); - if (!HEAP_Commit( subheap, (char *)pArena + sizeof(ARENA_INUSE) - + Size + HEAP_MIN_BLOCK_SIZE, - heapPtr->flags)) - { - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - if (Flags & HEAP_GENERATE_EXCEPTIONS) - RtlRaiseStatus( STATUS_NO_MEMORY ); - return NULL; - } - HEAP_ShrinkBlock( subheap, pArena, Size ); - } - else /* Do it the hard way */ - { - ARENA_FREE *pNew; - ARENA_INUSE *pInUse; - SUBHEAP *newsubheap; - - if ((Flags & HEAP_REALLOC_IN_PLACE_ONLY) || - !(pNew = HEAP_FindFreeBlock( heapPtr, Size, &newsubheap ))) - { - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - if (Flags & HEAP_GENERATE_EXCEPTIONS) - RtlRaiseStatus( STATUS_NO_MEMORY ); - return NULL; - } - - /* Build the in-use arena */ - - pNew->next->prev = pNew->prev; - pNew->prev->next = pNew->next; - pInUse = (ARENA_INUSE *)pNew; - pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) - + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - pInUse->threadId = (ULONG)NtCurrentTeb()->Cid.UniqueThread; - pInUse->magic = ARENA_INUSE_MAGIC; - HEAP_ShrinkBlock( newsubheap, pInUse, Size ); - memcpy( pInUse + 1, pArena + 1, oldSize ); - - /* Free the previous block */ - - HEAP_MakeInUseBlockFree( subheap, pArena, Flags ); - subheap = newsubheap; - pArena = pInUse; - } - } - else - HEAP_ShrinkBlock( subheap, pArena, Size ); /* Shrink the block */ - - /* Clear the extra bytes if needed */ - - if (Size > oldSize) - { - if (Flags & HEAP_ZERO_MEMORY) - memset( (char *)(pArena + 1) + oldSize, 0, - (pArena->size & ARENA_SIZE_MASK) - oldSize ); - else if (TRACE_ON(heap)) - memset( (char *)(pArena + 1) + oldSize, ARENA_INUSE_FILLER, - (pArena->size & ARENA_SIZE_MASK) - oldSize ); - } - - /* Return the new arena */ - - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - - DPRINT("(%p,%08lx,%p,%08lx): returning %p\n", - Heap, Flags, Ptr, Size, (PVOID)(pArena + 1) ); - return (PVOID)(pArena + 1); + flags |= heapPtr->flags; + rounded_size = ROUND_SIZE(size); + if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; + + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) + { + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + TRACE("(%p,%08lx,%p,%08lx): returning NULL\n", heap, flags, ptr, size ); + return NULL; + } + + pArena = (ARENA_INUSE *)ptr - 1; + subheap = HEAP_FindSubHeap( heapPtr, pArena ); + oldSize = (pArena->size & ARENA_SIZE_MASK); + if (rounded_size > oldSize) + { + char *pNext = (char *)(pArena + 1) + oldSize; + if ((pNext < (char *)subheap + subheap->size) && + (*(DWORD *)pNext & ARENA_FLAG_FREE) && + (oldSize + (*(DWORD *)pNext & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) >= rounded_size)) + { + /* The next block is free and large enough */ + ARENA_FREE *pFree = (ARENA_FREE *)pNext; + list_remove( &pFree->entry ); + pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); + if (!HEAP_Commit( subheap, pArena, rounded_size )) + { + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_NO_MEMORY ); + return NULL; + } + HEAP_ShrinkBlock( subheap, pArena, rounded_size ); + } + else /* Do it the hard way */ + { + ARENA_FREE *pNew; + ARENA_INUSE *pInUse; + SUBHEAP *newsubheap; + + if ((flags & HEAP_REALLOC_IN_PLACE_ONLY) || + !(pNew = HEAP_FindFreeBlock( heapPtr, rounded_size, &newsubheap ))) + { + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_NO_MEMORY ); + return NULL; + } + + /* Build the in-use arena */ + + list_remove( &pNew->entry ); + pInUse = (ARENA_INUSE *)pNew; + pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) + + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); + pInUse->magic = ARENA_INUSE_MAGIC; + HEAP_ShrinkBlock( newsubheap, pInUse, rounded_size ); + mark_block_initialized( pInUse + 1, oldSize ); + memcpy( pInUse + 1, pArena + 1, oldSize ); + + /* Free the previous block */ + + HEAP_MakeInUseBlockFree( subheap, pArena ); + subheap = newsubheap; + pArena = pInUse; + } + } + else HEAP_ShrinkBlock( subheap, pArena, rounded_size ); /* Shrink the block */ + + pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size; + + /* Clear the extra bytes if needed */ + + if (rounded_size > oldSize) + { + if (flags & HEAP_ZERO_MEMORY) + clear_block( (char *)(pArena + 1) + oldSize, + (pArena->size & ARENA_SIZE_MASK) - oldSize ); + else + mark_block_uninitialized( (char *)(pArena + 1) + oldSize, + (pArena->size & ARENA_SIZE_MASK) - oldSize ); + } + + /* Return the new arena */ + + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + + TRACE("(%p,%08lx,%p,%08lx): returning %p\n", heap, flags, ptr, size, pArena + 1 ); + return (LPVOID)(pArena + 1); } @@ -1551,35 +1510,36 @@ */ ULONG NTAPI RtlSizeHeap( - HANDLE Heap, - ULONG Flags, - PVOID Ptr + HANDLE heap, + ULONG flags, + PVOID ptr ) { - ULONG ret; - HEAP *heapPtr = HEAP_GetPtr( Heap ); - - if (!heapPtr) - return 0; - Flags &= HEAP_NO_SERIALIZE; - Flags |= heapPtr->flags; - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - if (!HEAP_IsRealArena( Heap, HEAP_NO_SERIALIZE, Ptr, QUIET )) - { - ret = 0xffffffff; - } - else - { - ARENA_INUSE *pArena = (ARENA_INUSE *)Ptr - 1; - ret = pArena->size & ARENA_SIZE_MASK; - } - if (!(Flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - - DPRINT("(%p,%08lx,%p): returning %08lx\n", - Heap, Flags, Ptr, ret ); - return ret; + SIZE_T ret; + HEAP *heapPtr = HEAP_GetPtr( heap ); + + if (!heapPtr) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); + return ~0UL; + } + flags &= HEAP_NO_SERIALIZE; + flags |= heapPtr->flags; + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + ret = ~0UL; + } + else + { + ARENA_INUSE *pArena = (ARENA_INUSE *)ptr - 1; + ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; + } + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + + TRACE("(%p,%08lx,%p): returning %08lx\n", heap, flags, ptr, ret ); + return ret; } @@ -1613,133 +1573,6 @@ return HEAP_IsRealArena( heapPtr, Flags, Block, QUIET ); } - -/*********************************************************************** - * HeapWalk (KERNEL32.344) - * Enumerates the memory blocks in a specified heap. - * See HEAP_Dump() for info on heap structure. - * - * TODO - * - handling of PROCESS_HEAP_ENTRY_MOVEABLE and - * PROCESS_HEAP_ENTRY_DDESHARE (needs heap.c support) - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -#if 0 -BOOLEAN NTAPI HeapWalk( - HANDLE heap, /* [in] Handle to heap to enumerate */ - LPPROCESS_HEAP_ENTRY entry /* [out] Pointer to structure of enumeration info */ -) -{ - HEAP *heapPtr = HEAP_GetPtr(heap); - SUBHEAP *sub, *currentheap = NULL; - BOOLEAN ret = FALSE; - char *ptr; - int region_index = 0; - - if (!heapPtr || !entry) - { - return FALSE; - } - - if (!(heapPtr->flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); - - /* set ptr to the next arena to be examined */ - - if (!entry->lpData) /* first call (init) ? */ - { - DPRINT("begin walking of heap 0x%08x.\n", heap); - /*HEAP_Dump(heapPtr);*/ - currentheap = &heapPtr->subheap; - ptr = (char*)currentheap + currentheap->headerSize; - } - else - { - ptr = entry->lpData; - sub = &heapPtr->subheap; - while (sub) - { - if (((char *)ptr >= (char *)sub) && - ((char *)ptr < (char *)sub + sub->size)) - { - currentheap = sub; - break; - } - sub = sub->next; - region_index++; - } - if (currentheap == NULL) - { - DPRINT("no matching subheap found, shouldn't happen !\n"); - goto HW_end; - } - - ptr += entry->cbData; /* point to next arena */ - if (ptr > (char *)currentheap + currentheap->size - 1) - { /* proceed with next subheap */ - if (!(currentheap = currentheap->next)) - { /* successfully finished */ - DPRINT("end reached.\n"); - goto HW_end; - } - ptr = (char*)currentheap + currentheap->headerSize; - } - } - - entry->wFlags = 0; - if (*(PULONG)ptr & ARENA_FLAG_FREE) - { - ARENA_FREE *pArena = (ARENA_FREE *)ptr; - - /*DPRINT("free, magic: %04x\n", pArena->magic);*/ - - entry->lpData = pArena + 1; - entry->cbData = pArena->size & ARENA_SIZE_MASK; - entry->cbOverhead = sizeof(ARENA_FREE); - entry->wFlags = PROCESS_HEAP_UNCOMMITTED_RANGE; - } - else - { - ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - - /*DPRINT("busy, magic: %04x\n", pArena->magic);*/ - - entry->lpData = pArena + 1; - entry->cbData = pArena->size & ARENA_SIZE_MASK; - entry->cbOverhead = sizeof(ARENA_INUSE); - entry->wFlags = PROCESS_HEAP_ENTRY_BUSY; - /* FIXME: can't handle PROCESS_HEAP_ENTRY_MOVEABLE - and PROCESS_HEAP_ENTRY_DDESHARE yet */ - } - - entry->iRegionIndex = region_index; - - /* first element of heap ? */ - if (ptr == (char *)(currentheap + currentheap->headerSize)) - { - entry->wFlags |= PROCESS_HEAP_REGION; - entry->Foo.Region.dwCommittedSize = currentheap->commitSize; - entry->Foo.Region.dwUnCommittedSize = - currentheap->size - currentheap->commitSize; - entry->Foo.Region.lpFirstBlock = /* first valid block */ - currentheap + currentheap->headerSize; - entry->Foo.Region.lpLastBlock = /* first invalid block */ - currentheap + currentheap->size; - } - ret = TRUE; - -HW_end: - if (!(heapPtr->flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); - - return ret; -} -#endif - - VOID RtlInitializeHeapManager(VOID) { @@ -1751,7 +1584,7 @@ Peb->MaximumNumberOfHeaps = -1; /* no limit */ Peb->ProcessHeaps = NULL; - RtlInitializeHeapLock(&RtlpProcessHeapsListLock); + //RtlInitializeHeapLock(&RtlpProcessHeapsListLock); } @@ -1762,6 +1595,13 @@ RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, PVOID lParam) { + DPRINT1("UNIMPLEMENTED\n"); + DPRINT1("UNIMPLEMENTED\n"); + DPRINT1("UNIMPLEMENTED\n"); + DPRINT1("UNIMPLEMENTED\n"); + DbgBreakPoint(); + return STATUS_SUCCESS; +#if 0 NTSTATUS Status = STATUS_SUCCESS; HEAP** pptr; @@ -1777,6 +1617,7 @@ RtlLeaveHeapLock(&RtlpProcessHeapsListLock); return Status; +#endif } @@ -1784,28 +1625,22 @@ * @implemented */ ULONG NTAPI -RtlGetProcessHeaps(ULONG HeapCount, - HANDLE *HeapArray) -{ - ULONG Result = 0; - HEAP ** pptr; - - RtlEnterHeapLock(&RtlpProcessHeapsListLock); - - Result = NtCurrentPeb()->NumberOfHeaps; - - if (NtCurrentPeb()->NumberOfHeaps <= HeapCount) - { - int i = 0; - for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr = &(*pptr)->next) - { - HeapArray[i++] = *pptr; - } - } - - RtlLeaveHeapLock (&RtlpProcessHeapsListLock); - - return Result; +RtlGetProcessHeaps(ULONG count, + HANDLE *heaps ) +{ + ULONG total = 1; /* main heap */ + struct list *ptr; + + RtlEnterHeapLock( &processHeap->critSection ); + LIST_FOR_EACH( ptr, &processHeap->entry ) total++; + if (total <= count) + { + *heaps++ = processHeap; + LIST_FOR_EACH( ptr, &processHeap->entry ) + *heaps++ = LIST_ENTRY( ptr, HEAP, entry ); + } + RtlLeaveHeapLock( &processHeap->critSection ); + return total; } @@ -1815,6 +1650,13 @@ BOOLEAN NTAPI RtlValidateProcessHeaps(VOID) { + DPRINT1("UNIMPLEMENTED\n"); + DPRINT1("UNIMPLEMENTED\n"); + DPRINT1("UNIMPLEMENTED\n"); + DPRINT1("UNIMPLEMENTED\n"); + DbgBreakPoint(); + return STATUS_SUCCESS; +#if 0 BOOLEAN Result = TRUE; HEAP ** pptr; @@ -1832,6 +1674,7 @@ RtlLeaveHeapLock (&RtlpProcessHeapsListLock); return Result; +#endif }
18 years, 6 months
1
0
0
0
[mbosma] 22638: Remove all curses except 'semprini'.
by mbosma@svn.reactos.org
Author: mbosma Date: Mon Jun 26 20:39:23 2006 New Revision: 22638 URL:
http://svn.reactos.org/svn/reactos?rev=22638&view=rev
Log: Remove all curses except 'semprini'. Modified: trunk/irc/ArchBlackmann/curse.txt Modified: trunk/irc/ArchBlackmann/curse.txt URL:
http://svn.reactos.org/svn/reactos/trunk/irc/ArchBlackmann/curse.txt?rev=22…
============================================================================== --- trunk/irc/ArchBlackmann/curse.txt (original) +++ trunk/irc/ArchBlackmann/curse.txt Mon Jun 26 20:39:23 2006 @@ -1,27 +1,1 @@ -shit -fuck -pussy - ass - ass- --ass -dumbass -jackass -fatass -asshole -smartass -cunt -fucker -bitch -dick -penile -stfu -omfg -lmao - ass. --ass. -semprini -goat.cx -ekush -akshor -poop -guten morgen +semprini
18 years, 6 months
1
0
0
0
[ion] 22637: - Move the SDK to /PSDK or else we'll never get MSVC compiling right.
by ion@svn.reactos.org
Author: ion Date: Mon Jun 26 19:32:53 2006 New Revision: 22637 URL:
http://svn.reactos.org/svn/reactos?rev=22637&view=rev
Log: - Move the SDK to /PSDK or else we'll never get MSVC compiling right. Added: trunk/reactos/include/psdk/ trunk/reactos/include/psdk/DShow.h - copied unchanged from r22612, trunk/reactos/include/DShow.h trunk/reactos/include/psdk/README.w32api - copied unchanged from r22612, trunk/reactos/include/README.w32api trunk/reactos/include/psdk/accctrl.h - copied unchanged from r22612, trunk/reactos/include/accctrl.h trunk/reactos/include/psdk/aclapi.h - copied unchanged from r22612, trunk/reactos/include/aclapi.h trunk/reactos/include/psdk/aclui.h - copied unchanged from r22612, trunk/reactos/include/aclui.h trunk/reactos/include/psdk/activecf.h - copied unchanged from r22612, trunk/reactos/include/activecf.h trunk/reactos/include/psdk/advpub.h - copied unchanged from r22612, trunk/reactos/include/advpub.h trunk/reactos/include/psdk/af_irda.h - copied unchanged from r22612, trunk/reactos/include/af_irda.h trunk/reactos/include/psdk/afxres.h - copied unchanged from r22612, trunk/reactos/include/afxres.h trunk/reactos/include/psdk/amaudio.h - copied unchanged from r22612, trunk/reactos/include/amaudio.h trunk/reactos/include/psdk/amparse.h - copied unchanged from r22612, trunk/reactos/include/amparse.h trunk/reactos/include/psdk/amvideo.h - copied unchanged from r22612, trunk/reactos/include/amvideo.h trunk/reactos/include/psdk/appmgmt.h - copied unchanged from r22612, trunk/reactos/include/appmgmt.h trunk/reactos/include/psdk/audevcod.h - copied unchanged from r22612, trunk/reactos/include/audevcod.h trunk/reactos/include/psdk/authz.h - copied unchanged from r22612, trunk/reactos/include/authz.h trunk/reactos/include/psdk/basetsd.h - copied unchanged from r22612, trunk/reactos/include/basetsd.h trunk/reactos/include/psdk/basetyps.h - copied unchanged from r22612, trunk/reactos/include/basetyps.h trunk/reactos/include/psdk/cderr.h - copied unchanged from r22612, trunk/reactos/include/cderr.h trunk/reactos/include/psdk/cguid.h - copied unchanged from r22612, trunk/reactos/include/cguid.h trunk/reactos/include/psdk/comcat.h - copied unchanged from r22612, trunk/reactos/include/comcat.h trunk/reactos/include/psdk/commctrl.h - copied unchanged from r22612, trunk/reactos/include/commctrl.h trunk/reactos/include/psdk/commdlg.h - copied unchanged from r22612, trunk/reactos/include/commdlg.h trunk/reactos/include/psdk/cpl.h - copied unchanged from r22612, trunk/reactos/include/cpl.h trunk/reactos/include/psdk/cplext.h - copied unchanged from r22612, trunk/reactos/include/cplext.h trunk/reactos/include/psdk/custcntl.h - copied unchanged from r22612, trunk/reactos/include/custcntl.h trunk/reactos/include/psdk/cvconst.h - copied unchanged from r22612, trunk/reactos/include/cvconst.h trunk/reactos/include/psdk/d3d.h - copied unchanged from r22612, trunk/reactos/include/d3d.h trunk/reactos/include/psdk/d3d8.h - copied unchanged from r22612, trunk/reactos/include/d3d8.h trunk/reactos/include/psdk/d3d8caps.h - copied unchanged from r22612, trunk/reactos/include/d3d8caps.h trunk/reactos/include/psdk/d3d8types.h - copied unchanged from r22612, trunk/reactos/include/d3d8types.h trunk/reactos/include/psdk/d3d9.h - copied unchanged from r22612, trunk/reactos/include/d3d9.h trunk/reactos/include/psdk/d3d9caps.h - copied unchanged from r22612, trunk/reactos/include/d3d9caps.h trunk/reactos/include/psdk/d3d9types.h - copied unchanged from r22612, trunk/reactos/include/d3d9types.h trunk/reactos/include/psdk/d3dcaps.h - copied unchanged from r22612, trunk/reactos/include/d3dcaps.h trunk/reactos/include/psdk/d3drm.h - copied unchanged from r22612, trunk/reactos/include/d3drm.h trunk/reactos/include/psdk/d3dtypes.h - copied unchanged from r22612, trunk/reactos/include/d3dtypes.h trunk/reactos/include/psdk/d3dvec.inl - copied unchanged from r22612, trunk/reactos/include/d3dvec.inl trunk/reactos/include/psdk/d3dx8core.h - copied unchanged from r22612, trunk/reactos/include/d3dx8core.h trunk/reactos/include/psdk/dbghelp.h - copied unchanged from r22612, trunk/reactos/include/dbghelp.h trunk/reactos/include/psdk/dbt.h - copied unchanged from r22612, trunk/reactos/include/dbt.h trunk/reactos/include/psdk/dde.h - copied unchanged from r22612, trunk/reactos/include/dde.h trunk/reactos/include/psdk/ddeml.h - copied unchanged from r22612, trunk/reactos/include/ddeml.h trunk/reactos/include/psdk/ddraw.h - copied unchanged from r22612, trunk/reactos/include/ddraw.h trunk/reactos/include/psdk/ddrawgdi.h - copied unchanged from r22612, trunk/reactos/include/ddrawgdi.h trunk/reactos/include/psdk/devguid.h - copied unchanged from r22612, trunk/reactos/include/devguid.h trunk/reactos/include/psdk/dhcpcapi.h - copied unchanged from r22612, trunk/reactos/include/dhcpcapi.h trunk/reactos/include/psdk/dhcpcsdk.h - copied unchanged from r22612, trunk/reactos/include/dhcpcsdk.h trunk/reactos/include/psdk/digitalv.h - copied unchanged from r22612, trunk/reactos/include/digitalv.h trunk/reactos/include/psdk/dinput.h - copied unchanged from r22612, trunk/reactos/include/dinput.h trunk/reactos/include/psdk/dlgs.h - copied unchanged from r22612, trunk/reactos/include/dlgs.h trunk/reactos/include/psdk/docobj.h - copied unchanged from r22612, trunk/reactos/include/docobj.h trunk/reactos/include/psdk/dplay.h - copied unchanged from r22612, trunk/reactos/include/dplay.h trunk/reactos/include/psdk/dplobby.h - copied unchanged from r22612, trunk/reactos/include/dplobby.h trunk/reactos/include/psdk/dsconf.h - copied unchanged from r22612, trunk/reactos/include/dsconf.h trunk/reactos/include/psdk/dsdriver.h - copied unchanged from r22612, trunk/reactos/include/dsdriver.h trunk/reactos/include/psdk/dsound.h - copied unchanged from r22612, trunk/reactos/include/dsound.h trunk/reactos/include/psdk/dsrole.h - copied unchanged from r22612, trunk/reactos/include/dsrole.h trunk/reactos/include/psdk/dv.h - copied unchanged from r22612, trunk/reactos/include/dv.h trunk/reactos/include/psdk/dvdevcod.h - copied unchanged from r22612, trunk/reactos/include/dvdevcod.h trunk/reactos/include/psdk/dxdiag.h - copied unchanged from r22612, trunk/reactos/include/dxdiag.h trunk/reactos/include/psdk/dxerr8.h - copied unchanged from r22612, trunk/reactos/include/dxerr8.h trunk/reactos/include/psdk/dxerr9.h - copied unchanged from r22612, trunk/reactos/include/dxerr9.h trunk/reactos/include/psdk/dxsdkver.h - copied unchanged from r22612, trunk/reactos/include/dxsdkver.h trunk/reactos/include/psdk/edevdefs.h - copied unchanged from r22612, trunk/reactos/include/edevdefs.h trunk/reactos/include/psdk/errorrep.h - copied unchanged from r22612, trunk/reactos/include/errorrep.h trunk/reactos/include/psdk/errors.h - copied unchanged from r22612, trunk/reactos/include/errors.h trunk/reactos/include/psdk/evcode.h - copied unchanged from r22612, trunk/reactos/include/evcode.h trunk/reactos/include/psdk/evntrace.h - copied unchanged from r22612, trunk/reactos/include/evntrace.h trunk/reactos/include/psdk/exdisp.h - copied unchanged from r22612, trunk/reactos/include/exdisp.h trunk/reactos/include/psdk/exdispid.h - copied unchanged from r22612, trunk/reactos/include/exdispid.h trunk/reactos/include/psdk/fci.h - copied unchanged from r22612, trunk/reactos/include/fci.h trunk/reactos/include/psdk/fdi.h - copied unchanged from r22612, trunk/reactos/include/fdi.h trunk/reactos/include/psdk/gdiplus.h - copied unchanged from r22612, trunk/reactos/include/gdiplus.h trunk/reactos/include/psdk/gdiplusbase.h - copied unchanged from r22612, trunk/reactos/include/gdiplusbase.h trunk/reactos/include/psdk/gdiplusbrush.h - copied unchanged from r22612, trunk/reactos/include/gdiplusbrush.h trunk/reactos/include/psdk/gdipluscolor.h - copied unchanged from r22612, trunk/reactos/include/gdipluscolor.h trunk/reactos/include/psdk/gdipluscolormatrix.h - copied unchanged from r22612, trunk/reactos/include/gdipluscolormatrix.h trunk/reactos/include/psdk/gdipluseffects.h - copied unchanged from r22612, trunk/reactos/include/gdipluseffects.h trunk/reactos/include/psdk/gdiplusenums.h - copied unchanged from r22612, trunk/reactos/include/gdiplusenums.h trunk/reactos/include/psdk/gdiplusflat.h - copied unchanged from r22612, trunk/reactos/include/gdiplusflat.h trunk/reactos/include/psdk/gdiplusgpstubs.h - copied unchanged from r22612, trunk/reactos/include/gdiplusgpstubs.h trunk/reactos/include/psdk/gdiplusgraphics.h - copied unchanged from r22612, trunk/reactos/include/gdiplusgraphics.h trunk/reactos/include/psdk/gdiplusheaders.h - copied unchanged from r22612, trunk/reactos/include/gdiplusheaders.h trunk/reactos/include/psdk/gdiplusimageattributes.h - copied unchanged from r22612, trunk/reactos/include/gdiplusimageattributes.h trunk/reactos/include/psdk/gdiplusimaging.h - copied unchanged from r22612, trunk/reactos/include/gdiplusimaging.h trunk/reactos/include/psdk/gdiplusinit.h - copied unchanged from r22612, trunk/reactos/include/gdiplusinit.h trunk/reactos/include/psdk/gdipluslinecaps.h - copied unchanged from r22612, trunk/reactos/include/gdipluslinecaps.h trunk/reactos/include/psdk/gdiplusmatrix.h - copied unchanged from r22612, trunk/reactos/include/gdiplusmatrix.h trunk/reactos/include/psdk/gdiplusmem.h - copied unchanged from r22612, trunk/reactos/include/gdiplusmem.h trunk/reactos/include/psdk/gdiplusmetafile.h - copied unchanged from r22612, trunk/reactos/include/gdiplusmetafile.h trunk/reactos/include/psdk/gdiplusmetaheader.h - copied unchanged from r22612, trunk/reactos/include/gdiplusmetaheader.h trunk/reactos/include/psdk/gdipluspath.h - copied unchanged from r22612, trunk/reactos/include/gdipluspath.h trunk/reactos/include/psdk/gdipluspen.h - copied unchanged from r22612, trunk/reactos/include/gdipluspen.h trunk/reactos/include/psdk/gdipluspixelformats.h - copied unchanged from r22612, trunk/reactos/include/gdipluspixelformats.h trunk/reactos/include/psdk/gdiplusstringformat.h - copied unchanged from r22612, trunk/reactos/include/gdiplusstringformat.h trunk/reactos/include/psdk/gdiplustypes.h - copied unchanged from r22612, trunk/reactos/include/gdiplustypes.h trunk/reactos/include/psdk/guiddef.h - copied unchanged from r22612, trunk/reactos/include/guiddef.h trunk/reactos/include/psdk/hlink.h - copied unchanged from r22612, trunk/reactos/include/hlink.h trunk/reactos/include/psdk/httpext.h - copied unchanged from r22612, trunk/reactos/include/httpext.h trunk/reactos/include/psdk/icmpapi.h - copied unchanged from r22612, trunk/reactos/include/icmpapi.h trunk/reactos/include/psdk/idispids.h - copied unchanged from r22612, trunk/reactos/include/idispids.h trunk/reactos/include/psdk/imagehlp.h - copied unchanged from r22612, trunk/reactos/include/imagehlp.h trunk/reactos/include/psdk/imm.h - copied unchanged from r22612, trunk/reactos/include/imm.h trunk/reactos/include/psdk/in6addr.h - copied unchanged from r22612, trunk/reactos/include/in6addr.h trunk/reactos/include/psdk/inaddr.h - copied unchanged from r22612, trunk/reactos/include/inaddr.h trunk/reactos/include/psdk/initguid.h - copied unchanged from r22612, trunk/reactos/include/initguid.h trunk/reactos/include/psdk/intshcut.h - copied unchanged from r22612, trunk/reactos/include/intshcut.h trunk/reactos/include/psdk/ipexport.h - copied unchanged from r22612, trunk/reactos/include/ipexport.h trunk/reactos/include/psdk/iphlpapi.h - copied unchanged from r22612, trunk/reactos/include/iphlpapi.h trunk/reactos/include/psdk/ipifcons.h - copied unchanged from r22612, trunk/reactos/include/ipifcons.h trunk/reactos/include/psdk/iprtrmib.h - copied unchanged from r22612, trunk/reactos/include/iprtrmib.h trunk/reactos/include/psdk/iptypes.h - copied unchanged from r22612, trunk/reactos/include/iptypes.h trunk/reactos/include/psdk/isguids.h - copied unchanged from r22612, trunk/reactos/include/isguids.h trunk/reactos/include/psdk/ksguid.h - copied unchanged from r22612, trunk/reactos/include/ksguid.h trunk/reactos/include/psdk/ksuuids.h - copied unchanged from r22612, trunk/reactos/include/ksuuids.h trunk/reactos/include/psdk/largeint.h - copied unchanged from r22612, trunk/reactos/include/largeint.h trunk/reactos/include/psdk/lm.h - copied unchanged from r22612, trunk/reactos/include/lm.h trunk/reactos/include/psdk/lmaccess.h - copied unchanged from r22612, trunk/reactos/include/lmaccess.h trunk/reactos/include/psdk/lmalert.h - copied unchanged from r22612, trunk/reactos/include/lmalert.h trunk/reactos/include/psdk/lmapibuf.h - copied unchanged from r22612, trunk/reactos/include/lmapibuf.h trunk/reactos/include/psdk/lmat.h - copied unchanged from r22612, trunk/reactos/include/lmat.h trunk/reactos/include/psdk/lmaudit.h - copied unchanged from r22612, trunk/reactos/include/lmaudit.h trunk/reactos/include/psdk/lmchdev.h - copied unchanged from r22612, trunk/reactos/include/lmchdev.h trunk/reactos/include/psdk/lmconfig.h - copied unchanged from r22612, trunk/reactos/include/lmconfig.h trunk/reactos/include/psdk/lmcons.h - copied unchanged from r22612, trunk/reactos/include/lmcons.h trunk/reactos/include/psdk/lmerr.h - copied unchanged from r22612, trunk/reactos/include/lmerr.h trunk/reactos/include/psdk/lmerrlog.h - copied unchanged from r22612, trunk/reactos/include/lmerrlog.h trunk/reactos/include/psdk/lmjoin.h - copied unchanged from r22612, trunk/reactos/include/lmjoin.h trunk/reactos/include/psdk/lmmsg.h - copied unchanged from r22612, trunk/reactos/include/lmmsg.h trunk/reactos/include/psdk/lmremutl.h - copied unchanged from r22612, trunk/reactos/include/lmremutl.h trunk/reactos/include/psdk/lmrepl.h - copied unchanged from r22612, trunk/reactos/include/lmrepl.h trunk/reactos/include/psdk/lmserver.h - copied unchanged from r22612, trunk/reactos/include/lmserver.h trunk/reactos/include/psdk/lmshare.h - copied unchanged from r22612, trunk/reactos/include/lmshare.h trunk/reactos/include/psdk/lmsname.h - copied unchanged from r22612, trunk/reactos/include/lmsname.h trunk/reactos/include/psdk/lmstats.h - copied unchanged from r22612, trunk/reactos/include/lmstats.h trunk/reactos/include/psdk/lmsvc.h - copied unchanged from r22612, trunk/reactos/include/lmsvc.h trunk/reactos/include/psdk/lmuse.h - copied unchanged from r22612, trunk/reactos/include/lmuse.h trunk/reactos/include/psdk/lmuseflg.h - copied unchanged from r22612, trunk/reactos/include/lmuseflg.h trunk/reactos/include/psdk/lmwksta.h - copied unchanged from r22612, trunk/reactos/include/lmwksta.h trunk/reactos/include/psdk/lzexpand.h - copied unchanged from r22612, trunk/reactos/include/lzexpand.h trunk/reactos/include/psdk/mapi.h - copied unchanged from r22612, trunk/reactos/include/mapi.h trunk/reactos/include/psdk/mapicode.h - copied unchanged from r22612, trunk/reactos/include/mapicode.h trunk/reactos/include/psdk/mapidefs.h - copied unchanged from r22612, trunk/reactos/include/mapidefs.h trunk/reactos/include/psdk/mapiguid.h - copied unchanged from r22612, trunk/reactos/include/mapiguid.h trunk/reactos/include/psdk/mapitags.h - copied unchanged from r22612, trunk/reactos/include/mapitags.h trunk/reactos/include/psdk/mapiutil.h - copied unchanged from r22612, trunk/reactos/include/mapiutil.h trunk/reactos/include/psdk/mapival.h - copied unchanged from r22612, trunk/reactos/include/mapival.h trunk/reactos/include/psdk/mapix.h - copied unchanged from r22612, trunk/reactos/include/mapix.h trunk/reactos/include/psdk/mciavi.h - copied unchanged from r22612, trunk/reactos/include/mciavi.h trunk/reactos/include/psdk/mcx.h - copied unchanged from r22612, trunk/reactos/include/mcx.h trunk/reactos/include/psdk/mediaerr.h - copied unchanged from r22612, trunk/reactos/include/mediaerr.h trunk/reactos/include/psdk/mgmtapi.h - copied unchanged from r22612, trunk/reactos/include/mgmtapi.h trunk/reactos/include/psdk/mmddk.h - copied unchanged from r22612, trunk/reactos/include/mmddk.h trunk/reactos/include/psdk/mmsystem.h - copied unchanged from r22612, trunk/reactos/include/mmsystem.h trunk/reactos/include/psdk/mscat.h - copied unchanged from r22612, trunk/reactos/include/mscat.h trunk/reactos/include/psdk/mshtmhst.h - copied unchanged from r22612, trunk/reactos/include/mshtmhst.h trunk/reactos/include/psdk/mshtml.h - copied unchanged from r22612, trunk/reactos/include/mshtml.h trunk/reactos/include/psdk/msi.h - copied unchanged from r22612, trunk/reactos/include/msi.h trunk/reactos/include/psdk/msidefs.h - copied unchanged from r22612, trunk/reactos/include/msidefs.h trunk/reactos/include/psdk/msiquery.h - copied unchanged from r22612, trunk/reactos/include/msiquery.h trunk/reactos/include/psdk/mssip.h - copied unchanged from r22612, trunk/reactos/include/mssip.h trunk/reactos/include/psdk/mswsock.h - copied unchanged from r22612, trunk/reactos/include/mswsock.h trunk/reactos/include/psdk/msxml.h - copied unchanged from r22612, trunk/reactos/include/msxml.h trunk/reactos/include/psdk/msxmldid.h - copied unchanged from r22612, trunk/reactos/include/msxmldid.h trunk/reactos/include/psdk/nb30.h - copied unchanged from r22612, trunk/reactos/include/nb30.h trunk/reactos/include/psdk/nddeapi.h - copied unchanged from r22612, trunk/reactos/include/nddeapi.h trunk/reactos/include/psdk/ndrtypes.h - copied unchanged from r22612, trunk/reactos/include/ndrtypes.h trunk/reactos/include/psdk/newdev.h - copied unchanged from r22612, trunk/reactos/include/newdev.h trunk/reactos/include/psdk/npapi.h - copied unchanged from r22612, trunk/reactos/include/npapi.h trunk/reactos/include/psdk/nspapi.h - copied unchanged from r22612, trunk/reactos/include/nspapi.h trunk/reactos/include/psdk/ntdef.h - copied unchanged from r22612, trunk/reactos/include/ntdef.h trunk/reactos/include/psdk/ntdll.h - copied unchanged from r22612, trunk/reactos/include/ntdll.h trunk/reactos/include/psdk/ntgdi.h - copied unchanged from r22612, trunk/reactos/include/ntgdi.h trunk/reactos/include/psdk/ntldap.h - copied unchanged from r22612, trunk/reactos/include/ntldap.h trunk/reactos/include/psdk/ntsecapi.h - copied unchanged from r22612, trunk/reactos/include/ntsecapi.h trunk/reactos/include/psdk/ntsecpkg.h - copied unchanged from r22612, trunk/reactos/include/ntsecpkg.h trunk/reactos/include/psdk/ntstatus.h - copied unchanged from r22612, trunk/reactos/include/ntstatus.h trunk/reactos/include/psdk/oaidl.h - copied unchanged from r22612, trunk/reactos/include/oaidl.h trunk/reactos/include/psdk/objbase.h - copied unchanged from r22612, trunk/reactos/include/objbase.h trunk/reactos/include/psdk/objfwd.h - copied unchanged from r22612, trunk/reactos/include/objfwd.h trunk/reactos/include/psdk/objidl.h - copied unchanged from r22612, trunk/reactos/include/objidl.h trunk/reactos/include/psdk/objsel.h - copied unchanged from r22612, trunk/reactos/include/objsel.h trunk/reactos/include/psdk/ocidl.h - copied unchanged from r22612, trunk/reactos/include/ocidl.h trunk/reactos/include/psdk/odbcinst.h - copied unchanged from r22612, trunk/reactos/include/odbcinst.h trunk/reactos/include/psdk/ole.h - copied unchanged from r22612, trunk/reactos/include/ole.h trunk/reactos/include/psdk/ole2.h - copied unchanged from r22612, trunk/reactos/include/ole2.h trunk/reactos/include/psdk/ole2ver.h - copied unchanged from r22612, trunk/reactos/include/ole2ver.h trunk/reactos/include/psdk/oleacc.h - copied unchanged from r22612, trunk/reactos/include/oleacc.h trunk/reactos/include/psdk/oleauto.h - copied unchanged from r22612, trunk/reactos/include/oleauto.h trunk/reactos/include/psdk/olectl.h - copied unchanged from r22612, trunk/reactos/include/olectl.h trunk/reactos/include/psdk/olectlid.h - copied unchanged from r22612, trunk/reactos/include/olectlid.h trunk/reactos/include/psdk/oledlg.h - copied unchanged from r22612, trunk/reactos/include/oledlg.h trunk/reactos/include/psdk/oleidl.h - copied unchanged from r22612, trunk/reactos/include/oleidl.h trunk/reactos/include/psdk/pbt.h - copied unchanged from r22612, trunk/reactos/include/pbt.h trunk/reactos/include/psdk/poppack.h - copied unchanged from r22612, trunk/reactos/include/poppack.h trunk/reactos/include/psdk/powrprof.h - copied unchanged from r22612, trunk/reactos/include/powrprof.h trunk/reactos/include/psdk/propidl.h - copied unchanged from r22612, trunk/reactos/include/propidl.h trunk/reactos/include/psdk/prsht.h - copied unchanged from r22612, trunk/reactos/include/prsht.h trunk/reactos/include/psdk/psapi.h - copied unchanged from r22612, trunk/reactos/include/psapi.h trunk/reactos/include/psdk/pshpack1.h - copied unchanged from r22612, trunk/reactos/include/pshpack1.h trunk/reactos/include/psdk/pshpack2.h - copied unchanged from r22612, trunk/reactos/include/pshpack2.h trunk/reactos/include/psdk/pshpack4.h - copied unchanged from r22612, trunk/reactos/include/pshpack4.h trunk/reactos/include/psdk/pshpack8.h - copied unchanged from r22612, trunk/reactos/include/pshpack8.h trunk/reactos/include/psdk/pshpck16.h - copied unchanged from r22612, trunk/reactos/include/pshpck16.h trunk/reactos/include/psdk/qos.h - copied unchanged from r22612, trunk/reactos/include/qos.h trunk/reactos/include/psdk/rapi.h - copied unchanged from r22612, trunk/reactos/include/rapi.h trunk/reactos/include/psdk/ras.h - copied unchanged from r22612, trunk/reactos/include/ras.h trunk/reactos/include/psdk/rasdlg.h - copied unchanged from r22612, trunk/reactos/include/rasdlg.h trunk/reactos/include/psdk/raserror.h - copied unchanged from r22612, trunk/reactos/include/raserror.h trunk/reactos/include/psdk/rassapi.h - copied unchanged from r22612, trunk/reactos/include/rassapi.h trunk/reactos/include/psdk/regstr.h - copied unchanged from r22612, trunk/reactos/include/regstr.h trunk/reactos/include/psdk/richedit.h - copied unchanged from r22612, trunk/reactos/include/richedit.h trunk/reactos/include/psdk/richole.h - copied unchanged from r22612, trunk/reactos/include/richole.h trunk/reactos/include/psdk/rpc.h - copied unchanged from r22612, trunk/reactos/include/rpc.h trunk/reactos/include/psdk/rpcdce.h - copied unchanged from r22612, trunk/reactos/include/rpcdce.h trunk/reactos/include/psdk/rpcdce2.h - copied unchanged from r22612, trunk/reactos/include/rpcdce2.h trunk/reactos/include/psdk/rpcdcep.h - copied unchanged from r22612, trunk/reactos/include/rpcdcep.h trunk/reactos/include/psdk/rpcndr.h - copied unchanged from r22612, trunk/reactos/include/rpcndr.h trunk/reactos/include/psdk/rpcnsi.h - copied unchanged from r22612, trunk/reactos/include/rpcnsi.h trunk/reactos/include/psdk/rpcnsip.h - copied unchanged from r22612, trunk/reactos/include/rpcnsip.h trunk/reactos/include/psdk/rpcnterr.h - copied unchanged from r22612, trunk/reactos/include/rpcnterr.h trunk/reactos/include/psdk/rpcproxy.h - copied unchanged from r22612, trunk/reactos/include/rpcproxy.h trunk/reactos/include/psdk/schannel.h - copied unchanged from r22612, trunk/reactos/include/schannel.h trunk/reactos/include/psdk/schemadef.h - copied unchanged from r22612, trunk/reactos/include/schemadef.h trunk/reactos/include/psdk/schnlsp.h - copied unchanged from r22612, trunk/reactos/include/schnlsp.h trunk/reactos/include/psdk/scrnsave.h - copied unchanged from r22612, trunk/reactos/include/scrnsave.h trunk/reactos/include/psdk/sddl.h - copied unchanged from r22612, trunk/reactos/include/sddl.h trunk/reactos/include/psdk/sdkddkver.h - copied unchanged from r22612, trunk/reactos/include/sdkddkver.h trunk/reactos/include/psdk/secext.h - copied unchanged from r22612, trunk/reactos/include/secext.h trunk/reactos/include/psdk/security.h - copied unchanged from r22612, trunk/reactos/include/security.h trunk/reactos/include/psdk/servprov.h - copied unchanged from r22612, trunk/reactos/include/servprov.h trunk/reactos/include/psdk/setupapi.h - copied unchanged from r22612, trunk/reactos/include/setupapi.h trunk/reactos/include/psdk/shellapi.h - copied unchanged from r22612, trunk/reactos/include/shellapi.h trunk/reactos/include/psdk/shlguid.h - copied unchanged from r22612, trunk/reactos/include/shlguid.h trunk/reactos/include/psdk/shlobj.h - copied unchanged from r22612, trunk/reactos/include/shlobj.h trunk/reactos/include/psdk/shlwapi.h - copied unchanged from r22612, trunk/reactos/include/shlwapi.h trunk/reactos/include/psdk/shtypes.h - copied unchanged from r22612, trunk/reactos/include/shtypes.h trunk/reactos/include/psdk/snmp.h - copied unchanged from r22612, trunk/reactos/include/snmp.h trunk/reactos/include/psdk/sql.h - copied unchanged from r22612, trunk/reactos/include/sql.h trunk/reactos/include/psdk/sqlext.h - copied unchanged from r22612, trunk/reactos/include/sqlext.h trunk/reactos/include/psdk/sqltypes.h - copied unchanged from r22612, trunk/reactos/include/sqltypes.h trunk/reactos/include/psdk/sqlucode.h - copied unchanged from r22612, trunk/reactos/include/sqlucode.h trunk/reactos/include/psdk/sspi.h - copied unchanged from r22612, trunk/reactos/include/sspi.h trunk/reactos/include/psdk/strmif.h - copied unchanged from r22612, trunk/reactos/include/strmif.h trunk/reactos/include/psdk/subauth.h - copied unchanged from r22612, trunk/reactos/include/subauth.h trunk/reactos/include/psdk/svcguid.h - copied unchanged from r22612, trunk/reactos/include/svcguid.h trunk/reactos/include/psdk/tchar.h - copied unchanged from r22612, trunk/reactos/include/tchar.h trunk/reactos/include/psdk/tcpioctl.h - copied unchanged from r22612, trunk/reactos/include/tcpioctl.h trunk/reactos/include/psdk/tlhelp32.h - copied unchanged from r22612, trunk/reactos/include/tlhelp32.h trunk/reactos/include/psdk/tmschema.h - copied unchanged from r22612, trunk/reactos/include/tmschema.h trunk/reactos/include/psdk/unknwn.h - copied unchanged from r22612, trunk/reactos/include/unknwn.h trunk/reactos/include/psdk/urlmon.h - copied unchanged from r22612, trunk/reactos/include/urlmon.h trunk/reactos/include/psdk/userenv.h - copied unchanged from r22612, trunk/reactos/include/userenv.h trunk/reactos/include/psdk/uuids.h - copied unchanged from r22612, trunk/reactos/include/uuids.h trunk/reactos/include/psdk/uxtheme.h - copied unchanged from r22612, trunk/reactos/include/uxtheme.h trunk/reactos/include/psdk/vfw.h - copied unchanged from r22612, trunk/reactos/include/vfw.h trunk/reactos/include/psdk/vfwmsgs.h - copied unchanged from r22612, trunk/reactos/include/vfwmsgs.h trunk/reactos/include/psdk/w32api.h - copied unchanged from r22612, trunk/reactos/include/w32api.h trunk/reactos/include/psdk/winable.h - copied unchanged from r22612, trunk/reactos/include/winable.h trunk/reactos/include/psdk/winbase.h - copied unchanged from r22612, trunk/reactos/include/winbase.h trunk/reactos/include/psdk/winber.h - copied unchanged from r22612, trunk/reactos/include/winber.h trunk/reactos/include/psdk/wincon.h - copied unchanged from r22612, trunk/reactos/include/wincon.h trunk/reactos/include/psdk/wincrypt.h - copied unchanged from r22612, trunk/reactos/include/wincrypt.h trunk/reactos/include/psdk/windef.h - copied unchanged from r22612, trunk/reactos/include/windef.h trunk/reactos/include/psdk/windns.h - copied unchanged from r22612, trunk/reactos/include/windns.h trunk/reactos/include/psdk/windows.h - copied unchanged from r22612, trunk/reactos/include/windows.h trunk/reactos/include/psdk/windowsx.h - copied unchanged from r22612, trunk/reactos/include/windowsx.h trunk/reactos/include/psdk/winefs.h - copied unchanged from r22612, trunk/reactos/include/winefs.h trunk/reactos/include/psdk/winerror.h - copied unchanged from r22612, trunk/reactos/include/winerror.h trunk/reactos/include/psdk/winfax.h - copied unchanged from r22612, trunk/reactos/include/winfax.h trunk/reactos/include/psdk/wingdi.h - copied unchanged from r22612, trunk/reactos/include/wingdi.h trunk/reactos/include/psdk/wininet.h - copied unchanged from r22612, trunk/reactos/include/wininet.h trunk/reactos/include/psdk/winioctl.h - copied unchanged from r22612, trunk/reactos/include/winioctl.h trunk/reactos/include/psdk/winldap.h - copied unchanged from r22612, trunk/reactos/include/winldap.h trunk/reactos/include/psdk/winnetwk.h - copied unchanged from r22612, trunk/reactos/include/winnetwk.h trunk/reactos/include/psdk/winnls.h - copied unchanged from r22612, trunk/reactos/include/winnls.h trunk/reactos/include/psdk/winnls32.h - copied unchanged from r22612, trunk/reactos/include/winnls32.h trunk/reactos/include/psdk/winnt.h - copied unchanged from r22612, trunk/reactos/include/winnt.h trunk/reactos/include/psdk/winperf.h - copied unchanged from r22612, trunk/reactos/include/winperf.h trunk/reactos/include/psdk/winreg.h - copied unchanged from r22612, trunk/reactos/include/winreg.h trunk/reactos/include/psdk/winres.h - copied unchanged from r22612, trunk/reactos/include/winres.h trunk/reactos/include/psdk/winresrc.h - copied unchanged from r22612, trunk/reactos/include/winresrc.h trunk/reactos/include/psdk/winscard.h - copied unchanged from r22612, trunk/reactos/include/winscard.h trunk/reactos/include/psdk/winsmcrd.h - copied unchanged from r22612, trunk/reactos/include/winsmcrd.h trunk/reactos/include/psdk/winsnmp.h - copied unchanged from r22612, trunk/reactos/include/winsnmp.h trunk/reactos/include/psdk/winsock.h - copied unchanged from r22612, trunk/reactos/include/winsock.h trunk/reactos/include/psdk/winsock2.h - copied unchanged from r22612, trunk/reactos/include/winsock2.h trunk/reactos/include/psdk/winspool.h - copied unchanged from r22612, trunk/reactos/include/winspool.h trunk/reactos/include/psdk/winsvc.h - copied unchanged from r22612, trunk/reactos/include/winsvc.h trunk/reactos/include/psdk/winternl.h - copied unchanged from r22612, trunk/reactos/include/winternl.h trunk/reactos/include/psdk/wintrust.h - copied unchanged from r22612, trunk/reactos/include/wintrust.h trunk/reactos/include/psdk/winuser.h - copied unchanged from r22612, trunk/reactos/include/winuser.h trunk/reactos/include/psdk/winver.h - copied unchanged from r22612, trunk/reactos/include/winver.h trunk/reactos/include/psdk/winwlx.h - copied unchanged from r22612, trunk/reactos/include/winwlx.h trunk/reactos/include/psdk/ws2spi.h - copied unchanged from r22612, trunk/reactos/include/ws2spi.h trunk/reactos/include/psdk/ws2tcpip.h - copied unchanged from r22612, trunk/reactos/include/ws2tcpip.h trunk/reactos/include/psdk/wsahelp.h - copied unchanged from r22612, trunk/reactos/include/wsahelp.h trunk/reactos/include/psdk/wsipx.h - copied unchanged from r22612, trunk/reactos/include/wsipx.h trunk/reactos/include/psdk/wsnetbs.h - copied unchanged from r22612, trunk/reactos/include/wsnetbs.h trunk/reactos/include/psdk/wtypes.h - copied unchanged from r22612, trunk/reactos/include/wtypes.h trunk/reactos/include/psdk/xcmc.h - copied unchanged from r22612, trunk/reactos/include/xcmc.h trunk/reactos/include/psdk/xprtdefs.h - copied unchanged from r22612, trunk/reactos/include/xprtdefs.h trunk/reactos/include/psdk/zmouse.h - copied unchanged from r22612, trunk/reactos/include/zmouse.h Removed: trunk/reactos/include/DShow.h trunk/reactos/include/README.w32api trunk/reactos/include/accctrl.h trunk/reactos/include/aclapi.h trunk/reactos/include/aclui.h trunk/reactos/include/activecf.h trunk/reactos/include/advpub.h trunk/reactos/include/af_irda.h trunk/reactos/include/afxres.h trunk/reactos/include/amaudio.h trunk/reactos/include/amparse.h trunk/reactos/include/amvideo.h trunk/reactos/include/appmgmt.h trunk/reactos/include/audevcod.h trunk/reactos/include/authz.h trunk/reactos/include/basetsd.h trunk/reactos/include/basetyps.h trunk/reactos/include/cderr.h trunk/reactos/include/cguid.h trunk/reactos/include/comcat.h trunk/reactos/include/commctrl.h trunk/reactos/include/commdlg.h trunk/reactos/include/cpl.h trunk/reactos/include/cplext.h trunk/reactos/include/custcntl.h trunk/reactos/include/cvconst.h trunk/reactos/include/d3d.h trunk/reactos/include/d3d8.h trunk/reactos/include/d3d8caps.h trunk/reactos/include/d3d8types.h trunk/reactos/include/d3d9.h trunk/reactos/include/d3d9caps.h trunk/reactos/include/d3d9types.h trunk/reactos/include/d3dcaps.h trunk/reactos/include/d3drm.h trunk/reactos/include/d3dtypes.h trunk/reactos/include/d3dvec.inl trunk/reactos/include/d3dx8core.h trunk/reactos/include/dbghelp.h trunk/reactos/include/dbt.h trunk/reactos/include/dde.h trunk/reactos/include/ddeml.h trunk/reactos/include/ddraw.h trunk/reactos/include/ddrawgdi.h trunk/reactos/include/devguid.h trunk/reactos/include/dhcpcapi.h trunk/reactos/include/dhcpcsdk.h trunk/reactos/include/digitalv.h trunk/reactos/include/dinput.h trunk/reactos/include/dlgs.h trunk/reactos/include/docobj.h trunk/reactos/include/dplay.h trunk/reactos/include/dplobby.h trunk/reactos/include/dsconf.h trunk/reactos/include/dsdriver.h trunk/reactos/include/dsound.h trunk/reactos/include/dsrole.h trunk/reactos/include/dv.h trunk/reactos/include/dvdevcod.h trunk/reactos/include/dxdiag.h trunk/reactos/include/dxerr8.h trunk/reactos/include/dxerr9.h trunk/reactos/include/dxsdkver.h trunk/reactos/include/edevdefs.h trunk/reactos/include/errorrep.h trunk/reactos/include/errors.h trunk/reactos/include/evcode.h trunk/reactos/include/evntrace.h trunk/reactos/include/exdisp.h trunk/reactos/include/exdispid.h trunk/reactos/include/fci.h trunk/reactos/include/fdi.h trunk/reactos/include/gdiplus.h trunk/reactos/include/gdiplusbase.h trunk/reactos/include/gdiplusbrush.h trunk/reactos/include/gdipluscolor.h trunk/reactos/include/gdipluscolormatrix.h trunk/reactos/include/gdipluseffects.h trunk/reactos/include/gdiplusenums.h trunk/reactos/include/gdiplusflat.h trunk/reactos/include/gdiplusgpstubs.h trunk/reactos/include/gdiplusgraphics.h trunk/reactos/include/gdiplusheaders.h trunk/reactos/include/gdiplusimageattributes.h trunk/reactos/include/gdiplusimaging.h trunk/reactos/include/gdiplusinit.h trunk/reactos/include/gdipluslinecaps.h trunk/reactos/include/gdiplusmatrix.h trunk/reactos/include/gdiplusmem.h trunk/reactos/include/gdiplusmetafile.h trunk/reactos/include/gdiplusmetaheader.h trunk/reactos/include/gdipluspath.h trunk/reactos/include/gdipluspen.h trunk/reactos/include/gdipluspixelformats.h trunk/reactos/include/gdiplusstringformat.h trunk/reactos/include/gdiplustypes.h trunk/reactos/include/guiddef.h trunk/reactos/include/hlink.h trunk/reactos/include/httpext.h trunk/reactos/include/icmpapi.h trunk/reactos/include/idispids.h trunk/reactos/include/imagehlp.h trunk/reactos/include/imm.h trunk/reactos/include/in6addr.h trunk/reactos/include/inaddr.h trunk/reactos/include/initguid.h trunk/reactos/include/intshcut.h trunk/reactos/include/ipexport.h trunk/reactos/include/iphlpapi.h trunk/reactos/include/ipifcons.h trunk/reactos/include/iprtrmib.h trunk/reactos/include/iptypes.h trunk/reactos/include/isguids.h trunk/reactos/include/ksguid.h trunk/reactos/include/ksuuids.h trunk/reactos/include/largeint.h trunk/reactos/include/lm.h trunk/reactos/include/lmaccess.h trunk/reactos/include/lmalert.h trunk/reactos/include/lmapibuf.h trunk/reactos/include/lmat.h trunk/reactos/include/lmaudit.h trunk/reactos/include/lmchdev.h trunk/reactos/include/lmconfig.h trunk/reactos/include/lmcons.h trunk/reactos/include/lmerr.h trunk/reactos/include/lmerrlog.h trunk/reactos/include/lmjoin.h trunk/reactos/include/lmmsg.h trunk/reactos/include/lmremutl.h trunk/reactos/include/lmrepl.h trunk/reactos/include/lmserver.h trunk/reactos/include/lmshare.h trunk/reactos/include/lmsname.h trunk/reactos/include/lmstats.h trunk/reactos/include/lmsvc.h trunk/reactos/include/lmuse.h trunk/reactos/include/lmuseflg.h trunk/reactos/include/lmwksta.h trunk/reactos/include/lzexpand.h trunk/reactos/include/mapi.h trunk/reactos/include/mapicode.h trunk/reactos/include/mapidefs.h trunk/reactos/include/mapiguid.h trunk/reactos/include/mapitags.h trunk/reactos/include/mapiutil.h trunk/reactos/include/mapival.h trunk/reactos/include/mapix.h trunk/reactos/include/mciavi.h trunk/reactos/include/mcx.h trunk/reactos/include/mediaerr.h trunk/reactos/include/mgmtapi.h trunk/reactos/include/mmddk.h trunk/reactos/include/mmsystem.h trunk/reactos/include/mscat.h trunk/reactos/include/mshtmhst.h trunk/reactos/include/mshtml.h trunk/reactos/include/msi.h trunk/reactos/include/msidefs.h trunk/reactos/include/msiquery.h trunk/reactos/include/mssip.h trunk/reactos/include/mswsock.h trunk/reactos/include/msxml.h trunk/reactos/include/msxmldid.h trunk/reactos/include/nb30.h trunk/reactos/include/nddeapi.h trunk/reactos/include/ndrtypes.h trunk/reactos/include/newdev.h trunk/reactos/include/npapi.h trunk/reactos/include/nspapi.h trunk/reactos/include/ntdef.h trunk/reactos/include/ntdll.h trunk/reactos/include/ntgdi.h trunk/reactos/include/ntldap.h trunk/reactos/include/ntsecapi.h trunk/reactos/include/ntsecpkg.h trunk/reactos/include/ntstatus.h trunk/reactos/include/oaidl.h trunk/reactos/include/objbase.h trunk/reactos/include/objfwd.h trunk/reactos/include/objidl.h trunk/reactos/include/objsel.h trunk/reactos/include/ocidl.h trunk/reactos/include/odbcinst.h trunk/reactos/include/ole.h trunk/reactos/include/ole2.h trunk/reactos/include/ole2ver.h trunk/reactos/include/oleacc.h trunk/reactos/include/oleauto.h trunk/reactos/include/olectl.h trunk/reactos/include/olectlid.h trunk/reactos/include/oledlg.h trunk/reactos/include/oleidl.h trunk/reactos/include/pbt.h trunk/reactos/include/poppack.h trunk/reactos/include/powrprof.h trunk/reactos/include/propidl.h trunk/reactos/include/prsht.h trunk/reactos/include/psapi.h trunk/reactos/include/pshpack1.h trunk/reactos/include/pshpack2.h trunk/reactos/include/pshpack4.h trunk/reactos/include/pshpack8.h trunk/reactos/include/pshpck16.h trunk/reactos/include/qos.h trunk/reactos/include/rapi.h trunk/reactos/include/ras.h trunk/reactos/include/rasdlg.h trunk/reactos/include/raserror.h trunk/reactos/include/rassapi.h trunk/reactos/include/regstr.h trunk/reactos/include/richedit.h trunk/reactos/include/richole.h trunk/reactos/include/rpc.h trunk/reactos/include/rpcdce.h trunk/reactos/include/rpcdce2.h trunk/reactos/include/rpcdcep.h trunk/reactos/include/rpcndr.h trunk/reactos/include/rpcnsi.h trunk/reactos/include/rpcnsip.h trunk/reactos/include/rpcnterr.h trunk/reactos/include/rpcproxy.h trunk/reactos/include/schannel.h trunk/reactos/include/schemadef.h trunk/reactos/include/schnlsp.h trunk/reactos/include/scrnsave.h trunk/reactos/include/sddl.h trunk/reactos/include/sdkddkver.h trunk/reactos/include/secext.h trunk/reactos/include/security.h trunk/reactos/include/servprov.h trunk/reactos/include/setupapi.h trunk/reactos/include/shellapi.h trunk/reactos/include/shlguid.h trunk/reactos/include/shlobj.h trunk/reactos/include/shlwapi.h trunk/reactos/include/shtypes.h trunk/reactos/include/snmp.h trunk/reactos/include/sql.h trunk/reactos/include/sqlext.h trunk/reactos/include/sqltypes.h trunk/reactos/include/sqlucode.h trunk/reactos/include/sspi.h trunk/reactos/include/strmif.h trunk/reactos/include/subauth.h trunk/reactos/include/svcguid.h trunk/reactos/include/tchar.h trunk/reactos/include/tcpioctl.h trunk/reactos/include/tlhelp32.h trunk/reactos/include/tmschema.h trunk/reactos/include/unknwn.h trunk/reactos/include/urlmon.h trunk/reactos/include/userenv.h trunk/reactos/include/uuids.h trunk/reactos/include/uxtheme.h trunk/reactos/include/vfw.h trunk/reactos/include/vfwmsgs.h trunk/reactos/include/w32api.h trunk/reactos/include/winable.h trunk/reactos/include/winbase.h trunk/reactos/include/winber.h trunk/reactos/include/wincon.h trunk/reactos/include/wincrypt.h trunk/reactos/include/windef.h trunk/reactos/include/windns.h trunk/reactos/include/windows.h trunk/reactos/include/windowsx.h trunk/reactos/include/winefs.h trunk/reactos/include/winerror.h trunk/reactos/include/winfax.h trunk/reactos/include/wingdi.h trunk/reactos/include/wininet.h trunk/reactos/include/winioctl.h trunk/reactos/include/winldap.h trunk/reactos/include/winnetwk.h trunk/reactos/include/winnls.h trunk/reactos/include/winnls32.h trunk/reactos/include/winnt.h trunk/reactos/include/winperf.h trunk/reactos/include/winreg.h trunk/reactos/include/winres.h trunk/reactos/include/winresrc.h trunk/reactos/include/winscard.h trunk/reactos/include/winsmcrd.h trunk/reactos/include/winsnmp.h trunk/reactos/include/winsock.h trunk/reactos/include/winsock2.h trunk/reactos/include/winspool.h trunk/reactos/include/winsvc.h trunk/reactos/include/winternl.h trunk/reactos/include/wintrust.h trunk/reactos/include/winuser.h trunk/reactos/include/winver.h trunk/reactos/include/winwlx.h trunk/reactos/include/ws2spi.h trunk/reactos/include/ws2tcpip.h trunk/reactos/include/wsahelp.h trunk/reactos/include/wsipx.h trunk/reactos/include/wsnetbs.h trunk/reactos/include/wtypes.h trunk/reactos/include/xcmc.h trunk/reactos/include/xprtdefs.h trunk/reactos/include/zmouse.h Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/include/reactos/debug.h trunk/reactos/include/reactos/wine/list.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ReactOS.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=22637&r…
Removed: trunk/reactos/include/DShow.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/DShow.h?rev=22636&…
Removed: trunk/reactos/include/README.w32api URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/README.w32api?rev=…
Removed: trunk/reactos/include/accctrl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/accctrl.h?rev=2263…
Removed: trunk/reactos/include/aclapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/aclapi.h?rev=22636…
Removed: trunk/reactos/include/aclui.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/aclui.h?rev=22636&…
Removed: trunk/reactos/include/activecf.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/activecf.h?rev=226…
Removed: trunk/reactos/include/advpub.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/advpub.h?rev=22636…
Removed: trunk/reactos/include/af_irda.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/af_irda.h?rev=2263…
Removed: trunk/reactos/include/afxres.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/afxres.h?rev=22636…
Removed: trunk/reactos/include/amaudio.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/amaudio.h?rev=2263…
Removed: trunk/reactos/include/amparse.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/amparse.h?rev=2263…
Removed: trunk/reactos/include/amvideo.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/amvideo.h?rev=2263…
Removed: trunk/reactos/include/appmgmt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/appmgmt.h?rev=2263…
Removed: trunk/reactos/include/audevcod.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/audevcod.h?rev=226…
Removed: trunk/reactos/include/authz.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/authz.h?rev=22636&…
Removed: trunk/reactos/include/basetsd.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/basetsd.h?rev=2263…
Removed: trunk/reactos/include/basetyps.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/basetyps.h?rev=226…
Removed: trunk/reactos/include/cderr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/cderr.h?rev=22636&…
Removed: trunk/reactos/include/cguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/cguid.h?rev=22636&…
Removed: trunk/reactos/include/comcat.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/comcat.h?rev=22636…
Removed: trunk/reactos/include/commctrl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/commctrl.h?rev=226…
Removed: trunk/reactos/include/commdlg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/commdlg.h?rev=2263…
Removed: trunk/reactos/include/cpl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/cpl.h?rev=22636&vi…
Removed: trunk/reactos/include/cplext.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/cplext.h?rev=22636…
Removed: trunk/reactos/include/custcntl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/custcntl.h?rev=226…
Removed: trunk/reactos/include/cvconst.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/cvconst.h?rev=2263…
Removed: trunk/reactos/include/d3d.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d.h?rev=22636&vi…
Removed: trunk/reactos/include/d3d8.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d8.h?rev=22636&v…
Removed: trunk/reactos/include/d3d8caps.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d8caps.h?rev=226…
Removed: trunk/reactos/include/d3d8types.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d8types.h?rev=22…
Removed: trunk/reactos/include/d3d9.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d9.h?rev=22636&v…
Removed: trunk/reactos/include/d3d9caps.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d9caps.h?rev=226…
Removed: trunk/reactos/include/d3d9types.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3d9types.h?rev=22…
Removed: trunk/reactos/include/d3dcaps.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3dcaps.h?rev=2263…
Removed: trunk/reactos/include/d3drm.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3drm.h?rev=22636&…
Removed: trunk/reactos/include/d3dtypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3dtypes.h?rev=226…
Removed: trunk/reactos/include/d3dvec.inl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3dvec.inl?rev=226…
Removed: trunk/reactos/include/d3dx8core.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/d3dx8core.h?rev=22…
Removed: trunk/reactos/include/dbghelp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dbghelp.h?rev=2263…
Removed: trunk/reactos/include/dbt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dbt.h?rev=22636&vi…
Removed: trunk/reactos/include/dde.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dde.h?rev=22636&vi…
Removed: trunk/reactos/include/ddeml.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddeml.h?rev=22636&…
Removed: trunk/reactos/include/ddraw.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddraw.h?rev=22636&…
Removed: trunk/reactos/include/ddrawgdi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddrawgdi.h?rev=226…
Removed: trunk/reactos/include/devguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/devguid.h?rev=2263…
Removed: trunk/reactos/include/dhcpcapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dhcpcapi.h?rev=226…
Removed: trunk/reactos/include/dhcpcsdk.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dhcpcsdk.h?rev=226…
Removed: trunk/reactos/include/digitalv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/digitalv.h?rev=226…
Removed: trunk/reactos/include/dinput.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dinput.h?rev=22636…
Removed: trunk/reactos/include/dlgs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dlgs.h?rev=22636&v…
Removed: trunk/reactos/include/docobj.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/docobj.h?rev=22636…
Removed: trunk/reactos/include/dplay.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dplay.h?rev=22636&…
Removed: trunk/reactos/include/dplobby.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dplobby.h?rev=2263…
Removed: trunk/reactos/include/dsconf.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dsconf.h?rev=22636…
Removed: trunk/reactos/include/dsdriver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dsdriver.h?rev=226…
Removed: trunk/reactos/include/dsound.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dsound.h?rev=22636…
Removed: trunk/reactos/include/dsrole.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dsrole.h?rev=22636…
Removed: trunk/reactos/include/dv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dv.h?rev=22636&vie…
Removed: trunk/reactos/include/dvdevcod.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dvdevcod.h?rev=226…
Removed: trunk/reactos/include/dxdiag.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxdiag.h?rev=22636…
Removed: trunk/reactos/include/dxerr8.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxerr8.h?rev=22636…
Removed: trunk/reactos/include/dxerr9.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxerr9.h?rev=22636…
Removed: trunk/reactos/include/dxsdkver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdkver.h?rev=226…
Removed: trunk/reactos/include/edevdefs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/edevdefs.h?rev=226…
Removed: trunk/reactos/include/errorrep.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/errorrep.h?rev=226…
Removed: trunk/reactos/include/errors.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/errors.h?rev=22636…
Removed: trunk/reactos/include/evcode.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/evcode.h?rev=22636…
Removed: trunk/reactos/include/evntrace.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/evntrace.h?rev=226…
Removed: trunk/reactos/include/exdisp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/exdisp.h?rev=22636…
Removed: trunk/reactos/include/exdispid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/exdispid.h?rev=226…
Removed: trunk/reactos/include/fci.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/fci.h?rev=22636&vi…
Removed: trunk/reactos/include/fdi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/fdi.h?rev=22636&vi…
Removed: trunk/reactos/include/gdiplus.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplus.h?rev=2263…
Removed: trunk/reactos/include/gdiplusbase.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusbase.h?rev=…
Removed: trunk/reactos/include/gdiplusbrush.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusbrush.h?rev…
Removed: trunk/reactos/include/gdipluscolor.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluscolor.h?rev…
Removed: trunk/reactos/include/gdipluscolormatrix.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluscolormatrix…
Removed: trunk/reactos/include/gdipluseffects.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluseffects.h?r…
Removed: trunk/reactos/include/gdiplusenums.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusenums.h?rev…
Removed: trunk/reactos/include/gdiplusflat.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusflat.h?rev=…
Removed: trunk/reactos/include/gdiplusgpstubs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusgpstubs.h?r…
Removed: trunk/reactos/include/gdiplusgraphics.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusgraphics.h?…
Removed: trunk/reactos/include/gdiplusheaders.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusheaders.h?r…
Removed: trunk/reactos/include/gdiplusimageattributes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusimageattrib…
Removed: trunk/reactos/include/gdiplusimaging.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusimaging.h?r…
Removed: trunk/reactos/include/gdiplusinit.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusinit.h?rev=…
Removed: trunk/reactos/include/gdipluslinecaps.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluslinecaps.h?…
Removed: trunk/reactos/include/gdiplusmatrix.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusmatrix.h?re…
Removed: trunk/reactos/include/gdiplusmem.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusmem.h?rev=2…
Removed: trunk/reactos/include/gdiplusmetafile.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusmetafile.h?…
Removed: trunk/reactos/include/gdiplusmetaheader.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusmetaheader.…
Removed: trunk/reactos/include/gdipluspath.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluspath.h?rev=…
Removed: trunk/reactos/include/gdipluspen.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluspen.h?rev=2…
Removed: trunk/reactos/include/gdipluspixelformats.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdipluspixelformat…
Removed: trunk/reactos/include/gdiplusstringformat.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplusstringforma…
Removed: trunk/reactos/include/gdiplustypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/gdiplustypes.h?rev…
Removed: trunk/reactos/include/guiddef.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/guiddef.h?rev=2263…
Removed: trunk/reactos/include/hlink.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/hlink.h?rev=22636&…
Removed: trunk/reactos/include/httpext.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/httpext.h?rev=2263…
Removed: trunk/reactos/include/icmpapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/icmpapi.h?rev=2263…
Removed: trunk/reactos/include/idispids.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/idispids.h?rev=226…
Removed: trunk/reactos/include/imagehlp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/imagehlp.h?rev=226…
Removed: trunk/reactos/include/imm.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/imm.h?rev=22636&vi…
Removed: trunk/reactos/include/in6addr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/in6addr.h?rev=2263…
Removed: trunk/reactos/include/inaddr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/inaddr.h?rev=22636…
Removed: trunk/reactos/include/initguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/initguid.h?rev=226…
Removed: trunk/reactos/include/intshcut.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/intshcut.h?rev=226…
Removed: trunk/reactos/include/ipexport.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ipexport.h?rev=226…
Removed: trunk/reactos/include/iphlpapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/iphlpapi.h?rev=226…
Removed: trunk/reactos/include/ipifcons.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ipifcons.h?rev=226…
Removed: trunk/reactos/include/iprtrmib.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/iprtrmib.h?rev=226…
Removed: trunk/reactos/include/iptypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/iptypes.h?rev=2263…
Removed: trunk/reactos/include/isguids.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/isguids.h?rev=2263…
Removed: trunk/reactos/include/ksguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ksguid.h?rev=22636…
Removed: trunk/reactos/include/ksuuids.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ksuuids.h?rev=2263…
Removed: trunk/reactos/include/largeint.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/largeint.h?rev=226…
Removed: trunk/reactos/include/lm.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lm.h?rev=22636&vie…
Removed: trunk/reactos/include/lmaccess.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmaccess.h?rev=226…
Removed: trunk/reactos/include/lmalert.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmalert.h?rev=2263…
Removed: trunk/reactos/include/lmapibuf.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmapibuf.h?rev=226…
Removed: trunk/reactos/include/lmat.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmat.h?rev=22636&v…
Removed: trunk/reactos/include/lmaudit.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmaudit.h?rev=2263…
Removed: trunk/reactos/include/lmchdev.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmchdev.h?rev=2263…
Removed: trunk/reactos/include/lmconfig.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmconfig.h?rev=226…
Removed: trunk/reactos/include/lmcons.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmcons.h?rev=22636…
Removed: trunk/reactos/include/lmerr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmerr.h?rev=22636&…
Removed: trunk/reactos/include/lmerrlog.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmerrlog.h?rev=226…
Removed: trunk/reactos/include/lmjoin.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmjoin.h?rev=22636…
Removed: trunk/reactos/include/lmmsg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmmsg.h?rev=22636&…
Removed: trunk/reactos/include/lmremutl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmremutl.h?rev=226…
Removed: trunk/reactos/include/lmrepl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmrepl.h?rev=22636…
Removed: trunk/reactos/include/lmserver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmserver.h?rev=226…
Removed: trunk/reactos/include/lmshare.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmshare.h?rev=2263…
Removed: trunk/reactos/include/lmsname.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmsname.h?rev=2263…
Removed: trunk/reactos/include/lmstats.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmstats.h?rev=2263…
Removed: trunk/reactos/include/lmsvc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmsvc.h?rev=22636&…
Removed: trunk/reactos/include/lmuse.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmuse.h?rev=22636&…
Removed: trunk/reactos/include/lmuseflg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmuseflg.h?rev=226…
Removed: trunk/reactos/include/lmwksta.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lmwksta.h?rev=2263…
Removed: trunk/reactos/include/lzexpand.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/lzexpand.h?rev=226…
Removed: trunk/reactos/include/mapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapi.h?rev=22636&v…
Removed: trunk/reactos/include/mapicode.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapicode.h?rev=226…
Removed: trunk/reactos/include/mapidefs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapidefs.h?rev=226…
Removed: trunk/reactos/include/mapiguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapiguid.h?rev=226…
Removed: trunk/reactos/include/mapitags.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapitags.h?rev=226…
Removed: trunk/reactos/include/mapiutil.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapiutil.h?rev=226…
Removed: trunk/reactos/include/mapival.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapival.h?rev=2263…
Removed: trunk/reactos/include/mapix.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mapix.h?rev=22636&…
Removed: trunk/reactos/include/mciavi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mciavi.h?rev=22636…
Removed: trunk/reactos/include/mcx.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mcx.h?rev=22636&vi…
Removed: trunk/reactos/include/mediaerr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mediaerr.h?rev=226…
Removed: trunk/reactos/include/mgmtapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mgmtapi.h?rev=2263…
Removed: trunk/reactos/include/mmddk.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mmddk.h?rev=22636&…
Removed: trunk/reactos/include/mmsystem.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mmsystem.h?rev=226…
Removed: trunk/reactos/include/mscat.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mscat.h?rev=22636&…
Removed: trunk/reactos/include/mshtmhst.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mshtmhst.h?rev=226…
Removed: trunk/reactos/include/mshtml.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mshtml.h?rev=22636…
Removed: trunk/reactos/include/msi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/msi.h?rev=22636&vi…
Removed: trunk/reactos/include/msidefs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/msidefs.h?rev=2263…
Removed: trunk/reactos/include/msiquery.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/msiquery.h?rev=226…
Removed: trunk/reactos/include/mssip.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mssip.h?rev=22636&…
Removed: trunk/reactos/include/mswsock.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/mswsock.h?rev=2263…
Removed: trunk/reactos/include/msxml.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/msxml.h?rev=22636&…
Removed: trunk/reactos/include/msxmldid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/msxmldid.h?rev=226…
Removed: trunk/reactos/include/nb30.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/nb30.h?rev=22636&v…
Removed: trunk/reactos/include/nddeapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/nddeapi.h?rev=2263…
Removed: trunk/reactos/include/ndrtypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndrtypes.h?rev=226…
Removed: trunk/reactos/include/newdev.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/newdev.h?rev=22636…
Removed: trunk/reactos/include/npapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/npapi.h?rev=22636&…
Removed: trunk/reactos/include/nspapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/nspapi.h?rev=22636…
Removed: trunk/reactos/include/ntdef.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntdef.h?rev=22636&…
Removed: trunk/reactos/include/ntdll.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntdll.h?rev=22636&…
Removed: trunk/reactos/include/ntgdi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntgdi.h?rev=22636&…
Removed: trunk/reactos/include/ntldap.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntldap.h?rev=22636…
Removed: trunk/reactos/include/ntsecapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntsecapi.h?rev=226…
Removed: trunk/reactos/include/ntsecpkg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntsecpkg.h?rev=226…
Removed: trunk/reactos/include/ntstatus.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntstatus.h?rev=226…
Removed: trunk/reactos/include/oaidl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/oaidl.h?rev=22636&…
Removed: trunk/reactos/include/objbase.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/objbase.h?rev=2263…
Removed: trunk/reactos/include/objfwd.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/objfwd.h?rev=22636…
Removed: trunk/reactos/include/objidl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/objidl.h?rev=22636…
Removed: trunk/reactos/include/objsel.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/objsel.h?rev=22636…
Removed: trunk/reactos/include/ocidl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ocidl.h?rev=22636&…
Removed: trunk/reactos/include/odbcinst.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/odbcinst.h?rev=226…
Removed: trunk/reactos/include/ole.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ole.h?rev=22636&vi…
Removed: trunk/reactos/include/ole2.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ole2.h?rev=22636&v…
Removed: trunk/reactos/include/ole2ver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ole2ver.h?rev=2263…
Removed: trunk/reactos/include/oleacc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/oleacc.h?rev=22636…
Removed: trunk/reactos/include/oleauto.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/oleauto.h?rev=2263…
Removed: trunk/reactos/include/olectl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/olectl.h?rev=22636…
Removed: trunk/reactos/include/olectlid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/olectlid.h?rev=226…
Removed: trunk/reactos/include/oledlg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/oledlg.h?rev=22636…
Removed: trunk/reactos/include/oleidl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/oleidl.h?rev=22636…
Removed: trunk/reactos/include/pbt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/pbt.h?rev=22636&vi…
Removed: trunk/reactos/include/poppack.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/poppack.h?rev=2263…
Removed: trunk/reactos/include/powrprof.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/powrprof.h?rev=226…
Removed: trunk/reactos/include/propidl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/propidl.h?rev=2263…
Removed: trunk/reactos/include/prsht.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/prsht.h?rev=22636&…
Removed: trunk/reactos/include/psapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psapi.h?rev=22636&…
Removed: trunk/reactos/include/pshpack1.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/pshpack1.h?rev=226…
Removed: trunk/reactos/include/pshpack2.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/pshpack2.h?rev=226…
Removed: trunk/reactos/include/pshpack4.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/pshpack4.h?rev=226…
Removed: trunk/reactos/include/pshpack8.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/pshpack8.h?rev=226…
Removed: trunk/reactos/include/pshpck16.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/pshpck16.h?rev=226…
Removed: trunk/reactos/include/qos.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/qos.h?rev=22636&vi…
Removed: trunk/reactos/include/rapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rapi.h?rev=22636&v…
Removed: trunk/reactos/include/ras.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ras.h?rev=22636&vi…
Removed: trunk/reactos/include/rasdlg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rasdlg.h?rev=22636…
Removed: trunk/reactos/include/raserror.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/raserror.h?rev=226…
Removed: trunk/reactos/include/rassapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rassapi.h?rev=2263…
Modified: trunk/reactos/include/reactos/debug.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re…
Modified: trunk/reactos/include/reactos/wine/list.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.…
Removed: trunk/reactos/include/regstr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/regstr.h?rev=22636…
Removed: trunk/reactos/include/richedit.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/richedit.h?rev=226…
Removed: trunk/reactos/include/richole.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/richole.h?rev=2263…
Removed: trunk/reactos/include/rpc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpc.h?rev=22636&vi…
Removed: trunk/reactos/include/rpcdce.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcdce.h?rev=22636…
Removed: trunk/reactos/include/rpcdce2.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcdce2.h?rev=2263…
Removed: trunk/reactos/include/rpcdcep.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcdcep.h?rev=2263…
Removed: trunk/reactos/include/rpcndr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcndr.h?rev=22636…
Removed: trunk/reactos/include/rpcnsi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcnsi.h?rev=22636…
Removed: trunk/reactos/include/rpcnsip.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcnsip.h?rev=2263…
Removed: trunk/reactos/include/rpcnterr.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcnterr.h?rev=226…
Removed: trunk/reactos/include/rpcproxy.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/rpcproxy.h?rev=226…
Removed: trunk/reactos/include/schannel.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/schannel.h?rev=226…
Removed: trunk/reactos/include/schemadef.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/schemadef.h?rev=22…
Removed: trunk/reactos/include/schnlsp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/schnlsp.h?rev=2263…
Removed: trunk/reactos/include/scrnsave.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/scrnsave.h?rev=226…
Removed: trunk/reactos/include/sddl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sddl.h?rev=22636&v…
Removed: trunk/reactos/include/sdkddkver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sdkddkver.h?rev=22…
Removed: trunk/reactos/include/secext.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/secext.h?rev=22636…
Removed: trunk/reactos/include/security.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/security.h?rev=226…
Removed: trunk/reactos/include/servprov.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/servprov.h?rev=226…
Removed: trunk/reactos/include/setupapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/setupapi.h?rev=226…
Removed: trunk/reactos/include/shellapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/shellapi.h?rev=226…
Removed: trunk/reactos/include/shlguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/shlguid.h?rev=2263…
Removed: trunk/reactos/include/shlobj.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/shlobj.h?rev=22636…
Removed: trunk/reactos/include/shlwapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/shlwapi.h?rev=2263…
Removed: trunk/reactos/include/shtypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/shtypes.h?rev=2263…
Removed: trunk/reactos/include/snmp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/snmp.h?rev=22636&v…
Removed: trunk/reactos/include/sql.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sql.h?rev=22636&vi…
Removed: trunk/reactos/include/sqlext.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sqlext.h?rev=22636…
Removed: trunk/reactos/include/sqltypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sqltypes.h?rev=226…
Removed: trunk/reactos/include/sqlucode.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sqlucode.h?rev=226…
Removed: trunk/reactos/include/sspi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/sspi.h?rev=22636&v…
Removed: trunk/reactos/include/strmif.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/strmif.h?rev=22636…
Removed: trunk/reactos/include/subauth.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/subauth.h?rev=2263…
Removed: trunk/reactos/include/svcguid.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/svcguid.h?rev=2263…
Removed: trunk/reactos/include/tchar.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/tchar.h?rev=22636&…
Removed: trunk/reactos/include/tcpioctl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/tcpioctl.h?rev=226…
Removed: trunk/reactos/include/tlhelp32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/tlhelp32.h?rev=226…
Removed: trunk/reactos/include/tmschema.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/tmschema.h?rev=226…
Removed: trunk/reactos/include/unknwn.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/unknwn.h?rev=22636…
Removed: trunk/reactos/include/urlmon.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/urlmon.h?rev=22636…
Removed: trunk/reactos/include/userenv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/userenv.h?rev=2263…
Removed: trunk/reactos/include/uuids.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/uuids.h?rev=22636&…
Removed: trunk/reactos/include/uxtheme.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/uxtheme.h?rev=2263…
Removed: trunk/reactos/include/vfw.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/vfw.h?rev=22636&vi…
Removed: trunk/reactos/include/vfwmsgs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/vfwmsgs.h?rev=2263…
Removed: trunk/reactos/include/w32api.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/w32api.h?rev=22636…
Removed: trunk/reactos/include/winable.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winable.h?rev=2263…
Removed: trunk/reactos/include/winbase.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winbase.h?rev=2263…
Removed: trunk/reactos/include/winber.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winber.h?rev=22636…
Removed: trunk/reactos/include/wincon.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wincon.h?rev=22636…
Removed: trunk/reactos/include/wincrypt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wincrypt.h?rev=226…
Removed: trunk/reactos/include/windef.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/windef.h?rev=22636…
Removed: trunk/reactos/include/windns.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/windns.h?rev=22636…
Removed: trunk/reactos/include/windows.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/windows.h?rev=2263…
Removed: trunk/reactos/include/windowsx.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/windowsx.h?rev=226…
Removed: trunk/reactos/include/winefs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winefs.h?rev=22636…
Removed: trunk/reactos/include/winerror.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winerror.h?rev=226…
Removed: trunk/reactos/include/winfax.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winfax.h?rev=22636…
Removed: trunk/reactos/include/wingdi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wingdi.h?rev=22636…
Removed: trunk/reactos/include/wininet.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wininet.h?rev=2263…
Removed: trunk/reactos/include/winioctl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winioctl.h?rev=226…
Removed: trunk/reactos/include/winldap.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winldap.h?rev=2263…
Removed: trunk/reactos/include/winnetwk.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winnetwk.h?rev=226…
Removed: trunk/reactos/include/winnls.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winnls.h?rev=22636…
Removed: trunk/reactos/include/winnls32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winnls32.h?rev=226…
Removed: trunk/reactos/include/winnt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winnt.h?rev=22636&…
Removed: trunk/reactos/include/winperf.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winperf.h?rev=2263…
Removed: trunk/reactos/include/winreg.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winreg.h?rev=22636…
Removed: trunk/reactos/include/winres.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winres.h?rev=22636…
Removed: trunk/reactos/include/winresrc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winresrc.h?rev=226…
Removed: trunk/reactos/include/winscard.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winscard.h?rev=226…
Removed: trunk/reactos/include/winsmcrd.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winsmcrd.h?rev=226…
Removed: trunk/reactos/include/winsnmp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winsnmp.h?rev=2263…
Removed: trunk/reactos/include/winsock.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winsock.h?rev=2263…
Removed: trunk/reactos/include/winsock2.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winsock2.h?rev=226…
Removed: trunk/reactos/include/winspool.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winspool.h?rev=226…
Removed: trunk/reactos/include/winsvc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winsvc.h?rev=22636…
Removed: trunk/reactos/include/winternl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winternl.h?rev=226…
Removed: trunk/reactos/include/wintrust.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wintrust.h?rev=226…
Removed: trunk/reactos/include/winuser.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winuser.h?rev=2263…
Removed: trunk/reactos/include/winver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winver.h?rev=22636…
Removed: trunk/reactos/include/winwlx.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/winwlx.h?rev=22636…
Removed: trunk/reactos/include/ws2spi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ws2spi.h?rev=22636…
Removed: trunk/reactos/include/ws2tcpip.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ws2tcpip.h?rev=226…
Removed: trunk/reactos/include/wsahelp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wsahelp.h?rev=2263…
Removed: trunk/reactos/include/wsipx.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wsipx.h?rev=22636&…
Removed: trunk/reactos/include/wsnetbs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wsnetbs.h?rev=2263…
Removed: trunk/reactos/include/wtypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/wtypes.h?rev=22636…
Removed: trunk/reactos/include/xcmc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xcmc.h?rev=22636&v…
Removed: trunk/reactos/include/xprtdefs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xprtdefs.h?rev=226…
Removed: trunk/reactos/include/zmouse.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/zmouse.h?rev=22636…
18 years, 6 months
1
0
0
0
[ion] 22636: - STDCALL -> NTAPI
by ion@svn.reactos.org
Author: ion Date: Mon Jun 26 18:23:44 2006 New Revision: 22636 URL:
http://svn.reactos.org/svn/reactos?rev=22636&view=rev
Log: - STDCALL -> NTAPI Modified: trunk/reactos/base/setup/usetup/cabinet.h trunk/reactos/base/setup/usetup/console.c trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/cabinet.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.…
============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.h (original) +++ trunk/reactos/base/setup/usetup/cabinet.h Mon Jun 26 18:23:44 2006 @@ -88,7 +88,7 @@ WORD FileDate; // File date stamp, as used by DOS WORD FileTime; // File time stamp, as used by DOS WORD Attributes; // File attributes (CAB_ATTRIB_*) - CHAR FileName[]; + CHAR FileName[ANYSIZE_ARRAY]; /* After this is the NULL terminated filename */ } CFFILE, *PCFFILE; Modified: trunk/reactos/base/setup/usetup/console.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.…
============================================================================== --- trunk/reactos/base/setup/usetup/console.c (original) +++ trunk/reactos/base/setup/usetup/console.c Mon Jun 26 18:23:44 2006 @@ -147,7 +147,7 @@ * ReadConsoleA */ BOOL -STDCALL +NTAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, Modified: trunk/reactos/base/setup/usetup/format.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c…
============================================================================== --- trunk/reactos/base/setup/usetup/format.c (original) +++ trunk/reactos/base/setup/usetup/format.c Mon Jun 26 18:23:44 2006 @@ -36,7 +36,7 @@ /* FUNCTIONS ****************************************************************/ -BOOLEAN STDCALL +BOOLEAN NTAPI FormatCallback (CALLBACKCOMMAND Command, ULONG Modifier, PVOID Argument) Modified: trunk/reactos/base/setup/usetup/partlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Mon Jun 26 18:23:44 2006 @@ -422,7 +422,7 @@ } NTSTATUS -STDCALL +NTAPI DiskIdentifierQueryRoutine(PWSTR ValueName, ULONG ValueType, PVOID ValueData, @@ -449,7 +449,7 @@ } NTSTATUS -STDCALL +NTAPI DiskConfigurationDataQueryRoutine(PWSTR ValueName, ULONG ValueType, PVOID ValueData, @@ -485,7 +485,7 @@ } NTSTATUS -STDCALL +NTAPI SystemConfigurationDataQueryRoutine(PWSTR ValueName, ULONG ValueType, PVOID ValueData, Modified: trunk/reactos/base/setup/usetup/usetup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c…
============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Mon Jun 26 18:23:44 2006 @@ -3630,7 +3630,7 @@ } -VOID STDCALL +VOID NTAPI NtProcessStartup(PPEB Peb) { NTSTATUS Status;
18 years, 6 months
1
0
0
0
[ion] 22635: - Minor header fixes
by ion@svn.reactos.org
Author: ion Date: Mon Jun 26 18:10:10 2006 New Revision: 22635 URL:
http://svn.reactos.org/svn/reactos?rev=22635&view=rev
Log: - Minor header fixes Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/reactos/libs/fmifs/fmifs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev…
============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Jun 26 18:10:10 2006 @@ -331,10 +331,10 @@ VOID NTAPI RtlAssert( - PVOID FailedAssertion, - PVOID FileName, - ULONG LineNumber, - PCHAR Message + IN PVOID FailedAssertion, + IN PVOID FileName, + IN ULONG LineNumber, + IN PCHAR Message ); NTSYSAPI @@ -347,27 +347,37 @@ NTSYSAPI VOID NTAPI -RtlCaptureContext(OUT PCONTEXT ContextRecord); +RtlCaptureContext( + OUT PCONTEXT ContextRecord +); NTSYSAPI PVOID NTAPI -RtlEncodePointer(IN PVOID Pointer); +RtlEncodePointer( + IN PVOID Pointer +); NTSYSAPI PVOID NTAPI -RtlDecodePointer(IN PVOID Pointer); +RtlDecodePointer( + IN PVOID Pointer +); NTSYSAPI PVOID NTAPI -RtlEncodeSystemPointer(IN PVOID Pointer); +RtlEncodeSystemPointer( + IN PVOID Pointer +); NTSYSAPI PVOID NTAPI -RtlDecodeSystemPointer(IN PVOID Pointer); +RtlDecodeSystemPointer( + IN PVOID Pointer +); NTSYSAPI BOOLEAN @@ -380,22 +390,37 @@ NTSYSAPI ULONG NTAPI -RtlNtStatusToDosError(IN NTSTATUS Status); - -NTSYSAPI -VOID -NTAPI -RtlRaiseException(IN PEXCEPTION_RECORD ExceptionRecord); - -NTSYSAPI -VOID -NTAPI -RtlRaiseStatus(NTSTATUS Status); +RtlNtStatusToDosError( + IN NTSTATUS Status +); + +NTSYSAPI +VOID +NTAPI +RtlSetLastWin32ErrorAndNtStatusFromNtStatus( + IN NTSTATUS Status +); + +NTSYSAPI +VOID +NTAPI +RtlRaiseException( + IN PEXCEPTION_RECORD ExceptionRecord +); + +NTSYSAPI +VOID +NTAPI +RtlRaiseStatus( + IN NTSTATUS Status +); NTSYSAPI LONG NTAPI -RtlUnhandledExceptionFilter(struct _EXCEPTION_POINTERS* ExceptionInfo); +RtlUnhandledExceptionFilter( + IN struct _EXCEPTION_POINTERS* ExceptionInfo +); NTSYSAPI VOID @@ -413,7 +438,9 @@ NTSYSAPI USHORT NTAPI -RtlLogStackBackTrace(VOID); +RtlLogStackBackTrace( + VOID +); // // Heap Functions Modified: trunk/reactos/include/reactos/libs/fmifs/fmifs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fmifs…
============================================================================== --- trunk/reactos/include/reactos/libs/fmifs/fmifs.h (original) +++ trunk/reactos/include/reactos/libs/fmifs/fmifs.h Mon Jun 26 18:10:10 2006 @@ -55,7 +55,7 @@ /* FMIFS callback definition */ typedef BOOLEAN -(STDCALL * PFMIFSCALLBACK) ( +(NTAPI * PFMIFSCALLBACK) ( CALLBACKCOMMAND Command, ULONG SubAction, PVOID ActionInfo @@ -63,7 +63,7 @@ /* Chkdsk command in FMIFS */ VOID -STDCALL +NTAPI Chkdsk( PWCHAR DriveRoot, PWCHAR Format, @@ -78,7 +78,7 @@ /* ChkdskEx command in FMIFS (not in the original) */ VOID -STDCALL +NTAPI ChkDskEx( PWCHAR DriveRoot, PWCHAR Format, @@ -94,12 +94,12 @@ /* DiskCopy command in FMIFS */ VOID -STDCALL +NTAPI DiskCopy(VOID); /* Enable/Disable volume compression */ BOOL -STDCALL +NTAPI EnableVolumeCompression( PWCHAR DriveRoot, USHORT Compression @@ -112,7 +112,7 @@ #define FMIFS_FLOPPY 0x8 VOID -STDCALL +NTAPI FormatEx( PWCHAR DriveRoot, ULONG MediaFlag,
18 years, 6 months
1
0
0
0
[fireball] 22634: - Change user32 to Wine-compatible debug-print messages system. TRACE/FIXME/ERR and DPRINT/DPRINT1 are supported now in every file, however they are turned on in a different way: you have to place "#define YDEBUG" before #include <wine/debug.h> in order to get debug messages coming from this file - Give more space to user32.dll by changing preferred loading base
by fireball@svn.reactos.org
Author: fireball Date: Mon Jun 26 17:16:43 2006 New Revision: 22634 URL:
http://svn.reactos.org/svn/reactos?rev=22634&view=rev
Log: - Change user32 to Wine-compatible debug-print messages system. TRACE/FIXME/ERR and DPRINT/DPRINT1 are supported now in every file, however they are turned on in a different way: you have to place "#define YDEBUG" before #include <wine/debug.h> in order to get debug messages coming from this file - Give more space to user32.dll by changing preferred loading base Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/regcontrol.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/dll/win32/user32/misc/ddeclient.c trunk/reactos/dll/win32/user32/misc/ddeserver.c trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/display.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/exit.c trunk/reactos/dll/win32/user32/misc/exticon.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/object.c trunk/reactos/dll/win32/user32/misc/resources.c trunk/reactos/dll/win32/user32/misc/strpool.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/misc/timer.c trunk/reactos/dll/win32/user32/misc/winhelp.c trunk/reactos/dll/win32/user32/misc/winsta.c trunk/reactos/dll/win32/user32/misc/wsprintf.c trunk/reactos/dll/win32/user32/windows/accel.c trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/caret.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/clipboard.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/dc.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/font.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/dll/win32/user32/windows/prop.c trunk/reactos/dll/win32/user32/windows/rect.c trunk/reactos/dll/win32/user32/windows/text.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c Modified: trunk/reactos/baseaddress.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=226…
============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Mon Jun 26 17:16:43 2006 @@ -119,7 +119,7 @@ <property name="BASEADDRESS_OLE32" value="0x77a50000" /> <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> - <property name="BASEADDRESS_USER32" value="0x77e50000" /> + <property name="BASEADDRESS_USER32" value="0x77e40000" /> <property name="BASEADDRESS_GDI32" value="0x77f10000" /> <property name="BASEADDRESS_DNSAPI" value="0x77f30000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> Modified: trunk/reactos/dll/win32/user32/controls/button.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c (original) +++ trunk/reactos/dll/win32/user32/controls/button.c Mon Jun 26 17:16:43 2006 @@ -63,8 +63,9 @@ * - Button_SetImageList * - Button_SetTextMargin */ -#define NDEBUG // turn off TRACEs #include <user32.h> + +#include <wine/debug.h> /* GetWindowLong offsets for window extra information */ #define STATE_GWL_OFFSET 0 Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Mon Jun 26 17:16:43 2006 @@ -33,9 +33,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> - + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(combo); /* bits in the dwKeyData */ Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Mon Jun 26 17:16:43 2006 @@ -43,8 +43,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DECLARE_DEBUG_CHANNEL(combo); Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c Mon Jun 26 17:16:43 2006 @@ -19,6 +19,8 @@ */ #include <user32.h> + +#include <wine/debug.h> #ifdef __REACTOS__ #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Mon Jun 26 17:16:43 2006 @@ -19,8 +19,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* Start of hack section -------------------------------- */ Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/regcontrol.c (original) +++ trunk/reactos/dll/win32/user32/controls/regcontrol.c Mon Jun 26 17:16:43 2006 @@ -10,6 +10,8 @@ */ #include <user32.h> + +#include <wine/debug.h> static void RegisterBuiltinClass(const struct builtin_class_descr *Descr) { Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c Mon Jun 26 17:16:43 2006 @@ -31,8 +31,8 @@ /* INCLUDES *******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* GLOBAL VARIABLES ***********************************************************/ Modified: trunk/reactos/dll/win32/user32/controls/static.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c (original) +++ trunk/reactos/dll/win32/user32/controls/static.c Mon Jun 26 17:16:43 2006 @@ -43,6 +43,8 @@ */ #include <user32.h> + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(static); Modified: trunk/reactos/dll/win32/user32/include/user32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Mon Jun 26 17:16:43 2006 @@ -32,7 +32,6 @@ #include <win32k/callback.h> /* WINE Headers */ -#include <wine/debug.h> #include <wine/unicode.h> /* Internal User32 Headers */ Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c Mon Jun 26 17:16:43 2006 @@ -24,8 +24,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ddeml); Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddec…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeclient.c (original) +++ trunk/reactos/dll/win32/user32/misc/ddeclient.c Mon Jun 26 17:16:43 2006 @@ -24,8 +24,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ddeml); Modified: trunk/reactos/dll/win32/user32/misc/ddeserver.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddes…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeserver.c (original) +++ trunk/reactos/dll/win32/user32/misc/ddeserver.c Mon Jun 26 17:16:43 2006 @@ -24,8 +24,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ddeml); Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c Mon Jun 26 17:16:43 2006 @@ -10,6 +10,8 @@ */ #include <user32.h> + +#include <wine/debug.h> #define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */ static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); Modified: trunk/reactos/dll/win32/user32/misc/display.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c (original) +++ trunk/reactos/dll/win32/user32/misc/display.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> #define SIZEOF_DEVMODEA_300 124 #define SIZEOF_DEVMODEA_400 148 Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Mon Jun 26 17:16:43 2006 @@ -1,6 +1,6 @@ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> static ULONG User32TlsIndex; HINSTANCE User32Instance; Modified: trunk/reactos/dll/win32/user32/misc/exit.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exit…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/exit.c (original) +++ trunk/reactos/dll/win32/user32/misc/exit.c Mon Jun 26 17:16:43 2006 @@ -8,6 +8,8 @@ */ #include <user32.h> + +#include <wine/debug.h> /* * Sequence of events: Modified: trunk/reactos/dll/win32/user32/misc/exticon.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exti…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/exticon.c (original) +++ trunk/reactos/dll/win32/user32/misc/exticon.c Mon Jun 26 17:16:43 2006 @@ -23,8 +23,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* Start of Hack section */ Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Mon Jun 26 17:16:43 2006 @@ -29,6 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/misc/object.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/obje…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/object.c (original) +++ trunk/reactos/dll/win32/user32/misc/object.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c Mon Jun 26 17:16:43 2006 @@ -1,4 +1,6 @@ #include <user32.h> + +#include <wine/debug.h> /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which does not seem to work properly for stack address space. */ Modified: trunk/reactos/dll/win32/user32/misc/strpool.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/strp…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/strpool.c (original) +++ trunk/reactos/dll/win32/user32/misc/strpool.c Mon Jun 26 17:16:43 2006 @@ -1,6 +1,8 @@ // strpool.c #include <user32.h> + +#include <wine/debug.h> typedef struct tagHEAP_STRING_POOLA { Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Mon Jun 26 17:16:43 2006 @@ -11,8 +11,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* * @unimplemented Modified: trunk/reactos/dll/win32/user32/misc/timer.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/time…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/timer.c (original) +++ trunk/reactos/dll/win32/user32/misc/timer.c Mon Jun 26 17:16:43 2006 @@ -30,6 +30,7 @@ #include <user32.h> +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/misc/winhelp.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/winh…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/winhelp.c (original) +++ trunk/reactos/dll/win32/user32/misc/winhelp.c Mon Jun 26 17:16:43 2006 @@ -29,6 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> /* WinHelp internal structure */ typedef struct Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/winsta.c (original) +++ trunk/reactos/dll/win32/user32/misc/winsta.c Mon Jun 26 17:16:43 2006 @@ -10,6 +10,8 @@ */ #include <user32.h> + +#include <wine/debug.h> /* * @implemented Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr…
============================================================================== --- trunk/reactos/dll/win32/user32/misc/wsprintf.c (original) +++ trunk/reactos/dll/win32/user32/misc/wsprintf.c Mon Jun 26 17:16:43 2006 @@ -32,6 +32,9 @@ */ #include <user32.h> + +#include <wine/debug.h> + WINE_DEFAULT_DEBUG_CHANNEL(string); Modified: trunk/reactos/dll/win32/user32/windows/accel.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/accel.c (original) +++ trunk/reactos/dll/win32/user32/windows/accel.c Mon Jun 26 17:16:43 2006 @@ -30,6 +30,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> /* this is the 8 byte accel struct used in Win32 resources (internal only) */ typedef struct Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Mon Jun 26 17:16:43 2006 @@ -29,6 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> #include "pshpack1.h" Modified: trunk/reactos/dll/win32/user32/windows/caret.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/caret.c (original) +++ trunk/reactos/dll/win32/user32/windows/caret.c Mon Jun 26 17:16:43 2006 @@ -30,6 +30,7 @@ #include <user32.h> +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo) Modified: trunk/reactos/dll/win32/user32/windows/class.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Mon Jun 26 17:16:43 2006 @@ -10,6 +10,8 @@ */ #include <user32.h> + +#include <wine/debug.h> extern BOOL ControlsInitialized; Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c Mon Jun 26 17:16:43 2006 @@ -29,9 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> - + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> #undef CopyCursor Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c Mon Jun 26 17:16:43 2006 @@ -29,6 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Mon Jun 26 17:16:43 2006 @@ -12,8 +12,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> #ifndef WM_SETVISIBLE #define WM_SETVISIBLE 9 Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Mon Jun 26 17:16:43 2006 @@ -32,8 +32,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* MACROS/DEFINITIONS ********************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES *******************************************************************/ #include <user32.h> -//#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/font.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/input.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c Mon Jun 26 17:16:43 2006 @@ -81,8 +81,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(mdi); Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Mon Jun 26 17:16:43 2006 @@ -34,8 +34,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* internal popup menu window messages */ #define MM_SETMENUHANDLE (WM_USER + 0) Modified: trunk/reactos/dll/win32/user32/windows/message.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Mon Jun 26 17:16:43 2006 @@ -9,8 +9,8 @@ */ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* DDE message exchange * Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c Mon Jun 26 17:16:43 2006 @@ -32,8 +32,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> /* DEFINES *******************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Mon Jun 26 17:16:43 2006 @@ -23,8 +23,8 @@ /* INCLUDES *******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> #define HAS_DLGFRAME(Style, ExStyle) \ (((ExStyle) & WS_EX_DLGMODALFRAME) || \ Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c Mon Jun 26 17:16:43 2006 @@ -29,8 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> static HBRUSH FrameBrushes[13]; static HBITMAP hHatch; Modified: trunk/reactos/dll/win32/user32/windows/prop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/prop.c (original) +++ trunk/reactos/dll/win32/user32/windows/prop.c Mon Jun 26 17:16:43 2006 @@ -30,6 +30,8 @@ #include <user32.h> +#include <wine/debug.h> + typedef struct _PROPLISTITEM { ATOM Atom; Modified: trunk/reactos/dll/win32/user32/windows/rect.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/r…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/rect.c (original) +++ trunk/reactos/dll/win32/user32/windows/rect.c Mon Jun 26 17:16:43 2006 @@ -29,6 +29,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/text.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/t…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/text.c (original) +++ trunk/reactos/dll/win32/user32/windows/text.c Mon Jun 26 17:16:43 2006 @@ -30,6 +30,8 @@ #include <user32.h> +#include <wine/debug.h> + /* FUNCTIONS *****************************************************************/ static WORD Modified: trunk/reactos/dll/win32/user32/windows/window.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Mon Jun 26 17:16:43 2006 @@ -12,8 +12,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> BOOL ControlsInitialized = FALSE; Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c Mon Jun 26 17:16:43 2006 @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <wine/debug.h> /* FUNCTIONS *****************************************************************/
18 years, 6 months
1
0
0
0
← Newer
1
...
7
8
9
10
11
12
13
...
60
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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Results per page:
10
25
50
100
200