Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[hbelusca] 63343: [NTVDM]: Improve the dumper a bit.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 17 23:55:14 2014 New Revision: 63343 URL: http://svn.reactos.org/svn/reactos?rev=63343&view=rev Log: [NTVDM]: Improve the dumper a bit. Modified: trunk/reactos/subsystems/ntvdm/emulator.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sat May 17 23:55:14 2014 @@ -400,8 +400,7 @@ i = 0; while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr2) > 0)) { - Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%c", - (*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); + *Line++ = ((*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); ++Ptr2; }

10 years, 7 months

[hbelusca] 63342: [NTVDM] Add a memory dump facility.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 17 23:49:35 2014 New Revision: 63342 URL: http://svn.reactos.org/svn/reactos?rev=63342&view=rev Log: [NTVDM] Add a memory dump facility. Modified: trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/emulator.h trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc trunk/reactos/subsystems/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/ntvdm/lang/en-US.rc trunk/reactos/subsystems/ntvdm/lang/es-ES.rc trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc trunk/reactos/subsystems/ntvdm/lang/it-IT.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/resource.h Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sat May 17 23:49:35 2014 @@ -337,6 +337,87 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +VOID DumpMemory(VOID) +{ + static ULONG DumpNumber = 0; + + HANDLE hFile; + WCHAR FileName[MAX_PATH]; + +#define LINE_SIZE 75 + 2 + ULONG i; + PBYTE Ptr1, Ptr2; + CHAR LineBuffer[LINE_SIZE]; + PCHAR Line; + SIZE_T LineSize; + + /* Build a suitable file name */ + _snwprintf(FileName, MAX_PATH, L"memdump%lu.txt", DumpNumber); + ++DumpNumber; + + /* Always create the dump file */ + hFile = CreateFileW(FileName, + GENERIC_WRITE, + 0, + NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + DPRINT1("Error when creating '%S' for memory dumping, GetLastError() = %u\n", + FileName, GetLastError()); + return; + } + + /* Dump the VM memory */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + Ptr1 = Ptr2 = REAL_TO_PHYS(NULL); + while (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0) + { + Ptr1 = Ptr2; + Line = LineBuffer; + + /* Print the address */ + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%08x ", PHYS_TO_REAL(Ptr1)); + + /* Print up to 16 bytes... */ + + /* ... in hexadecimal form first... */ + i = 0; + while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0)) + { + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, " %02x", *Ptr1); + ++Ptr1; + } + + /* ... align with spaces if needed... */ + RtlFillMemory(Line, 0x0F + 4 - i, ' '); + Line += 0x0F + 4 - i; + + /* ... then in character form. */ + i = 0; + while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr2) > 0)) + { + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%c", + (*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); + ++Ptr2; + } + + /* Newline */ + *Line++ = '\r'; + *Line++ = '\n'; + + /* Finally write the line to the file */ + LineSize = Line - LineBuffer; + WriteFile(hFile, LineBuffer, LineSize, &LineSize, NULL); + } + + /* Close the file */ + CloseHandle(hFile); +} + DWORD WINAPI PumpConsoleInput(LPVOID Parameter); BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) Modified: trunk/reactos/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] Sat May 17 23:49:35 2014 @@ -98,6 +98,8 @@ /* FUNCTIONS ******************************************************************/ +VOID DumpMemory(VOID); + VOID WINAPI EmulatorReadMemory ( PFAST486_STATE State, Modified: trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/cs-C… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -15,5 +15,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "&UkonÄit ReactOS VDM" + IDS_VDM_DUMPMEM, "Dump &Memory" + IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/de-D… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -9,5 +9,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "ReactOS VDM b&eenden" + IDS_VDM_DUMPMEM, "Dump &Memory" + IDS_VDM_QUIT , "ReactOS VDM b&eenden" END Modified: trunk/reactos/subsystems/ntvdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/en-U… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/en-US.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -9,5 +9,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "&Quit the ReactOS VDM" + IDS_VDM_DUMPMEM, "Dump &Memory" + IDS_VDM_QUIT , "&Quit the ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/es-E… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/es-ES.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -9,5 +9,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "&Salir de ReactOS VDM" + IDS_VDM_DUMPMEM, "Dump &Memory" + IDS_VDM_QUIT , "&Salir de ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/fr-F… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -9,5 +9,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "&Quitter la ReactOS VDM" + IDS_VDM_DUMPMEM, "Vidage &MÃ©moire" + IDS_VDM_QUIT , "&Quitter la ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/it-I… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/it-IT.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -9,5 +9,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "&Esci da ReactOS VDM" + IDS_VDM_DUMPMEM, "Dump &Memory" + IDS_VDM_QUIT , "&Esci da ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pl-P… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] Sat May 17 23:49:35 2014 @@ -11,5 +11,6 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "&WyjdÅº z ReactOS VDM" + IDS_VDM_DUMPMEM, "Dump &Memory" + IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat May 17 23:49:35 2014 @@ -51,7 +51,8 @@ static const VDM_MENUITEM VdmMenuItems[] = { - { IDS_VDM_QUIT, NULL, ID_VDM_QUIT }, + { IDS_VDM_DUMPMEM, NULL, ID_VDM_DUMPMEM }, + { IDS_VDM_QUIT , NULL, ID_VDM_QUIT }, { 0, NULL, 0 } /* End of list */ }; @@ -368,6 +369,10 @@ ShowPointer = !ShowPointer; break; + case ID_VDM_DUMPMEM: + DumpMemory(); + break; + case ID_VDM_QUIT: /* Stop the VDM */ EmulatorTerminate(); Modified: trunk/reactos/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/resource.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/resource.h [iso-8859-1] Sat May 17 23:49:35 2014 @@ -1,14 +1,19 @@ #pragma once +/* Menu IDs */ #define ID_SHOWHIDE_MOUSE 1000 -#define ID_VDM_QUIT 1001 +#define ID_VDM_DUMPMEM 1001 +#define ID_VDM_QUIT 1002 +/* String IDs */ #define IDS_HIDE_MOUSE 100 #define IDS_SHOW_MOUSE 101 #define IDS_VDM_MENU 102 -#define IDS_VDM_QUIT 200 +#define IDS_VDM_DUMPMEM 200 +#define IDS_VDM_QUIT 201 +/* Icon */ #define IDI_APPICON 1 /* EOF */

10 years, 7 months

[tkreuzer] 63341: [USER32] Fix sizeof(WCHAR) vs sizeof(CHAR) problem. Patch by Victor Martinez. CORE-8166 #resolve #comment Committed in r63341, thanks.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 17 23:00:34 2014 New Revision: 63341 URL: http://svn.reactos.org/svn/reactos?rev=63341&view=rev Log: [USER32] Fix sizeof(WCHAR) vs sizeof(CHAR) problem. Patch by Victor Martinez. CORE-8166 #resolve #comment Committed in r63341, thanks. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sat May 17 23:00:34 2014 @@ -131,7 +131,7 @@ LPWSTR ptr; size_t i; - RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH * sizeof(WCHAR) ); for (i = 0; i < KEY_LENGTH; ++ i) {

10 years, 7 months

[tkreuzer] 63340: [VGA_NEW] Improve order of check against NULL and assignement. Patch by Victor Martinez. CORE-8121 #resolve #comment Committed in r63340, thanks

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 17 22:55:22 2014 New Revision: 63340 URL: http://svn.reactos.org/svn/reactos?rev=63340&view=rev Log: [VGA_NEW] Improve order of check against NULL and assignement. Patch by Victor Martinez. CORE-8121 #resolve #comment Committed in r63340, thanks Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Sat May 17 22:55:22 2014 @@ -213,8 +213,9 @@ &Length); if (Status != NO_ERROR) return; VbeInfo = VideoPortAllocatePool(VgaExtension, 1, sizeof(VBE_INFO), ' agV'); + if (!VbeInfo) return; + VbeModeInfo = &VbeInfo->Modes; - if (!VbeInfo) return; /* Init VBE data and write to card buffer */ VideoDebugPrint((0, "have int10 data\n"));

10 years, 7 months

[tkreuzer] 63339: [WIN32K] Revert r56462. Should fix some win32k crashes. See CORE-7965

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 17 22:33:42 2014 New Revision: 63339 URL: http://svn.reactos.org/svn/reactos?rev=63339&view=rev Log: [WIN32K] Revert r56462. Should fix some win32k crashes. See CORE-7965 Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sat May 17 22:33:42 2014 @@ -142,7 +142,7 @@ IN OPTIONAL LPBYTE pUnsafeBits) { HBITMAP hbmp; - ULONG cRealBpp, cjWidthBytes, iFormat, fjBitmap; + ULONG cRealBpp, cjWidthBytes, iFormat; ULONGLONG cjSize; PSURFACE psurf; @@ -163,16 +163,13 @@ EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } - - /* Allocations larger than PAGE_SIZE go into user mem */ - fjBitmap = (cjSize > PAGE_SIZE) ? BMF_USERMEM : 0; /* Allocate the surface (but don't set the bits) */ psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat, - fjBitmap, + 0, 0, NULL); if (!psurf)

10 years, 7 months

[tkreuzer] 63338: [NTOSKRNL] Fix Mm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 17 22:30:43 2014 New Revision: 63338 URL: http://svn.reactos.org/svn/reactos?rev=63338&view=rev Log: [NTOSKRNL] Fix Mm Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 17 22:30:43 2014 @@ -4409,13 +4409,18 @@ &StartingAddress); } - if (Result == TableFoundNode) goto FailPath; + if (Result == TableFoundNode) + { + Status = STATUS_NO_MEMORY; + goto FailPath; + } // // Now we know where the allocation ends. Make sure it doesn't end up // somewhere in kernel mode. // - EndingAddress = ((ULONG_PTR)StartingAddress + PRegionSize - 1) | (PAGE_SIZE - 1); + NT_ASSERT(StartingAddress != 0); + EndingAddress = (StartingAddress + PRegionSize - 1) | (PAGE_SIZE - 1); if ((PVOID)EndingAddress > MM_HIGHEST_VAD_ADDRESS) { Status = STATUS_NO_MEMORY;

10 years, 7 months

[aandrejevic] 63337: [NTVDM][KERNEL32][BASESRV] Modify BaseSrvFillCommandInfo to always return the correct lengths of the parameters. In BaseSrvGetNextVDMCommand, check if BaseSrvFillCommandInfo fa...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 17 22:26:37 2014 New Revision: 63337 URL: http://svn.reactos.org/svn/reactos?rev=63337&view=rev Log: [NTVDM][KERNEL32][BASESRV] Modify BaseSrvFillCommandInfo to always return the correct lengths of the parameters. In BaseSrvGetNextVDMCommand, check if BaseSrvFillCommandInfo failed. In CommandThreadProc, expand the size of the environment if necessary. Add a useful DPRINT1 in BiosKbdBufferPush. Finish implementing BaseCreateVDMEnvironment. In GetNextVDMCommand, return the correct lengths of parameters if BaseSrvGetNextVDMCommand failed. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat May 17 22:26:37 2014 @@ -662,7 +662,8 @@ { BOOL Result; ULONG RegionSize, EnvironmentSize = 0; - PWCHAR p, Environment, NewEnvironment = NULL; + PWCHAR SourcePtr, DestPtr, Environment, NewEnvironment = NULL; + WCHAR PathBuffer[MAX_PATH]; NTSTATUS Status; /* Make sure we have both strings */ @@ -695,8 +696,8 @@ } /* Count how much space the whole environment takes */ - p = Environment; - while ((*p++ != UNICODE_NULL) && (*p != UNICODE_NULL)) EnvironmentSize++; + SourcePtr = Environment; + while ((*SourcePtr++ != UNICODE_NULL) && (*SourcePtr != UNICODE_NULL)) EnvironmentSize++; EnvironmentSize += sizeof(UNICODE_NULL); /* Allocate a new copy */ @@ -715,16 +716,73 @@ } /* Begin parsing the new environment */ - p = NewEnvironment; - - /* FIXME: Code here */ - DPRINT1("BaseCreateVDMEnvironment is half-plemented!\n"); + SourcePtr = Environment; + DestPtr = NewEnvironment; + + while (*SourcePtr != UNICODE_NULL) + { + while (*SourcePtr != UNICODE_NULL) + { + if (*SourcePtr == L'=') + { + /* Store the '=' sign */ + *DestPtr++ = *SourcePtr++; + + /* Check if this is likely a full path */ + if (isalphaW(SourcePtr[0]) + && (SourcePtr[1] == L':') + && ((SourcePtr[2] == '\\') || (SourcePtr[2] == '/'))) + { + PWCHAR Delimiter = wcschr(SourcePtr, L';'); + ULONG NumChars; + + if (Delimiter != NULL) + { + wcsncpy(PathBuffer, + SourcePtr, + min(Delimiter - SourcePtr, MAX_PATH)); + + /* Seek to the part after the delimiter */ + SourcePtr = Delimiter + 1; + } + else + { + wcsncpy(PathBuffer, SourcePtr, MAX_PATH); + + /* Seek to the end of the string */ + SourcePtr = wcschr(SourcePtr, UNICODE_NULL); + } + + /* Convert the path into a short path */ + NumChars = GetShortPathNameW(PathBuffer, + DestPtr, + EnvironmentSize - (DestPtr - NewEnvironment)); + if (NumChars) + { + /* + * If it failed, this block won't be executed, so it + * will continue from the character after the '=' sign. + */ + DestPtr += NumChars; + + /* Append the delimiter */ + if (Delimiter != NULL) *DestPtr++ = L';'; + } + } + } + else if (islowerW(*SourcePtr)) *DestPtr++ = toupperW(*SourcePtr++); + else *DestPtr++ = *SourcePtr++; + } + + /* Copy the terminating NULL character */ + *DestPtr++ = *SourcePtr++; + } /* Terminate it */ - *p++ = UNICODE_NULL; + *DestPtr++ = UNICODE_NULL; /* Initialize the unicode string to hold it */ - EnvironmentSize = (p - NewEnvironment) * sizeof(WCHAR); + EnvironmentSize = (DestPtr - NewEnvironment) * sizeof(WCHAR); RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, (USHORT)EnvironmentSize); UnicodeEnv->Length = (USHORT)EnvironmentSize; @@ -1267,6 +1325,16 @@ if (!NT_SUCCESS(Status)) { + /* Store the correct lengths */ + CommandData->CmdLen = GetNextVdmCommand->CmdLen; + CommandData->AppLen = GetNextVdmCommand->AppLen; + CommandData->PifLen = GetNextVdmCommand->PifLen; + CommandData->CurDirectoryLen = GetNextVdmCommand->CurDirectoryLen; + CommandData->EnvLen = GetNextVdmCommand->EnvLen; + CommandData->DesktopLen = GetNextVdmCommand->DesktopLen; + CommandData->TitleLen = GetNextVdmCommand->TitleLen; + CommandData->ReservedLen = GetNextVdmCommand->ReservedLen; + BaseSetLastNTError(Status); goto Cleanup; } Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat May 17 22:26:37 2014 @@ -35,7 +35,11 @@ if (NextElement >= Bda->KeybdBufferEnd) NextElement = Bda->KeybdBufferStart; /* If it's full, fail */ - if (NextElement == Bda->KeybdBufferHead) return FALSE; + if (NextElement == Bda->KeybdBufferHead) + { + DPRINT1("BIOS keyboard buffer full.\n"); + return FALSE; + } /* Put the value in the queue */ *((LPWORD)((ULONG_PTR)Bda + Bda->KeybdBufferTail)) = Data; Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat May 17 22:26:37 2014 @@ -401,9 +401,11 @@ CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; CHAR Title[MAX_PATH]; - CHAR Env[MAX_PATH]; + ULONG EnvSize = 256; + PVOID Env = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); UNREFERENCED_PARAMETER(Parameter); + ASSERT(Env != NULL); do { @@ -424,12 +426,23 @@ CommandInfo.Title = Title; CommandInfo.TitleLen = sizeof(Title); CommandInfo.Env = Env; - CommandInfo.EnvLen = sizeof(Env); + CommandInfo.EnvLen = EnvSize; if (First) CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; - /* Wait for the next available VDM */ - if (!GetNextVDMCommand(&CommandInfo)) break; + if (!GetNextVDMCommand(&CommandInfo)) + { + if (CommandInfo.EnvLen > EnvSize) + { + /* Expand the environment size */ + EnvSize = CommandInfo.EnvLen; + Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); + + continue; + } + + break; + } /* Start the process from the command line */ DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); @@ -445,6 +458,7 @@ } while (AcceptCommands); + HeapFree(GetProcessHeap(), 0, Env); return 0; } #endif Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Sat May 17 22:26:37 2014 @@ -436,6 +436,8 @@ NTSTATUS NTAPI BaseSrvFillCommandInfo(PVDM_COMMAND_INFO CommandInfo, PBASE_GET_NEXT_VDM_COMMAND Message) { + NTSTATUS Status = STATUS_SUCCESS; + /* Copy the data */ Message->iTask = CommandInfo->TaskId; Message->StdIn = CommandInfo->StdIn; @@ -450,46 +452,61 @@ if (CommandInfo->CmdLen && Message->CmdLen) { - if (Message->CmdLen < CommandInfo->CmdLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the command line */ - RtlMoveMemory(Message->CmdLine, CommandInfo->CmdLine, CommandInfo->CmdLen); + if (Message->CmdLen >= CommandInfo->CmdLen) + { + /* Copy the command line */ + RtlMoveMemory(Message->CmdLine, CommandInfo->CmdLine, CommandInfo->CmdLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->CmdLen = CommandInfo->CmdLen; } if (CommandInfo->AppLen && Message->AppLen) { - if (Message->AppLen < CommandInfo->CmdLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the application name */ - RtlMoveMemory(Message->AppName, CommandInfo->AppName, CommandInfo->AppLen); + if (Message->AppLen >= CommandInfo->AppLen) + { + /* Copy the application name */ + RtlMoveMemory(Message->AppName, CommandInfo->AppName, CommandInfo->AppLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->AppLen = CommandInfo->AppLen; } if (CommandInfo->PifLen && Message->PifLen) { - if (Message->PifLen < CommandInfo->PifLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the PIF file name */ - RtlMoveMemory(Message->PifFile, CommandInfo->PifFile, CommandInfo->PifLen); + if (Message->PifLen >= CommandInfo->PifLen) + { + /* Copy the PIF file name */ + RtlMoveMemory(Message->PifFile, CommandInfo->PifFile, CommandInfo->PifLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->PifLen = CommandInfo->PifLen; } if (CommandInfo->CurDirectoryLen && Message->CurDirectoryLen) { - if (Message->CurDirectoryLen < CommandInfo->CurDirectoryLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the current directory */ - RtlMoveMemory(Message->CurDirectory, CommandInfo->CurDirectory, CommandInfo->CurDirectoryLen); + if (Message->CurDirectoryLen >= CommandInfo->CurDirectoryLen) + { + /* Copy the current directory */ + RtlMoveMemory(Message->CurDirectory, CommandInfo->CurDirectory, CommandInfo->CurDirectoryLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->CurDirectoryLen = CommandInfo->CurDirectoryLen; } if (CommandInfo->EnvLen && Message->EnvLen) { - if (Message->EnvLen < CommandInfo->EnvLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the environment */ - RtlMoveMemory(Message->Env, CommandInfo->Env, CommandInfo->EnvLen); + if (Message->EnvLen >= CommandInfo->EnvLen) + { + /* Copy the environment */ + RtlMoveMemory(Message->Env, CommandInfo->Env, CommandInfo->EnvLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->EnvLen = CommandInfo->EnvLen; } @@ -500,32 +517,41 @@ if (CommandInfo->DesktopLen && Message->DesktopLen) { - if (Message->DesktopLen < CommandInfo->DesktopLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the desktop name */ - RtlMoveMemory(Message->Desktop, CommandInfo->Desktop, CommandInfo->DesktopLen); + if (Message->DesktopLen >= CommandInfo->DesktopLen) + { + /* Copy the desktop name */ + RtlMoveMemory(Message->Desktop, CommandInfo->Desktop, CommandInfo->DesktopLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->DesktopLen = CommandInfo->DesktopLen; } if (CommandInfo->TitleLen && Message->TitleLen) { - if (Message->TitleLen < CommandInfo->TitleLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the title */ - RtlMoveMemory(Message->Title, CommandInfo->Title, CommandInfo->TitleLen); + if (Message->TitleLen >= CommandInfo->TitleLen) + { + /* Copy the title */ + RtlMoveMemory(Message->Title, CommandInfo->Title, CommandInfo->TitleLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->TitleLen = CommandInfo->TitleLen; } if (CommandInfo->ReservedLen && Message->ReservedLen) { - if (Message->ReservedLen < CommandInfo->ReservedLen) return STATUS_BUFFER_TOO_SMALL; - - /* Copy the reserved parameter */ - RtlMoveMemory(Message->Reserved, CommandInfo->Reserved, CommandInfo->ReservedLen); + if (Message->ReservedLen >= CommandInfo->ReservedLen) + { + /* Copy the reserved parameter */ + RtlMoveMemory(Message->Reserved, CommandInfo->Reserved, CommandInfo->ReservedLen); + } + else Status = STATUS_BUFFER_TOO_SMALL; + Message->ReservedLen = CommandInfo->ReservedLen; } - return STATUS_SUCCESS; + return Status; } VOID NTAPI BaseInitializeVDM(VOID) @@ -1017,6 +1043,7 @@ { /* Fill the command information */ Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest); + if (!NT_SUCCESS(Status)) goto Cleanup; /* Free the command information, it's no longer needed */ BaseSrvFreeVDMInfo(DosRecord->CommandInfo);

10 years, 7 months

[tkreuzer] 63336: [NTOSKRNL] Modify the VAD node code to return a TABLE_SEARCH_RESULT instead of an NTSTATUS, this allows us to avoid a 2nd tree iteration when inserting VADs. Fix several bugs in M...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 17 20:34:11 2014 New Revision: 63336 URL: http://svn.reactos.org/svn/reactos?rev=63336&view=rev Log: [NTOSKRNL] Modify the VAD node code to return a TABLE_SEARCH_RESULT instead of an NTSTATUS, this allows us to avoid a 2nd tree iteration when inserting VADs. Fix several bugs in MiFindEmptyAddressRangeDownBasedTree. This code now contains a compatibility hack, that emulates a bug in the Windows 2003 kernel. Note that this bug is also present in MiFindEmptyAddressRangeDownTree on Windows 2003, but will not be exposed to the user, since it only affects the region above the top-most VAD, which will always be occupied by the PEB or TEB. Implement MEM_TOPDOWN in NtAllocateVirtualMemory. See CORE-6392 Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat May 17 20:34:11 2014 @@ -2093,12 +2093,13 @@ IN PVOID VirtualAddress ); -PMMADDRESS_NODE +TABLE_SEARCH_RESULT NTAPI MiCheckForConflictingNode( IN ULONG_PTR StartVpn, IN ULONG_PTR EndVpn, - IN PMM_AVL_TABLE Table + IN PMM_AVL_TABLE Table, + OUT PMMADDRESS_NODE *NodeOrParent ); TABLE_SEARCH_RESULT @@ -2122,7 +2123,7 @@ OUT PULONG_PTR Base ); -NTSTATUS +TABLE_SEARCH_RESULT NTAPI MiFindEmptyAddressRangeInTree( IN SIZE_T Length, Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat May 17 20:34:11 2014 @@ -110,7 +110,7 @@ { /* For TEBs, or if a PEB location couldn't be found, scan the VAD root */ Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), - (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1, + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, PAGE_SIZE, &Process->VadRoot, Base, Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat May 17 20:34:11 2014 @@ -1214,6 +1214,8 @@ ULONG QuotaCharge = 0, QuotaExcess = 0; PMMPTE PointerPte, LastPte; MMPTE TempPte; + PMMADDRESS_NODE Parent; + TABLE_SEARCH_RESULT Result; /* Get the segment for this section */ Segment = ControlArea->Segment; @@ -1302,23 +1304,29 @@ if (AllocationType & MEM_TOP_DOWN) { /* No, find an address top-down */ - Status = MiFindEmptyAddressRangeDownTree(*ViewSize, + Result = MiFindEmptyAddressRangeDownTree(*ViewSize, (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, _64K, &Process->VadRoot, &StartAddress, - (PMMADDRESS_NODE*)&Process->VadFreeHint); - ASSERT(NT_SUCCESS(Status)); + &Parent); } else { /* No, find an address bottom-up */ - Status = MiFindEmptyAddressRangeInTree(*ViewSize, + Result = MiFindEmptyAddressRangeInTree(*ViewSize, _64K, &Process->VadRoot, - (PMMADDRESS_NODE*)&Process->VadFreeHint, + &Parent, &StartAddress); - ASSERT(NT_SUCCESS(Status)); + } + + /* Check if we found a suitable location */ + if (Result == TableFoundNode) + { + DPRINT1("Not enough free space to insert this section!\n"); + MiDereferenceControlArea(ControlArea); + return STATUS_CONFLICTING_ADDRESSES; } /* Get the ending address, which is the last piece we need for the VAD */ @@ -1343,9 +1351,11 @@ EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); /* Make sure it doesn't conflict with an existing allocation */ - if (MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot)) + Result = MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + &Parent); + if (Result == TableFoundNode) { DPRINT1("Conflict with SEC_BASED or manually based section!\n"); MiDereferenceControlArea(ControlArea); @@ -1395,7 +1405,8 @@ MiLockProcessWorkingSetUnsafe(Process, Thread); /* Insert the VAD */ - MiInsertVad((PMMVAD)Vad, Process); + Process->VadRoot.NodeHint = Vad; + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); /* Release the working set */ MiUnlockProcessWorkingSetUnsafe(Process, Thread); Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Sat May 17 20:34:11 2014 @@ -73,22 +73,25 @@ return FoundVad; } -PMMADDRESS_NODE +TABLE_SEARCH_RESULT NTAPI MiCheckForConflictingNode(IN ULONG_PTR StartVpn, IN ULONG_PTR EndVpn, - IN PMM_AVL_TABLE Table) -{ - PMMADDRESS_NODE CurrentNode; + IN PMM_AVL_TABLE Table, + OUT PMMADDRESS_NODE *NodeOrParent) +{ + PMMADDRESS_NODE ParentNode, CurrentNode; /* If the tree is empty, there is no conflict */ - if (!Table->NumberGenericTableElements) return NULL; - - /* Start looping from the right */ + if (Table->NumberGenericTableElements == 0) return TableEmptyTree; + + /* Start looping from the root node */ CurrentNode = RtlRightChildAvl(&Table->BalancedRoot); ASSERT(CurrentNode != NULL); while (CurrentNode) { + ParentNode = CurrentNode; + /* This address comes after */ if (StartVpn > CurrentNode->EndingVpn) { @@ -103,12 +106,21 @@ else { /* This address is part of this node, return it */ - break; - } - } - - /* Return either the conflicting node, or no node at all */ - return CurrentNode; + *NodeOrParent = ParentNode; + return TableFoundNode; + } + } + + /* There is no more child, save the current node as parent */ + *NodeOrParent = ParentNode; + if (StartVpn > ParentNode->EndingVpn) + { + return TableInsertAsRight; + } + else + { + return TableInsertAsLeft; + } } VOID @@ -338,7 +350,7 @@ return NULL; } -NTSTATUS +TABLE_SEARCH_RESULT NTAPI MiFindEmptyAddressRangeInTree(IN SIZE_T Length, IN ULONG_PTR Alignment, @@ -346,67 +358,78 @@ OUT PMMADDRESS_NODE *PreviousVad, OUT PULONG_PTR Base) { - PMMADDRESS_NODE Node; - PMMADDRESS_NODE NextNode; - ULONG_PTR StartingVpn, HighestVpn, AlignmentVpn, LengthVpn, LowVpn; + PMMADDRESS_NODE Node, PreviousNode; + ULONG_PTR PageCount, AlignmentVpn, LowVpn, HighVpn; ASSERT(Length != 0); - /* Precompute page numbers for the length, alignment, and starting address */ - LengthVpn = (Length + (PAGE_SIZE - 1)) >> PAGE_SHIFT; + /* Calculate page numbers for the length, alignment, and starting address */ + PageCount = BYTES_TO_PAGES(Length); AlignmentVpn = Alignment >> PAGE_SHIFT; - StartingVpn = ROUND_UP((ULONG_PTR)MM_LOWEST_USER_ADDRESS >> PAGE_SHIFT, - AlignmentVpn); - - /* Check if the table is free, so the lowest possible address is available */ - if (!Table->NumberGenericTableElements) goto FoundAtBottom; + LowVpn = ALIGN_UP_BY((ULONG_PTR)MM_LOWEST_USER_ADDRESS >> PAGE_SHIFT, AlignmentVpn); + + /* Check if the table is empty */ + if (Table->NumberGenericTableElements == 0) + { + /* Tree is empty, the candidate address is already the best one */ + *Base = LowVpn << PAGE_SHIFT; + return TableEmptyTree; + } /* Otherwise, follow the leftmost child of the right root node's child */ Node = RtlRightChildAvl(&Table->BalancedRoot); while (RtlLeftChildAvl(Node)) Node = RtlLeftChildAvl(Node); - /* This is the node for the remaining gap at the bottom, can it be used? */ - if ((Node->StartingVpn > StartingVpn) && - (LengthVpn < Node->StartingVpn - StartingVpn)) - { -FoundAtBottom: - /* Use this VAD to store the allocation */ - *PreviousVad = NULL; - *Base = StartingVpn << PAGE_SHIFT; - return STATUS_SUCCESS; - } - - /* Otherwise, we start a search to find a gap */ - while (TRUE) - { - /* The last aligned page number in this entry */ - LowVpn = ROUND_UP(Node->EndingVpn + 1, AlignmentVpn); - - /* Keep going as long as there's still a next node */ - NextNode = MiGetNextNode(Node); - if (!NextNode) break; - - /* Can this allocation fit in this node? */ - if ((LengthVpn <= (NextNode->StartingVpn - LowVpn)) && - (NextNode->StartingVpn > LowVpn)) - { -Found: - /* Yes! Use this VAD to store the allocation */ - *PreviousVad = Node; - *Base = ROUND_UP((Node->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1), - Alignment); - return STATUS_SUCCESS; - } - - /* Try the next node */ - Node = NextNode; - } - - /* We're down to the last (top) VAD, will this allocation fit inside it? */ - HighestVpn = ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) >> PAGE_SHIFT; - if ((HighestVpn > LowVpn) && (LengthVpn <= HighestVpn - LowVpn)) goto Found; + /* Start a search to find a gap */ + PreviousNode = NULL; + while (Node != NULL) + { + /* Check if the gap below the current node is suitable */ + if (Node->StartingVpn >= LowVpn + PageCount) + { + /* There is enough space to add our node */ + *Base = LowVpn << PAGE_SHIFT; + + /* Can we use the current node as parent? */ + if (RtlLeftChildAvl(Node) == NULL) + { + /* Node has no left child, so use it as parent */ + *PreviousVad = Node; + return TableInsertAsLeft; + } + else + { + /* Node has a left child, this means that the previous node is + the right-most child of it's left child and can be used as + the parent. In case we use the space before the left-most + node, it's left child must be NULL. */ + ASSERT(PreviousNode != NULL); + ASSERT(RtlRightChildAvl(PreviousNode) == NULL); + *PreviousVad = PreviousNode; + return TableInsertAsRight; + } + } + + /* The next candidate is above the current node */ + if (Node->EndingVpn >= LowVpn) + LowVpn = ALIGN_UP_BY(Node->EndingVpn + 1, AlignmentVpn); + + /* Remember the current node and go to the next node */ + PreviousNode = Node; + Node = MiGetNextNode(Node); + } + + /* We're up to the highest VAD, will this allocation fit above it? */ + HighVpn = ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) / PAGE_SIZE; + if (HighVpn >= LowVpn + PageCount) + { + /* Yes! Use this VAD to store the allocation */ + *PreviousVad = PreviousNode; + *Base = LowVpn << PAGE_SHIFT; + return TableInsertAsRight; + } /* Nyet, there's no free address space for this allocation, so we'll fail */ - return STATUS_NO_MEMORY; + return TableFoundNode; } TABLE_SEARCH_RESULT @@ -418,55 +441,59 @@ OUT PULONG_PTR Base, OUT PMMADDRESS_NODE *Parent) { - PMMADDRESS_NODE Node, LowestNode, Child; - ULONG_PTR LowVpn, HighVpn; + PMMADDRESS_NODE Node, OldNode, Child; + ULONG_PTR LowVpn, HighVpn, AlignmentVpn; PFN_NUMBER PageCount; /* Sanity checks */ ASSERT(BoundaryAddress); - ASSERT(BoundaryAddress <= ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - - /* Compute page length, make sure the boundary address is valid */ + ASSERT(BoundaryAddress <= ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS)); + ASSERT((Alignment & (PAGE_SIZE - 1)) == 0); + + /* Calculate page numbers for the length and alignment */ Length = ROUND_TO_PAGES(Length); PageCount = Length >> PAGE_SHIFT; - if ((BoundaryAddress + 1) < Length) return TableFoundNode; + AlignmentVpn = Alignment / PAGE_SIZE; + + /* Check if there is enough space below the boundary */ + if ((ALIGN_UP_BY((ULONG_PTR)MM_LOWEST_USER_ADDRESS, Alignment) + Length) > + (BoundaryAddress + 1)) + { + return TableFoundNode; + } /* Check if the table is empty */ if (Table->NumberGenericTableElements == 0) { /* Tree is empty, the candidate address is already the best one */ - *Base = ROUND_UP(BoundaryAddress + 1 - Length, Alignment); + *Base = ALIGN_DOWN_BY(BoundaryAddress + 1 - Length, Alignment); return TableEmptyTree; } /* Calculate the initial upper margin */ - HighVpn = BoundaryAddress >> PAGE_SHIFT; - - /* Starting from the root, go down until the right-most child - * which is just behind the boundary*/ - LowestNode = Node = RtlRightChildAvl(&Table->BalancedRoot); - while (((Child = RtlRightChildAvl(Node)) != 0 ) - && (Node->EndingVpn < HighVpn )) Node = Child; + HighVpn = (BoundaryAddress + 1) >> PAGE_SHIFT; + + /* Starting from the root, follow the right children until we found a node + that ends above the boundary */ + Node = RtlRightChildAvl(&Table->BalancedRoot); + while ((Node->EndingVpn < HighVpn) && + ((Child = RtlRightChildAvl(Node)) != NULL)) Node = Child; /* Now loop the Vad nodes */ while (Node) { - /* Keep track of the lowest node */ - LowestNode = Node; - /* Calculate the lower margin */ - LowVpn = ROUND_UP(Node->EndingVpn + 1, Alignment >> PAGE_SHIFT); + LowVpn = ALIGN_UP_BY(Node->EndingVpn + 1, AlignmentVpn); /* Check if the current bounds are suitable */ if ((HighVpn > LowVpn) && ((HighVpn - LowVpn) >= PageCount)) { /* There is enough space to add our node */ - LowVpn = HighVpn - PageCount; + LowVpn = ALIGN_DOWN_BY(HighVpn - PageCount, AlignmentVpn); *Base = LowVpn << PAGE_SHIFT; /* Can we use the current node as parent? */ - Child = RtlRightChildAvl(Node); - if (!Child) + if (!RtlRightChildAvl(Node)) { /* Node has no right child, so use it as parent */ *Parent = Node; @@ -474,29 +501,29 @@ } else { - /* Node has a right child, find most left grand child */ - Node = Child; - while ((Child = RtlLeftChildAvl(Node))) Node = Child; - *Parent = Node; + /* Node has a right child, the node we had before is the most + left grandchild of that right child, use it as parent. */ + *Parent = OldNode; return TableInsertAsLeft; } } - /* Update the upper margin if neccessary */ + /* Update the upper margin if necessary */ if (Node->StartingVpn < HighVpn) HighVpn = Node->StartingVpn; - /* Go to the next lower node */ + /* Remember the current node and go to the previous node */ + OldNode = Node; Node = MiGetPreviousNode(Node); } /* Check if there's enough space before the lowest Vad */ - LowVpn = ROUND_UP((ULONG_PTR)MI_LOWEST_VAD_ADDRESS, Alignment) >> PAGE_SHIFT; + LowVpn = ALIGN_UP_BY((ULONG_PTR)MI_LOWEST_VAD_ADDRESS, Alignment) / PAGE_SIZE; if ((HighVpn > LowVpn) && ((HighVpn - LowVpn) >= PageCount)) { /* There is enough space to add our address */ - LowVpn = HighVpn - PageCount; + LowVpn = ALIGN_DOWN_BY(HighVpn - PageCount, Alignment >> PAGE_SHIFT); *Base = LowVpn << PAGE_SHIFT; - *Parent = LowestNode; + *Parent = OldNode; return TableInsertAsLeft; } @@ -527,7 +554,7 @@ if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; /* Check if the table is empty */ - BestVpn = ROUND_UP(BoundaryAddress + 1 - Length, Alignment); + BestVpn = ROUND_DOWN(BoundaryAddress + 1 - Length, Alignment); if (Table->NumberGenericTableElements == 0) { /* Tree is empty, the candidate address is already the best one */ @@ -540,11 +567,18 @@ while (RtlRightChildAvl(Node)) Node = RtlRightChildAvl(Node); /* Check if we can fit in here */ - LowVpn = ROUND_UP(Node->EndingVpn, Alignment); - if ((LowVpn < BoundaryAddress) && (Length < (BoundaryAddress - LowVpn))) - { - /* Return the address */ - *Base = ROUND_UP(BoundaryAddress - Length, Alignment); + LowVpn = ROUND_UP(Node->EndingVpn + 1, Alignment); + if ((LowVpn < BoundaryAddress) && (Length <= (BoundaryAddress - LowVpn))) + { +#if (NTDDI_VERSION >= NTDDI_VISTA) + /* Return the address. */ + *Base = BestVpn; +#else + /* Note: this is a compatibility hack that mimics a bug in the 2k3 + kernel. It will can waste up to Alignment bytes of memory above + the allocation. This bug was fixed in Windows Vista */ + *Base = ROUND_DOWN(BoundaryAddress - Length, Alignment); +#endif return STATUS_SUCCESS; } @@ -558,22 +592,20 @@ /* Check if this node could contain the requested address */ LowVpn = ROUND_UP(LowestNode->EndingVpn + 1, Alignment); if ((LowestNode->EndingVpn < BestVpn) && + (LowVpn < Node->StartingVpn) && (Length <= (Node->StartingVpn - LowVpn))) { - /* Check if it fits in perfectly */ - if ((BestVpn > LowestNode->EndingVpn) && - (BoundaryAddress < Node->StartingVpn)) + /* Check if we need to take BoundaryAddress into account */ + if (BoundaryAddress < Node->StartingVpn) { /* Return the optimal VPN address */ *Base = BestVpn; return STATUS_SUCCESS; } - - /* It doesn't, check if it can partly fit */ - if (Node->StartingVpn > LowVpn) - { - /* Return an aligned base address within this node */ - *Base = ROUND_UP(Node->StartingVpn - Length, Alignment); + else + { + /* The upper margin is given by the Node's starting address */ + *Base = ROUND_DOWN(Node->StartingVpn - Length, Alignment); return STATUS_SUCCESS; } } @@ -584,7 +616,7 @@ /* Check if there's enough space before the lowest Vad */ if ((Node->StartingVpn > (ULONG_PTR)MI_LOWEST_VAD_ADDRESS) && - ((Node->StartingVpn - (ULONG_PTR)MI_LOWEST_VAD_ADDRESS) > Length)) + ((Node->StartingVpn - (ULONG_PTR)MI_LOWEST_VAD_ADDRESS) >= Length)) { /* Check if it fits in perfectly */ if (BoundaryAddress < Node->StartingVpn) @@ -595,7 +627,7 @@ } /* Return an aligned base address within this node */ - *Base = ROUND_UP(Node->StartingVpn - Length, Alignment); + *Base = ROUND_DOWN(Node->StartingVpn - Length, Alignment); return STATUS_SUCCESS; } @@ -669,3 +701,4 @@ } /* EOF */ + Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 17 20:34:11 2014 @@ -1903,6 +1903,7 @@ BOOLEAN Committed; NTSTATUS Status = STATUS_SUCCESS; PETHREAD Thread = PsGetCurrentThread(); + TABLE_SEARCH_RESULT Result; /* Calculate base address for the VAD */ StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); @@ -1939,10 +1940,11 @@ } /* Get the VAD for this address range, and make sure it exists */ - Vad = (PMMVAD)MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot); - if (!Vad) + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + (PMMADDRESS_NODE*)&Vad); + if (Result != TableFoundNode) { DPRINT("Could not find a VAD for this allocation\n"); Status = STATUS_CONFLICTING_ADDRESSES; @@ -4099,6 +4101,8 @@ BOOLEAN Attached = FALSE, ChangeProtection = FALSE; MMPTE TempPte; PMMPTE PointerPte, PointerPde, LastPte; + TABLE_SEARCH_RESULT Result; + PMMADDRESS_NODE Parent; PAGED_CODE(); /* Check for valid Zero bits */ @@ -4384,12 +4388,28 @@ // if (!PBaseAddress) { - Status = MiFindEmptyAddressRangeInTree(PRegionSize, - _64K, - &Process->VadRoot, - (PMMADDRESS_NODE*)&Process->VadFreeHint, - &StartingAddress); - if (!NT_SUCCESS(Status)) goto FailPath; + /* Which way should we search? */ + if (AllocationType & MEM_TOP_DOWN) + { + /* Find an address top-down */ + Result = MiFindEmptyAddressRangeDownTree(PRegionSize, + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, + _64K, + &Process->VadRoot, + &StartingAddress, + &Parent); + } + else + { + /* Find an address bottom-up */ + Result = MiFindEmptyAddressRangeInTree(PRegionSize, + _64K, + &Process->VadRoot, + &Parent, + &StartingAddress); + } + + if (Result == TableFoundNode) goto FailPath; // // Now we know where the allocation ends. Make sure it doesn't end up @@ -4402,15 +4422,21 @@ goto FailPath; } } - else if (MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot)) - { - // - // The address specified is in conflict! - // - Status = STATUS_CONFLICTING_ADDRESSES; - goto FailPath; + else + { + /* Make sure it doesn't conflict with an existing allocation */ + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + &Parent); + if (Result == TableFoundNode) + { + // + // The address specified is in conflict! + // + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } } // @@ -4429,7 +4455,8 @@ // MiLockProcessWorkingSetUnsafe(Process, CurrentThread); Vad->ControlArea = NULL; // For Memory-Area hack - MiInsertVad(Vad, Process); + Process->VadRoot.NodeHint = Vad; + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); // @@ -4495,10 +4522,11 @@ // // Get the VAD for this address range, and make sure it exists // - FoundVad = (PMMVAD)MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot); - if (!FoundVad) + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + (PMMADDRESS_NODE*)&FoundVad); + if (Result != TableFoundNode) { DPRINT1("Could not find a VAD for this allocation\n"); Status = STATUS_CONFLICTING_ADDRESSES;

10 years, 7 months

[akhaldi] 63335: [FREETYPE] * Update to 2.5.3. Based on the sync done by Ivan Di Francesco. CORE-8033

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 17 18:52:24 2014 New Revision: 63335 URL: http://svn.reactos.org/svn/reactos?rev=63335&view=rev Log: [FREETYPE] * Update to 2.5.3. Based on the sync done by Ivan Di Francesco. CORE-8033 Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcover.h (with props) trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.c (with props) trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.h (with props) trunk/reactos/lib/3rdparty/freetype/src/autofit/afstyles.h (with props) trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.c (with props) trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.h (with props) Removed: trunk/reactos/lib/3rdparty/freetype/src/autofit/module.mk trunk/reactos/lib/3rdparty/freetype/src/autofit/rules.mk trunk/reactos/lib/3rdparty/freetype/src/base/rules.mk trunk/reactos/lib/3rdparty/freetype/src/bdf/module.mk trunk/reactos/lib/3rdparty/freetype/src/bdf/rules.mk trunk/reactos/lib/3rdparty/freetype/src/bzip2/rules.mk trunk/reactos/lib/3rdparty/freetype/src/cache/rules.mk trunk/reactos/lib/3rdparty/freetype/src/cff/module.mk trunk/reactos/lib/3rdparty/freetype/src/cff/rules.mk trunk/reactos/lib/3rdparty/freetype/src/cid/module.mk trunk/reactos/lib/3rdparty/freetype/src/cid/rules.mk trunk/reactos/lib/3rdparty/freetype/src/gxvalid/module.mk trunk/reactos/lib/3rdparty/freetype/src/gxvalid/rules.mk trunk/reactos/lib/3rdparty/freetype/src/gzip/rules.mk trunk/reactos/lib/3rdparty/freetype/src/lzw/rules.mk trunk/reactos/lib/3rdparty/freetype/src/otvalid/module.mk trunk/reactos/lib/3rdparty/freetype/src/otvalid/rules.mk trunk/reactos/lib/3rdparty/freetype/src/pcf/module.mk trunk/reactos/lib/3rdparty/freetype/src/pcf/rules.mk trunk/reactos/lib/3rdparty/freetype/src/pfr/module.mk trunk/reactos/lib/3rdparty/freetype/src/pfr/rules.mk trunk/reactos/lib/3rdparty/freetype/src/psaux/module.mk trunk/reactos/lib/3rdparty/freetype/src/psaux/rules.mk trunk/reactos/lib/3rdparty/freetype/src/pshinter/module.mk trunk/reactos/lib/3rdparty/freetype/src/pshinter/rules.mk trunk/reactos/lib/3rdparty/freetype/src/psnames/module.mk trunk/reactos/lib/3rdparty/freetype/src/psnames/rules.mk trunk/reactos/lib/3rdparty/freetype/src/raster/module.mk trunk/reactos/lib/3rdparty/freetype/src/raster/rules.mk trunk/reactos/lib/3rdparty/freetype/src/sfnt/module.mk trunk/reactos/lib/3rdparty/freetype/src/sfnt/rules.mk trunk/reactos/lib/3rdparty/freetype/src/smooth/module.mk trunk/reactos/lib/3rdparty/freetype/src/smooth/rules.mk trunk/reactos/lib/3rdparty/freetype/src/truetype/module.mk trunk/reactos/lib/3rdparty/freetype/src/truetype/rules.mk trunk/reactos/lib/3rdparty/freetype/src/type1/module.mk trunk/reactos/lib/3rdparty/freetype/src/type1/rules.mk trunk/reactos/lib/3rdparty/freetype/src/type42/module.mk trunk/reactos/lib/3rdparty/freetype/src/type42/rules.mk trunk/reactos/lib/3rdparty/freetype/src/winfonts/module.mk trunk/reactos/lib/3rdparty/freetype/src/winfonts/rules.mk Modified: trunk/reactos/lib/3rdparty/freetype/ChangeLog trunk/reactos/lib/3rdparty/freetype/README trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h trunk/reactos/lib/3rdparty/freetype/include/config/ftoption.h trunk/reactos/lib/3rdparty/freetype/include/freetype.h trunk/reactos/lib/3rdparty/freetype/include/ftautoh.h trunk/reactos/lib/3rdparty/freetype/include/ftbdf.h trunk/reactos/lib/3rdparty/freetype/include/ftchapters.h trunk/reactos/lib/3rdparty/freetype/include/ftoutln.h trunk/reactos/lib/3rdparty/freetype/include/internal/ftrfork.h trunk/reactos/lib/3rdparty/freetype/include/internal/fttrace.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.cin trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.hin trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afdummy.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afdummy.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afindic.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afindic.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afpic.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afpic.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afscript.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aftypes.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afwrtsys.h trunk/reactos/lib/3rdparty/freetype/src/autofit/autofit.c trunk/reactos/lib/3rdparty/freetype/src/base/basepic.c trunk/reactos/lib/3rdparty/freetype/src/base/ftbitmap.c trunk/reactos/lib/3rdparty/freetype/src/base/ftcalc.c trunk/reactos/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/lib/3rdparty/freetype/src/base/ftoutln.c trunk/reactos/lib/3rdparty/freetype/src/base/ftrfork.c trunk/reactos/lib/3rdparty/freetype/src/bdf/bdfdrivr.c trunk/reactos/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2blues.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2font.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2hints.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffload.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffobjs.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffparse.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidload.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidobjs.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidparse.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidparse.h trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/lib/3rdparty/freetype/src/psaux/psobjs.c trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshalgo.c trunk/reactos/lib/3rdparty/freetype/src/raster/ftraster.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfdriver.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttsbit.c trunk/reactos/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/lib/3rdparty/freetype/src/tools/afblue.pl trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.h trunk/reactos/lib/3rdparty/freetype/src/type1/t1gload.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1objs.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1parse.c trunk/reactos/lib/3rdparty/freetype/src/type42/t42objs.c trunk/reactos/lib/3rdparty/freetype/src/type42/t42parse.c trunk/reactos/lib/3rdparty/freetype/src/winfonts/winfnt.c trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/Chan… Modified: trunk/reactos/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/READ… Modified: trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/deve… Modified: trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftautoh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftbdf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftchapters.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftoutln.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/ftrfork.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/fttrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.cin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.hin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcover.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afdummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afdummy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afindic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afindic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afpic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afpic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/afstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afwrtsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/autofit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Added: trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/autofit/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/autofit/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/basepic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/base/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/bdf/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/bdf/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/bzip2/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/cache/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2blues.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/cff/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/cff/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/cid/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/cid/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/gzip/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/lzw/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/otvalid/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/otvalid/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/pcf/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/pcf/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/pfr/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/pfr/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/psaux/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/psaux/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/pshinter/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshalgo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/pshinter/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/psnames/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/psnames/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/raster/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/raster/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/sfnt/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/sfnt/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/smooth/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/smooth/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/afblue.pl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/truetype/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/truetype/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/type1/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/type1/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1gload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/type42/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/type42/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/winfonts/module.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Removed: trunk/reactos/lib/3rdparty/freetype/src/winfonts/rules.mk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

10 years, 7 months

[tkreuzer] 63334: [TESTDATA] Fix test.dll

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 17 18:36:22 2014 New Revision: 63334 URL: http://svn.reactos.org/svn/reactos?rev=63334&view=rev Log: [TESTDATA] Fix test.dll Modified: trunk/rostests/apitests/testdata/test.dll Modified: trunk/rostests/apitests/testdata/test.dll URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.dl… ============================================================================== Binary files - no diff available.

10 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014