Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 22648: You can't really claim copyright for translating a resource file. Secondly, it's not even our code to put headers in. It's James Browns from catch22.net
by gedmurphy＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: gedmurphy Date: Tue Jun 27 03:02:54 2006 New Revision: 22648 URL: http://svn.reactos.org/svn/reactos?rev=22648&view=rev Log: You can't really claim copyright for translating a resource file. Secondly, it's not even our code to put headers in. It's James Browns from catch22.net Modified: trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc Modified: 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 (original) +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 03:02:54 2006 @@ -1,11 +1,3 @@ -/* - * 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 Modified: 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 (original) +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 03:02:54 2006 @@ -1,11 +1,3 @@ -/* - * 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

1 0

[ion] 22647: - Same fixes for LocalAlloc/LocalReAlloc - We now pass all 278+49 WINE Regression Tests related to Heap/Memory.
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: ion Date: Tue Jun 27 02:50:02 2006 New Revision: 22647 URL: http://svn.reactos.org/svn/reactos?rev=22647&view=rev Log: - Same fixes for LocalAlloc/LocalReAlloc - We now pass all 278+49 WINE Regression Tests related to Heap/Memory. Modified: trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c Tue Jun 27 02:50:02 2006 @@ -113,7 +113,7 @@ if (!Ptr) { /* We don't have a valid pointer, but so reuse this handle */ - HandleEntry->Flags = BASE_HEAP_ENTRY_FLAG_REUSE; + HandleEntry->Flags |= BASE_HEAP_ENTRY_FLAG_REUSE; } /* Check if the handle is discardable */ @@ -319,7 +319,7 @@ if (Ptr) { /* Make sure the handle isn't locked */ - if ((uFlags & LMEM_MOVEABLE) & !(HandleEntry->LockCount)) + if ((uFlags & LMEM_MOVEABLE) && !(HandleEntry->LockCount)) { /* Free the current heap */ RtlFreeHeap(hProcessHeap, Flags, Ptr);

1 0

[ion] 22646: - Fix a typo in a comparison (& vs &&) which was breaking GlobalReAlloc in some cases. - Fix a missing | (OR) in GlobalAlloc which created an invalid handle if the first allocation was of size 0.
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: ion Date: Tue Jun 27 02:48:12 2006 New Revision: 22646 URL: http://svn.reactos.org/svn/reactos?rev=22646&view=rev Log: - Fix a typo in a comparison (& vs &&) which was breaking GlobalReAlloc in some cases. - Fix a missing | (OR) in GlobalAlloc which created an invalid handle if the first allocation was of size 0. Modified: trunk/reactos/dll/win32/kernel32/include/baseheap.h trunk/reactos/dll/win32/kernel32/mem/global.c Modified: trunk/reactos/dll/win32/kernel32/include/baseheap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/baseheap.h (original) +++ trunk/reactos/dll/win32/kernel32/include/baseheap.h Tue Jun 27 02:48:12 2006 @@ -65,6 +65,7 @@ #define BASE_TRACE_FAILURE() \ BH_PRINT("[BASE_HEAP] %s : Failing %d\n", \ __FUNCTION__, __LINE__) + // // The handle structure for global heap handles. // Notice that it nicely overlays with RTL_HANDLE_ENTRY. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c Tue Jun 27 02:48:12 2006 @@ -117,7 +117,7 @@ if (!Ptr) { /* We don't have a valid pointer, but so reuse this handle */ - HandleEntry->Flags = BASE_HEAP_ENTRY_FLAG_REUSE; + HandleEntry->Flags |= BASE_HEAP_ENTRY_FLAG_REUSE; } /* Check if the handle is discardable */ @@ -486,7 +486,7 @@ if (Ptr) { /* Make sure the handle isn't locked */ - if ((uFlags & GMEM_MOVEABLE) & !(HandleEntry->LockCount)) + if ((uFlags & GMEM_MOVEABLE) && !(HandleEntry->LockCount)) { /* Free the current heap */ RtlFreeHeap(hProcessHeap, Flags, Ptr);

1 0

[janderwald] 22645: add missing includes
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: janderwald Date: Tue Jun 27 00:18:52 2006 New Revision: 22645 URL: http://svn.reactos.org/svn/reactos?rev=22645&view=rev Log: add missing includes Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp Tue Jun 27 00:18:52 2006 @@ -5,6 +5,7 @@ // Copyright J Brown 2001 // #include <windows.h> +#include <stdlib.h> #include "cardlib.h" #include "cardregion.h" #include "cardcolor.h" Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Tue Jun 27 00:18:52 2006 @@ -1,6 +1,8 @@ #include <windows.h> #include <commctrl.h> #include <tchar.h> +#include <stdlib.h> + #include "resource.h" #include "cardlib/cardlib.h"

1 0

[janderwald] 22644: add missing include
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: janderwald Date: Tue Jun 27 00:15:58 2006 New Revision: 22644 URL: http://svn.reactos.org/svn/reactos?rev=22644&view=rev Log: add missing include Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp Tue Jun 27 00:15:58 2006 @@ -6,6 +6,7 @@ // #include <windows.h> #include <tchar.h> +#include <stdlib.h> #include "globals.h" #include "cardlib.h"

1 0

[janderwald] 22643: * move english resource file to own file * add german translation * patch provided by Daniel "EmuandCo" Reimer
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

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"

1 0

[janderwald] 22642: fix include
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

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" />

1 0

[janderwald] 22641: remove unecessary include
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

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__" />

1 0

[ion] 22640: - Fix the build...I hope/think
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

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)

1 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 26 Jun '06

26 Jun '06

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 }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs