Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[tkreuzer] 50676: [WIN32K] Handle BITMAPV4HEADER and BITMAPV5HEADER, when creating a DIB palette. Detect PAL_RGB like done with PAL_BGR in PALETTE_AllocPalette (optimization). Fixes pink icons.
by tkreuzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: tkreuzer Date: Sat Feb 12 20:30:09 2011 New Revision: 50676 URL: http://svn.reactos.org/svn/reactos?rev=50676&view=rev Log: [WIN32K] Handle BITMAPV4HEADER and BITMAPV5HEADER, when creating a DIB palette. Detect PAL_RGB like done with PAL_BGR in PALETTE_AllocPalette (optimization). Fixes pink icons. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Feb 12 20:30:09 2011 @@ -1750,9 +1750,19 @@ else if (bmi->bmiHeader.biCompression == BI_BITFIELDS) { paletteType = PAL_BITFIELDS; - RedMask = pdwColors[0]; - GreenMask = pdwColors[1]; - BlueMask = pdwColors[2]; + if (bmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) + { + PBITMAPV4HEADER pV4Header = (PBITMAPV4HEADER)&bmi->bmiHeader; + RedMask = pV4Header->bV4RedMask; + GreenMask = pV4Header->bV4GreenMask; + BlueMask = pV4Header->bV4BlueMask; + } + else + { + RedMask = pdwColors[0]; + GreenMask = pdwColors[1]; + BlueMask = pdwColors[2]; + } } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sat Feb 12 20:30:09 2011 @@ -197,6 +197,8 @@ PalGDI->flFlags |= PAL_RGB16_565; else if (Red == 0xFF0000 && Green == 0xFF00 && Blue == 0xFF) PalGDI->flFlags |= PAL_BGR; + else if (Red == 0xFF && Green == 0xFF00 && Blue == 0xFF0000) + PalGDI->flFlags |= PAL_RGB; } PALETTE_UnlockPalette(PalGDI);

1 0

[ekohl] 50675: [ADVAPI32] Move file encryption functions from crypt/crypt.c to misc/efs.c.
by ekohl＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: ekohl Date: Sat Feb 12 20:23:16 2011 New Revision: 50675 URL: http://svn.reactos.org/svn/reactos?rev=50675&view=rev Log: [ADVAPI32] Move file encryption functions from crypt/crypt.c to misc/efs.c. Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/misc/efs.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sat Feb 12 20:23:16 2011 @@ -2217,124 +2217,3 @@ return result; } - -/* - * @unimplemented - */ -DWORD WINAPI AddUsersToEncryptedFile ( - LPCWSTR lpcwstr, - PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -DWORD WINAPI RemoveUsersFromEncryptedFile ( - LPCWSTR lpcwstr, - PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI FileEncryptionStatusW ( - LPCWSTR lpFileName, - LPDWORD lpStatus - ) -{ - FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); - if (!lpStatus) - return FALSE; - *lpStatus = FILE_SYSTEM_NOT_SUPPORT; - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI FileEncryptionStatusA ( - LPCSTR lpFileName, - LPDWORD lpStatus - ) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL ret = FALSE; - - TRACE("(%s, %p)\n", lpFileName, lpStatus); - - FileName.Buffer = NULL; - - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - goto cleanup; - } - ret = FileEncryptionStatusW(FileName.Buffer, lpStatus); - -cleanup: - if (FileName.Buffer != NULL) - RtlFreeUnicodeString(&FileName); - return ret; -} - -/* - * @unimplemented - */ -DWORD WINAPI QueryUsersOnEncryptedFile ( - LPCWSTR lpctstr, - PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -void WINAPI FreeEncryptionCertificateHashList ( - PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return; -} - - -/* - * @unimplemented - */ -DWORD WINAPI QueryRecoveryAgentsOnEncryptedFile ( - LPCWSTR lpctstr, - PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI EncryptionDisable( - LPCWSTR DirPath, - BOOL Disable - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - Modified: trunk/reactos/dll/win32/advapi32/misc/efs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Sat Feb 12 20:23:16 2011 @@ -13,10 +13,23 @@ /* + * @unimplemented + */ +DWORD WINAPI +AddUsersToEncryptedFile(LPCWSTR lpcwstr, + PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* * @implemented */ BOOL WINAPI -DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +DecryptFileA(LPCSTR lpFileName, + DWORD dwReserved) { UNICODE_STRING FileName; NTSTATUS Status; @@ -40,7 +53,9 @@ /* * @unimplemented */ -BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) +BOOL WINAPI +DecryptFileW(LPCWSTR lpFileName, + DWORD dwReserved) { FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); return TRUE; @@ -82,4 +97,113 @@ return TRUE; } + +/* + * @unimplemented + */ +BOOL WINAPI +EncryptionDisable(LPCWSTR DirPath, + BOOL Disable) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @implemented + */ +BOOL WINAPI +FileEncryptionStatusA(LPCSTR lpFileName, + LPDWORD lpStatus) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret = FALSE; + + TRACE("(%s, %p)\n", lpFileName, lpStatus); + + FileName.Buffer = NULL; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto cleanup; + } + + ret = FileEncryptionStatusW(FileName.Buffer, lpStatus); + +cleanup: + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + + return ret; +} + +/* + * @unimplemented + */ +BOOL WINAPI +FileEncryptionStatusW(LPCWSTR lpFileName, + LPDWORD lpStatus) +{ + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + + if (!lpStatus) + return FALSE; + + *lpStatus = FILE_SYSTEM_NOT_SUPPORT; + + return TRUE; +} + + +/* + * @unimplemented + */ +VOID WINAPI +FreeEncryptionCertificateHashList(PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return; +} + + +/* + * @unimplemented + */ +DWORD WINAPI +QueryRecoveryAgentsOnEncryptedFile(LPCWSTR lpctstr, + PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD WINAPI +QueryUsersOnEncryptedFile(LPCWSTR lpctstr, + PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD WINAPI +RemoveUsersFromEncryptedFile(LPCWSTR lpcwstr, + PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */

1 0

[janderwald] 50674: [MMIXER] - Allocate memory for the logical pin array - Use the correct counter variable for logical pin array - Found by msvc
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 19:08:22 2011 New Revision: 50674 URL: http://svn.reactos.org/svn/reactos?rev=50674&view=rev Log: [MMIXER] - Allocate memory for the logical pin array - Use the correct counter variable for logical pin array - Found by msvc Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sat Feb 12 19:08:22 2011 @@ -544,6 +544,14 @@ ASSERT(MixerData->Topology); ASSERT(MixerData->MixerInfo == MixerInfo); + /* now allocate logical pin array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &LogicalNodes); + if (Status != MM_STATUS_SUCCESS) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + /* get logical pin nodes */ MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); @@ -552,7 +560,7 @@ ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]); Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; - for(Index = 0; Index < ConnectedNodesCount; Index++) + for(Index = 0; Index < LogicalNodesCount; Index++) { /* getting logical pin offset */ MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset);

1 0

[janderwald] 50673: - Fix a bug where a spinlock was acquired on not initialized local variable
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 18:55:52 2011 New Revision: 50673 URL: http://svn.reactos.org/svn/reactos?rev=50673&view=rev Log: - Fix a bug where a spinlock was acquired on not initialized local variable Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Feb 12 18:55:52 2011 @@ -1156,11 +1156,11 @@ BOOLEAN DoInvalidate = FALSE; KIRQL OldLevel; + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + /* acquire lock */ KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); - - /* get device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; /* get current time */ KeQuerySystemTime(&Time);

1 0

[janderwald] 50672: - Fix a bug where a spinlock was acquired on not initialized local variable
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 18:54:43 2011 New Revision: 50672 URL: http://svn.reactos.org/svn/reactos?rev=50672&view=rev Log: - Fix a bug where a spinlock was acquired on not initialized local variable Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Feb 12 18:54:43 2011 @@ -1156,11 +1156,11 @@ BOOLEAN DoInvalidate = FALSE; KIRQL OldLevel; + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + /* acquire lock */ KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); - - /* get device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; /* get current time */ KeQuerySystemTime(&Time);

1 0

[janderwald] 50671: [KS] - Fix a bug where a spinlock was acquired on not initialized local variable - Found by msvc
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 18:52:35 2011 New Revision: 50671 URL: http://svn.reactos.org/svn/reactos?rev=50671&view=rev Log: [KS] - Fix a bug where a spinlock was acquired on not initialized local variable - Found by msvc Modified: branches/cmake-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/cmake-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Feb 12 18:52:35 2011 @@ -1156,11 +1156,11 @@ BOOLEAN DoInvalidate = FALSE; KIRQL OldLevel; + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + /* acquire lock */ KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); - - /* get device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; /* get current time */ KeQuerySystemTime(&Time);

1 0

[pschweitzer] 50670: [NTOSKRNL] For both FsRtlIsNameInExpression & FsRtlIsDbcsInExpression: - Remove useless checks - Move redundant sum before loop, so it's done only once - Fix handling of * wild...
by pschweitzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: pschweitzer Date: Sat Feb 12 18:39:17 2011 New Revision: 50670 URL: http://svn.reactos.org/svn/reactos?rev=50670&view=rev Log: [NTOSKRNL] For both FsRtlIsNameInExpression & FsRtlIsDbcsInExpression: - Remove useless checks - Move redundant sum before loop, so it's done only once - Fix handling of * wildcard This fixes failing kmtest tests added in r50614 Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sat Feb 12 18:39:17 2011 @@ -160,7 +160,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; PAGED_CODE(); ASSERT(Name->Length); @@ -169,34 +169,37 @@ while (NamePosition < Name->Length && ExpressionPosition < Expression->Length) { - if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition]) || - (Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || - (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) + if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition])) { NamePosition++; ExpressionPosition++; } + else if ((Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) + { + NamePosition++; + ExpressionPosition++; + StarFound = MAXUSHORT; + } else if (Expression->Buffer[ExpressionPosition] == '*') { - if (ExpressionPosition < (Expression->Length - 1)) - { - if (Expression->Buffer[ExpressionPosition+1] != '*' && Expression->Buffer[ExpressionPosition+1] != '?' && - Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_DOT && - Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_QM && - Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_STAR) + StarFound = ExpressionPosition++; + if (StarFound < (Expression->Length - 1)) + { + while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length) { - while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition+1] && - NamePosition < Name->Length) NamePosition++; + NamePosition++; } } else { NamePosition = Name->Length; } - ExpressionPosition++; } else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { + StarFound = MAXUSHORT; MatchingChars = NamePosition; while (MatchingChars < Name->Length) { @@ -207,6 +210,15 @@ MatchingChars++; } ExpressionPosition++; + } + else if (StarFound != MAXUSHORT) + { + ExpressionPosition = StarFound + 1; + while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length) + { + NamePosition++; + } } else { Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sat Feb 12 18:39:17 2011 @@ -22,40 +22,44 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; PAGED_CODE(); ASSERT(!IgnoreCase || UpcaseTable); while (NamePosition < Name->Length / sizeof(WCHAR) && ExpressionPosition < Expression->Length / sizeof(WCHAR)) { - if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition])) || - (Expression->Buffer[ExpressionPosition] == L'?') || (Expression->Buffer[ExpressionPosition] == DOS_QM) || - (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) + if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]))) { NamePosition++; ExpressionPosition++; } + else if (Expression->Buffer[ExpressionPosition] == L'?' || (Expression->Buffer[ExpressionPosition] == DOS_QM) || + (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) + { + NamePosition++; + ExpressionPosition++; + StarFound = MAXUSHORT; + } else if (Expression->Buffer[ExpressionPosition] == L'*') { - if (ExpressionPosition < (Expression->Length / sizeof(WCHAR) - 1)) - { - if (Expression->Buffer[ExpressionPosition+1] != L'*' && Expression->Buffer[ExpressionPosition+1] != L'?' && - Expression->Buffer[ExpressionPosition+1] != DOS_DOT && Expression->Buffer[ExpressionPosition+1] != DOS_QM && - Expression->Buffer[ExpressionPosition+1] != DOS_STAR) + StarFound = ExpressionPosition++; + if (StarFound < (Expression->Length / sizeof(WCHAR) - 1)) + { + while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length / sizeof(WCHAR)) { - while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition+1] && - NamePosition < Name->Length / sizeof(WCHAR)) NamePosition++; + NamePosition++; } } else { NamePosition = Name->Length / sizeof(WCHAR); } - ExpressionPosition++; } else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) { + StarFound = MAXUSHORT; MatchingChars = NamePosition; while (MatchingChars < Name->Length / sizeof(WCHAR)) { @@ -66,6 +70,15 @@ MatchingChars++; } ExpressionPosition++; + } + else if (StarFound != MAXUSHORT) + { + ExpressionPosition = StarFound + 1; + while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] && + NamePosition < Name->Length / sizeof(WCHAR)) + { + NamePosition++; + } } else {

1 0

[janderwald] 50669: - Revert 45676 - It appears that the definitions for IID_IUnknown differ for kernel mode COM and user mode COM
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 17:40:51 2011 New Revision: 50669 URL: http://svn.reactos.org/svn/reactos?rev=50669&view=rev Log: - Revert 45676 - It appears that the definitions for IID_IUnknown differ for kernel mode COM and user mode COM Modified: trunk/reactos/include/ddk/punknown.h Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Sat Feb 12 17:40:51 2011 @@ -32,7 +32,7 @@ #define __IUnknown_INTERFACE_DEFINED__ DEFINE_GUID(IID_IUnknown, - 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); + 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46); #undef INTERFACE #define INTERFACE IUnknown

1 0

[tkreuzer] 50668: [COMCTL32] Fix bitmap resources. They were not very valid. Windows didn't even load them. Probably created with some linux tool *cough* Fixes part of the broken icons. Not the pin...
by tkreuzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: tkreuzer Date: Sat Feb 12 16:55:08 2011 New Revision: 50668 URL: http://svn.reactos.org/svn/reactos?rev=50668&view=rev Log: [COMCTL32] Fix bitmap resources. They were not very valid. Windows didn't even load them. Probably created with some linux tool *cough* Fixes part of the broken icons. Not the pink ones though. Modified: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp trunk/reactos/dll/win32/comctl32/idb_std_large.bmp trunk/reactos/dll/win32/comctl32/idb_std_small.bmp trunk/reactos/dll/win32/comctl32/idb_view_large.bmp trunk/reactos/dll/win32/comctl32/idb_view_small.bmp Modified: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… ============================================================================== Binary files - no diff available.

1 0

[fireball] 50667: [RTL/DPH] - Add core DPH (Debug Page Heap) structures based on Windows 2003/Vista. - Add misc generic support routines. - Implement DPH version of RtlCreateHeap(). - Debug prints ...
by fireball＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: fireball Date: Sat Feb 12 16:38:00 2011 New Revision: 50667 URL: http://svn.reactos.org/svn/reactos?rev=50667&view=rev Log: [RTL/DPH] - Add core DPH (Debug Page Heap) structures based on Windows 2003/Vista. - Add misc generic support routines. - Implement DPH version of RtlCreateHeap(). - Debug prints match those printed by Windows 2003. Modified: trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Feb 12 16:38:00 2011 @@ -74,9 +74,9 @@ UNICODE_STRING ImageName; UNICODE_STRING ImagePathName; ULONG ValueSize; - extern ULONG RtlpPageHeapGlobalFlags, RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; + extern ULONG RtlpDphGlobalFlags, RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; extern ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; - extern WCHAR RtlpPageHeapTargetDlls[512]; + extern WCHAR RtlpDphTargetDlls[512]; extern BOOLEAN RtlpPageHeapEnabled; if (Peb->ProcessParameters && @@ -144,8 +144,8 @@ LdrQueryImageFileExecutionOptions(&ImageName, L"PageHeapFlags", REG_DWORD, - (PVOID)&RtlpPageHeapGlobalFlags, - sizeof(RtlpPageHeapGlobalFlags), + (PVOID)&RtlpDphGlobalFlags, + sizeof(RtlpDphGlobalFlags), &ValueSize); LdrQueryImageFileExecutionOptions(&ImageName, @@ -179,8 +179,8 @@ LdrQueryImageFileExecutionOptions(&ImageName, L"PageHeapTargetDlls", REG_SZ, - (PVOID)RtlpPageHeapTargetDlls, - sizeof(RtlpPageHeapTargetDlls), + (PVOID)RtlpDphTargetDlls, + sizeof(RtlpDphTargetDlls), &ValueSize); /* Now when all parameters are read, enable page heap */ Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sat Feb 12 16:38:00 2011 @@ -17,13 +17,367 @@ #define NDEBUG #include <debug.h> +/* TYPES **********************************************************************/ + +typedef struct _DPH_BLOCK_INFORMATION +{ + ULONG StartStamp; + PVOID Heap; + ULONG RequestedSize; + ULONG ActualSize; + union + { + LIST_ENTRY FreeQueue; + SINGLE_LIST_ENTRY FreePushList; + WORD TraceIndex; + }; + PVOID StackTrace; + ULONG EndStamp; +} DPH_BLOCK_INFORMATION, *PDPH_BLOCK_INFORMATION; + +typedef struct _DPH_HEAP_BLOCK +{ + union + { + struct _DPH_HEAP_BLOCK *pNextAlloc; + LIST_ENTRY AvailableEntry; + RTL_BALANCED_LINKS TableLinks; + }; + PUCHAR pUserAllocation; + PUCHAR pVirtualBlock; + ULONG nVirtualBlockSize; + ULONG nVirtualAccessSize; + ULONG nUserRequestedSize; + ULONG nUserActualSize; + PVOID UserValue; + ULONG UserFlags; + PRTL_TRACE_BLOCK StackTrace; + LIST_ENTRY AdjacencyEntry; + PUCHAR pVirtualRegion; +} DPH_HEAP_BLOCK, *PDPH_HEAP_BLOCK; + +typedef struct _DPH_HEAP_ROOT +{ + ULONG Signature; + ULONG HeapFlags; + PRTL_CRITICAL_SECTION HeapCritSect; + ULONG nRemoteLockAcquired; + + PDPH_HEAP_BLOCK pVirtualStorageListHead; + PDPH_HEAP_BLOCK pVirtualStorageListTail; + ULONG nVirtualStorageRanges; + ULONG nVirtualStorageBytes; + + RTL_AVL_TABLE BusyNodesTable; + PDPH_HEAP_BLOCK NodeToAllocate; + ULONG nBusyAllocations; + ULONG nBusyAllocationBytesCommitted; + + PDPH_HEAP_BLOCK pFreeAllocationListHead; + PDPH_HEAP_BLOCK pFreeAllocationListTail; + ULONG nFreeAllocations; + ULONG nFreeAllocationBytesCommitted; + + LIST_ENTRY AvailableAllocationHead; + ULONG nAvailableAllocations; + ULONG nAvailableAllocationBytesCommitted; + + PDPH_HEAP_BLOCK pUnusedNodeListHead; + PDPH_HEAP_BLOCK pUnusedNodeListTail; + ULONG nUnusedNodes; + ULONG nBusyAllocationBytesAccessible; + PDPH_HEAP_BLOCK pNodePoolListHead; + PDPH_HEAP_BLOCK pNodePoolListTail; + ULONG nNodePools; + ULONG nNodePoolBytes; + + LIST_ENTRY NextHeap; + ULONG ExtraFlags; + ULONG Seed; + PVOID NormalHeap; + PRTL_TRACE_BLOCK CreateStackTrace; + PVOID FirstThread; +} DPH_HEAP_ROOT, *PDPH_HEAP_ROOT; + +/* GLOBALS ********************************************************************/ + BOOLEAN RtlpPageHeapEnabled = FALSE; -ULONG RtlpPageHeapGlobalFlags; +ULONG RtlpDphGlobalFlags; ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; -WCHAR RtlpPageHeapTargetDlls[512]; +WCHAR RtlpDphTargetDlls[512]; + +ULONG RtlpDphBreakOptions; +ULONG RtlpDphDebugOptions; + +LIST_ENTRY RtlpDphPageHeapList; +BOOLEAN RtlpDphPageHeapListInitialized; +RTL_CRITICAL_SECTION RtlpDphPageHeapListLock; +ULONG RtlpDphPageHeapListLength; +UNICODE_STRING RtlpDphTargetDllsUnicode; + +/* Counters */ +LONG RtlpDphCounter; +LONG RtlpDphAllocFails; +LONG RtlpDphReleaseFails; +LONG RtlpDphFreeFails; +LONG RtlpDphProtectFails; + +#define DPH_RESERVE_SIZE 0x100000 +#define DPH_POOL_SIZE 0x4000 + +/* RtlpDphBreakOptions */ +#define DPH_BREAK_ON_RESERVE_FAIL 0x01 +#define DPH_BREAK_ON_COMMIT_FAIL 0x02 +#define DPH_BREAK_ON_RELEASE_FAIL 0x04 +#define DPH_BREAK_ON_FREE_FAIL 0x08 +#define DPH_BREAK_ON_PROTECT_FAIL 0x10 + +/* RtlpDphDebugOptions */ +#define DPH_DEBUG_INTERNAL_VALIDATE 0x01 +#define DPH_DEBUG_VERBOSE 0x04 + +/* Fillers */ +#define DPH_FILL 0xEEEEEEEE + +/* Signatures */ +#define DPH_SIGNATURE 0xFFEEDDCC /* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +RtlpSecMemFreeVirtualMemory(HANDLE Process, PVOID *Base, PSIZE_T Size, ULONG Type) +{ + NTSTATUS Status; + //PVOID *SavedBase = Base; + //PSIZE_T SavedSize = Size; + + /* Free the memory */ + Status = ZwFreeVirtualMemory(Process, Base, Size, Type); + + /* Flush secure memory cache if needed and retry freeing */ +#if 0 + if (Status == STATUS_INVALID_PAGE_PROTECTION && + Process == NtCurrentProcess() && + RtlFlushSecureMemoryCache(*SavedBase, *SavedSize)) + { + Status = ZwFreeVirtualMemory(NtCurrentProcess(), SavedBase, SavedSize, Type); + } +#endif + + return Status; +} + +NTSTATUS NTAPI +RtlpDphAllocateVm(PVOID *Base, SIZE_T Size, ULONG Type, ULONG Protection) +{ + NTSTATUS Status; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + Base, + 0, + &Size, + Type, + Protection); + + /* Check for failures */ + if (!NT_SUCCESS(Status)) + { + if (Type == MEM_RESERVE) + { + _InterlockedIncrement(&RtlpDphCounter); + if (RtlpDphBreakOptions & DPH_BREAK_ON_RESERVE_FAIL) + { + DPRINT1("Page heap: AllocVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + else + { + _InterlockedIncrement(&RtlpDphAllocFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_COMMIT_FAIL) + { + DPRINT1("Page heap: AllocVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + } + + return Status; +} + +NTSTATUS NTAPI +RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type, ULONG Protection) +{ + NTSTATUS Status; + + /* Free the memory */ + Status = RtlpSecMemFreeVirtualMemory(NtCurrentProcess(), &Base, &Size, Type); + + /* Log/report failures */ + if (!NT_SUCCESS(Status)) + { + if (Type == MEM_RELEASE) + { + _InterlockedIncrement(&RtlpDphReleaseFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_RELEASE_FAIL) + { + DPRINT1("Page heap: FreeVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + else + { + _InterlockedIncrement(&RtlpDphFreeFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_FREE_FAIL) + { + DPRINT1("Page heap: FreeVm (%p, %p, %x) failed with %x \n", Base, Size, Type, Status); + DbgBreakPoint(); + return Status; + } + } + } + + return Status; +} + +NTSTATUS NTAPI +RtlpDphProtectVm(PVOID Base, SIZE_T Size, ULONG Protection) +{ + NTSTATUS Status; + ULONG OldProtection; + + /* Change protection */ + Status = ZwProtectVirtualMemory(NtCurrentProcess(), &Base, &Size, Protection, &OldProtection); + + /* Log/report failures */ + if (!NT_SUCCESS(Status)) + { + _InterlockedIncrement(&RtlpDphProtectFails); + if (RtlpDphBreakOptions & DPH_BREAK_ON_PROTECT_FAIL) + { + DPRINT1("Page heap: ProtectVm (%p, %p, %x) failed with %x \n", Base, Size, Protection, Status); + DbgBreakPoint(); + return Status; + } + } + + return Status; +} + +VOID NTAPI +RtlpDphAddNewPool(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK NodeBlock, PVOID Virtual, SIZE_T Size, BOOLEAN Add) +{ + UNIMPLEMENTED; +} + +PDPH_HEAP_BLOCK NTAPI +RtlpDphAllocateNode(PDPH_HEAP_ROOT DphRoot) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID NTAPI +RtlpDphPlaceOnPoolList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + UNIMPLEMENTED; +} + +VOID NTAPI +RtlpDphPlaceOnVirtualList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + UNIMPLEMENTED; +} + +VOID NTAPI +RtlpDphCoalesceNodeIntoAvailable(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + UNIMPLEMENTED; +} + +RTL_GENERIC_COMPARE_RESULTS +NTAPI +RtlpDphCompareNodeForTable(IN PRTL_AVL_TABLE Table, + IN PVOID FirstStruct, + IN PVOID SecondStruct) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return 0; +} + +PVOID +NTAPI +RtlpDphAllocateNodeForTable(IN PRTL_AVL_TABLE Table, + IN CLONG ByteSize) +{ + /* FIXME: TODO */ + ASSERT(FALSE); + return NULL; +} + +VOID +NTAPI +RtlpDphFreeNodeForTable(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer) +{ + /* FIXME: TODO */ + ASSERT(FALSE); +} + +NTSTATUS NTAPI +RtlpDphInitializeDelayedFreeQueue() +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +RtlpDphTargetDllsLogicInitialize() +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +VOID NTAPI +RtlpDphInternalValidatePageHeap(PDPH_HEAP_ROOT DphRoot, PVOID Address, ULONG Value) +{ + UNIMPLEMENTED; +} + +NTSTATUS NTAPI +RtlpDphProcessStartupInitialization() +{ + NTSTATUS Status; + PTEB Teb = NtCurrentTeb(); + + /* Initialize the DPH heap list and its critical section */ + InitializeListHead(&RtlpDphPageHeapList); + Status = RtlInitializeCriticalSection(&RtlpDphPageHeapListLock); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + return Status; + } + + /* Initialize delayed-free queue */ + Status = RtlpDphInitializeDelayedFreeQueue(); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the target dlls string */ + RtlInitUnicodeString(&RtlpDphTargetDllsUnicode, RtlpDphTargetDlls); + Status = RtlpDphTargetDllsLogicInitialize(); + + /* Per-process DPH init is done */ + RtlpDphPageHeapListInitialized = TRUE; + + DPRINT1("Page heap: pid 0x%X: page heap enabled with flags 0x%X.\n", Teb->ClientId.UniqueProcess, RtlpDphGlobalFlags); + + return Status; +} HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, @@ -33,7 +387,135 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters) { - return NULL; + PVOID Base; + PHEAP HeapPtr; + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK DphNode; + ULONG MemSize; + NTSTATUS Status; + LARGE_INTEGER PerfCounter; + + /* Check for a DPH bypass flag */ + if ((ULONG_PTR)Parameters == -1) return NULL; + + /* Make sure no user-allocated stuff was provided */ + if (Addr || Lock) return NULL; + + /* Allocate minimum amount of virtual memory */ + MemSize = DPH_RESERVE_SIZE; + Status = RtlpDphAllocateVm(&Base, MemSize, MEM_COMMIT, PAGE_NOACCESS); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + return NULL; + } + + /* Set protection */ + Status = RtlpDphProtectVm(Base, 2*PAGE_SIZE + DPH_POOL_SIZE, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + //RtlpDphFreeVm(Base, 0, 0, 0); + ASSERT(FALSE); + return NULL; + } + + /* Start preparing the 1st page. Fill it with the default filler */ + RtlFillMemory(Base, PAGE_SIZE, DPH_FILL); + + /* Set flags in the "HEAP" structure */ + HeapPtr = (PHEAP)Base; + HeapPtr->Flags = Flags | HEAP_FLAG_PAGE_ALLOCS; + HeapPtr->ForceFlags = Flags | HEAP_FLAG_PAGE_ALLOCS; + + /* Set 1st page to read only now */ + Status = RtlpDphProtectVm(Base, PAGE_SIZE, PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + return NULL; + } + + /* 2nd page is the real DPH root block */ + DphRoot = (PDPH_HEAP_ROOT)((PCHAR)Base + PAGE_SIZE); + + /* Initialize the DPH root */ + DphRoot->Signature = DPH_SIGNATURE; + DphRoot->HeapFlags = Flags; + DphRoot->HeapCritSect = (PRTL_CRITICAL_SECTION)((PCHAR)DphRoot + DPH_POOL_SIZE); + DphRoot->ExtraFlags = RtlpDphGlobalFlags; + + ZwQueryPerformanceCounter(&PerfCounter, NULL); + DphRoot->Seed = PerfCounter.LowPart; + + RtlInitializeCriticalSection(DphRoot->HeapCritSect); + + /* Create a normal heap for this paged heap */ + DphRoot->NormalHeap = RtlCreateHeap(Flags, NULL, TotalSize, CommitSize, NULL, (PRTL_HEAP_PARAMETERS)-1); + if (!DphRoot->NormalHeap) + { + ASSERT(FALSE); + return NULL; + } + + /* 3rd page: a pool for DPH allocations */ + RtlpDphAddNewPool(DphRoot, NULL, DphRoot + 1, DPH_POOL_SIZE - sizeof(DPH_HEAP_ROOT), FALSE); + + /* Allocate internal heap blocks. For the root */ + DphNode = RtlpDphAllocateNode(DphRoot); + ASSERT(DphNode != NULL); + DphNode->pVirtualBlock = (PUCHAR)DphRoot; + DphNode->nVirtualBlockSize = DPH_POOL_SIZE; + RtlpDphPlaceOnPoolList(DphRoot, DphNode); + + /* For the memory we allocated as a whole */ + DphNode = RtlpDphAllocateNode(DphRoot); + ASSERT(DphNode != NULL); + DphNode->pVirtualBlock = Base; + DphNode->nVirtualBlockSize = MemSize; + RtlpDphPlaceOnVirtualList(DphRoot, DphNode); + + /* For the remaining part */ + DphNode = RtlpDphAllocateNode(DphRoot); + ASSERT(DphNode != NULL); + DphNode->pVirtualBlock = (PUCHAR)Base + 2*PAGE_SIZE + DPH_POOL_SIZE; + DphNode->nVirtualBlockSize = MemSize - (2*PAGE_SIZE + DPH_POOL_SIZE); + RtlpDphCoalesceNodeIntoAvailable(DphRoot, DphNode); + + //DphRoot->CreateStackTrace = RtlpDphLogStackTrace(1); + + /* Initialize AVL-based busy nodes table */ + RtlInitializeGenericTableAvl(&DphRoot->BusyNodesTable, + RtlpDphCompareNodeForTable, + RtlpDphAllocateNodeForTable, + RtlpDphFreeNodeForTable, + NULL); + + /* Initialize per-process startup info */ + if (!RtlpDphPageHeapListInitialized) RtlpDphProcessStartupInitialization(); + + /* Acquire the heap list lock */ + RtlEnterCriticalSection(&RtlpDphPageHeapListLock); + + /* Insert this heap to the tail of the global list */ + InsertTailList(&RtlpDphPageHeapList, &DphRoot->NextHeap); + + /* Note we increased the size of the list */ + RtlpDphPageHeapListLength++; + + /* Release the heap list lock */ + RtlLeaveCriticalSection(&RtlpDphPageHeapListLock); + + if (RtlpDphDebugOptions & DPH_DEBUG_VERBOSE) + { + DPRINT1("Page heap: process 0x%X created heap @ %p (%p, flags 0x%X)\n", + NtCurrentTeb()->ClientId.UniqueProcess, (PUCHAR)DphRoot - PAGE_SIZE, DphRoot->NormalHeap, DphRoot->ExtraFlags); + } + + /* Perform internal validation if required */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + + return (PUCHAR)DphRoot - PAGE_SIZE; } PVOID NTAPI

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011