Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16681: fix a small bug, write out time like HH:MM:SS, ms as ms cmd does.

by greatlrd＠svn.reactos.com

fix a small bug, write out time like HH:MM:SS,ms as ms cmd does. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-21 15:46:07 UTC (rev 16680) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-21 16:28:20 UTC (rev 16681) @@ -1035,8 +1035,11 @@ /* %TIME% */ else if (_tcsicmp(ip,_T("time")) ==0) { - TCHAR szTime[40]; - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof(szTime)); + TCHAR szTime[40]; + SYSTEMTIME t; + GetSystemTime(&t); + + _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); cp = _stpcpy (cp, szTime); } _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-07-21 15:46:07 UTC (rev 16680) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-07-21 16:28:20 UTC (rev 16681) @@ -70,12 +70,12 @@ VOID PrintTime (VOID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szTime[32]; - - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, - szTime, sizeof(szTime)); - + TCHAR szMsg[RC_STRING_MAX_SIZE]; + SYSTEMTIME t; + GetSystemTime(&t); + LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(_T("%s: %s\n"), szMsg, szTime); + ConOutPrintf(_T("%s: %02d%c%02d%c%02d%c%02d\n"), szMsg, t.wHour, cTimeSeparator, + t.wMinute , cTimeSeparator, + t.wSecond , cDecimalSeparator, t.wMilliseconds ); } _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-07-21 15:46:07 UTC (rev 16680) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-07-21 16:28:20 UTC (rev 16681) @@ -138,10 +138,11 @@ break; case _T('T'): - { - TCHAR szTime[32]; - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,szTime, sizeof(szTime)); - ConOutPrintf("%s",szTime); + { + SYSTEMTIME t; + GetSystemTime(&t); + ConOutPrintf(_T("%02d%c%02d%c%02d%c%02d\n"),t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator, + t.wSecond , cDecimalSeparator, t.wMilliseconds ); } break;

19 years, 6 months

[hbirr] 16680: Set MmUserProbeAddress and MmHighestUserAddress according to the system range start.

by hbirr＠svn.reactos.com

Set MmUserProbeAddress and MmHighestUserAddress according to the system range start. Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-07-21 14:15:42 UTC (rev 16679) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-07-21 15:46:07 UTC (rev 16680) @@ -321,8 +321,8 @@ } /* Set memory limits */ - MmUserProbeAddress = 0x7fff0000; - MmHighestUserAddress = (PVOID)0x7ffeffff; + MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; + MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); /* * Initialize memory managment statistics

19 years, 6 months

[greatlrd] 16679: Fix copy /B filename + , , bug (touch) and fix whitespace for copy /B file + file + file2

by greatlrd＠svn.reactos.com

Fix copy /B filename + , , bug (touch) and fix whitespace for copy /B file + file + file2 by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-21 13:55:36 UTC (rev 16678) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-21 14:15:42 UTC (rev 16679) @@ -518,9 +518,21 @@ { /*if it isnt a switch then it is the source or destination*/ if(nSrc == -1) + { nSrc = i; + } + else if(*arg[i] == _T('+') || *arg[i] == _T(',')) + { + /* Add these onto the source string + this way we can do all checks + directly on source string later on */ + _tcscat(arg[nSrc],arg[i]); + nFiles--; + } else if(nDes == -1) + { nDes = i; + } } } @@ -842,8 +854,10 @@ LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, nFiles); - CloseHandle(hFile); - freep (arg); + CloseHandle(hFile); + if (arg!=NULL) + free(arg); + return 0; }

19 years, 6 months

[greatlrd] 16678: Update with right reactos logo by mf

by greatlrd＠svn.reactos.com

Update with right reactos logo by mf Modified: trunk/reactos/lib/user32/resources/oic_reactos.ico _____ Modified: trunk/reactos/lib/user32/resources/oic_reactos.ico (Binary files differ)

19 years, 6 months

[weiden] 16677: removed the ros-specific (and unused) functions ExRosDumpPagedPoolByTag, ExRosQueryPagedPoolTag and ExRosQueryPoolTag

by weiden＠svn.reactos.com

removed the ros-specific (and unused) functions ExRosDumpPagedPoolByTag, ExRosQueryPagedPoolTag and ExRosQueryPoolTag Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/mm/pool.c --- trunk/reactos/ntoskrnl/mm/pool.c 2005-07-21 10:03:01 UTC (rev 16676) +++ trunk/reactos/ntoskrnl/mm/pool.c 2005-07-21 10:31:29 UTC (rev 16677) @@ -20,11 +20,6 @@ extern ULONG MmTotalNonPagedPoolQuota; extern MM_STATS MmStats; -/* GLOBALS *****************************************************************/ - -ULONG STDCALL -ExRosQueryPagedPoolTag ( PVOID Block ); - /* FUNCTIONS ***************************************************************/ STATIC PVOID STDCALL @@ -337,20 +332,4 @@ } } -ULONG STDCALL -ExRosQueryPoolTag ( PVOID Block ) -{ - ASSERT_IRQL(DISPATCH_LEVEL); - - if (Block >= MmPagedPoolBase && (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) - { - return ExRosQueryPagedPoolTag(Block); - } - else - { - UNIMPLEMENTED; - return 0; - } -} - /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/mm/ppool.c --- trunk/reactos/ntoskrnl/mm/ppool.c 2005-07-21 10:03:01 UTC (rev 16676) +++ trunk/reactos/ntoskrnl/mm/ppool.c 2005-07-21 10:31:29 UTC (rev 16677) @@ -98,20 +98,7 @@ RPoolFree ( MmPagedPool, Block ); } -VOID STDCALL -ExRosDumpPagedPoolByTag ( ULONG Tag ) -{ - // TODO FIXME - should we ASSERT_IRQL? - RPoolDumpByTag ( MmPagedPool, Tag ); -} -ULONG STDCALL -ExRosQueryPagedPoolTag ( PVOID Addr ) -{ - // TODO FIXME - should we ASSERT_IRQL? - return RPoolQueryTag ( Addr ); -} - #ifdef PPOOL_UMODE_TEST PVOID TestAlloc ( ULONG Bytes ) _____ Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-07-21 10:03:01 UTC (rev 16676) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-07-21 10:31:29 UTC (rev 16677) @@ -933,6 +933,7 @@ R_RELEASE_MUTEX(pool); } +#if 0 static void RPoolDumpByTag ( PR_POOL pool, rulong Tag ) { @@ -963,6 +964,7 @@ R_DEBUG ( "Entries found for tag '%s': %i\n", tag, count ); } +#endif rulong RPoolQueryTag ( void* Addr ) _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-07-21 10:03:01 UTC (rev 16676) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-07-21 10:31:29 UTC (rev 16677) @@ -138,8 +138,6 @@ @ExReleaseResourceLite@4 @ExReleaseRundownProtection@4 @ExReleaseRundownProtectionEx@8 -ExRosDumpPagedPoolByTag@4 -ExRosQueryPoolTag@4 @ExRundownCompleted@4 ExSemaphoreObjectType DATA ExSetResourceOwnerPointer@8

19 years, 6 months

[greatlrd] 16676: add touch to copy by Brandon Turner

by greatlrd＠svn.reactos.com

add touch to copy by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-21 04:38:26 UTC (rev 16675) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-21 10:03:01 UTC (rev 16676) @@ -25,6 +25,10 @@ * * 13-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) * Rewrite to clean up copy and support wildcard. + * + * 20-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * Add touch syntax. "copy arp.exe+,," + * Copy command is now completed. */ #include <precomp.h> @@ -47,7 +51,7 @@ #define BUFF_SIZE 16384 /* 16k = max buffer size */ -int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], int append, DWORD lpdwFlags) +int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], INT append, DWORD lpdwFlags, BOOL bTouch) { TCHAR szMsg[RC_STRING_MAX_SIZE]; FILETIME srctime; @@ -63,10 +67,41 @@ TCHAR TempSrc[MAX_PATH]; TCHAR * FileName; + #ifdef _DEBUG DebugPrintf (_T("checking mode\n")); #endif + if(bTouch) + { + hFileSrc = CreateFile (source, GENERIC_WRITE, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (hFileSrc == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, source); + nErrorLevel = 1; + return 0; + } + + FILETIME NewFileTime; + SYSTEMTIME CurrentTime; + + GetSystemTime(&CurrentTime); + SystemTimeToFileTime(&CurrentTime, &NewFileTime); + if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) + { + CloseHandle(hFileSrc); + return 1; + + } + else + { + CloseHandle(hFileSrc); + return 0; + } + } + dwAttrib = GetFileAttributes (source); hFileSrc = CreateFile (source, GENERIC_READ, FILE_SHARE_READ, @@ -78,7 +113,7 @@ nErrorLevel = 1; return 0; } - + #ifdef _DEBUG DebugPrintf (_T("getting time\n")); #endif @@ -87,7 +122,7 @@ #ifdef _DEBUG DebugPrintf (_T("copy: flags has %s\n"), - *lpdwFlags & COPY_ASCII ? "ASCII" : "BINARY"); + lpdwFlags & COPY_ASCII ? "ASCII" : "BINARY"); #endif /* Check to see if /D or /Z are true, if so we need a middle @@ -304,6 +339,7 @@ BOOL bAppend = FALSE; WIN32_FIND_DATA findBuffer; HANDLE hFile; + BOOL bTouch = FALSE; /* Used when something like "copy c*.exe d*.exe" during the process of figuring out the new name */ TCHAR tmpName[MAX_PATH] = _T(""); @@ -318,9 +354,11 @@ TCHAR * UseThisName; /* Stores the name( i.e. blah.txt or blah*.txt) which later we might need */ TCHAR PreserveName[MAX_PATH]; - /* for CMDCOPY env */ - TCHAR *evar; - int size; + /* for CMDCOPY env */ + TCHAR *evar; + int size; + TCHAR * szTouch; + BOOL bDone = FALSE; /*Show help/usage info*/ @@ -491,20 +529,21 @@ { /* There is not enough files, there has to be at least 1 */ ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); + freep (arg); return 1; } if(nFiles > 2) { /* there is too many file names in command */ - LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg,_T("")); - nErrorLevel = 1; + LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg,_T("")); + nErrorLevel = 1; + freep (arg); return 1; } - if((nDes != -1) && - ((_tcschr (arg[nSrc], _T('+')) != NULL) || + if(((_tcschr (arg[nSrc], _T('+')) != NULL) || (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) )) @@ -522,7 +561,6 @@ do { - /* Set up the string that is the path to the destination */ if(nDes != -1) { @@ -551,20 +589,42 @@ the chars one at a time until it gets too + */ while(TRUE) { - if(!_tcsncmp (appendPointer,_T("+"),1) || !_tcsncmp (appendPointer,_T("\0"),1)) { /* Now that the pointer is on the + we need to go to the start of the next filename */ if(!_tcsncmp (appendPointer,_T("+"),1)) appendPointer++; + else + bDone = TRUE; break; + } + _tcsncat(tmpName,appendPointer,1); appendPointer++; + } /* Finish the string off with a null char */ _tcsncat(tmpName,_T("\0"),1); + + if(_tcschr (arg[nSrc], _T(',')) != NULL) + { + /* Only time there is a , in the source is when they are using touch + Cant have a destination and can only have on ,, at the end of the string + Cant have more then one file name */ + szTouch = _tcsstr (arg[nSrc], _T("+")); + if(_tcsncmp (szTouch,_T("+,,\0"),4) || nDes != -1) + { + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg,arg[nSrc]); + nErrorLevel = 1; + freep (arg); + return 1; + } + bTouch = TRUE; + bDone = TRUE; + } if(_tcslen(tmpName) == 2) { @@ -580,6 +640,7 @@ } else { + bDone = TRUE; if(_tcslen(arg[nSrc]) == 2 && arg[nSrc][1] == _T(':')) { GetRootPath(arg[nSrc],szSrcPath,MAX_PATH); @@ -617,8 +678,8 @@ /* Get a list of all the files */ hFile = FindFirstFile (szSrcPath, &findBuffer); + - /* We need to figure out what the name of the file in the is going to be */ if((szDestPath[_tcslen(szDestPath) - 1] == _T('*') && szDestPath[_tcslen(szDestPath) - 2] == _T('\\')) || szDestPath[_tcslen(szDestPath) - 1] == _T('\\')) @@ -648,7 +709,6 @@ else break; - do { /* Set the override to yes each new file */ @@ -659,7 +719,7 @@ { ConOutFormatMessage (GetLastError(), szSrcPath); freep (arg); - nErrorLevel = 1; + nErrorLevel = 1; return 1; } @@ -677,7 +737,7 @@ { ConOutFormatMessage (GetLastError (), szSrcPath); freep (arg); - nErrorLevel = 1; + nErrorLevel = 1; return 1; } /* Copy over the destination path name */ @@ -738,25 +798,25 @@ } } - + /* Build the string path to the source file */ _tcscpy(tmpSrcPath,szSrcPath); _tcscat (tmpSrcPath, findBuffer.cFileName); - + /* Check to see if the file is the same file */ - if(!_tcscmp (tmpSrcPath, tmpDestPath)) + if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath)) continue; - + /* Handle any overriding / prompting that needs to be done */ - if((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) + if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch) nOverwrite = Overwrite(tmpDestPath); if(nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) continue; if(nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) dwFlags |= COPY_NO_PROMPT; - + /* Tell weather the copy was successful or not */ - if(copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags)) + if(copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) { nFiles++; /* only print source name when more then one file */ @@ -769,18 +829,19 @@ /* print out the error message */ LoadString(CMD_ModuleHandle, STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg); - nErrorLevel = 1; + ConOutFormatMessage (GetLastError(), szSrcPath); + nErrorLevel = 1; } - + /* Loop through all wildcard files */ }while(FindNextFile (hFile, &findBuffer)); /* Loop through all files in src string with a + */ - }while(_tcsncmp (appendPointer,_T("\0"),1)); - + }while(!bDone); + /* print out the number of files copied */ LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, nFiles); - + CloseHandle(hFile); freep (arg); return 0;

19 years, 6 months

[ion] 16675: - Freetype Update to 2.1.10. Reduces memory usage, increases speed and fixes drawing bugs.

by ion＠svn.reactos.com

- Freetype Update to 2.1.10. Reduces memory usage, increases speed and fixes drawing bugs. - Enable Bytecode. Weird_W's fonts finally look humanly readable. Thanks to Waxdragon for testing. <http://www.freetype.org> LATEST CHANGES BETWEEN 2.1.10 and 2.1.9 I. IMPORTANT BUG FIXES - The size comparison for BDF and PCF files could fail sometimes. - Some CFF files were still not loaded correctly. Patch from Derek Noonburg. - The stroker still had some serious bugs. - Boris Letocha fixed a bug in the TrueType interpreter: The NPUSHW instruction wasn't skipped correctly in IF clauses. Some fonts like `Helvetica 75 Bold' failed. - Another serious bug in handling TrueType hints caused many distortions. It has been introduced in version 2.1.8, and it is highly recommended to upgrade. - FreeType didn't properly parse empty Type 1 glyphs. - An unbound dynamic buffer growth was fixed in the PFR loader. - Several bugs have been fixed in the cache sub-system. - FreeType behaved incorrectly when resizing two distinct but very close character pixel sizes through `FT_Set_Char_Size' (Savannah bug #12263). - The auto-hinter didn't work properly for fonts without a Unicode charmap -- it even refused to load the glyphs. II. IMPORTANT CHANGES - Many fixes have been applied to drastically reduce the amount of heap memory used by FreeType, especially when using memory-mapped font files (which is the default on Unix systems which support them). - The auto-hinter has been replaced with a new module, called the `auto-fitter'. It consumes less memory than its predecessor, and it is prepared to support non-latin scripts better in next releases. - George Williams contributed code to read kerning data from PFM files. - FreeType now uses the TT_NAME_ID_PREFERRED_FAMILY and TT_NAME_ID_PREFERRED_SUBFAMILY strings (if available) for setting family and style in SFNT fonts (patch from Kornfeld Eliyahu Peter). - A new API `FT_Sfnt_Table_Info' (in FT_TRUETYPE_TABLES_H) has been added to retrieve name and size information of SFNT tables. - A new API `FT_OpenType_Validate' (in FT_OPENTYPE_VALIDATE_H) has been added to validate OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF). After validation it is no longer necessary to check for errors in those tables while accessing them. Note that this module might be moved to another library in the future to avoid a tight dependency between FreeType and the OpenType specification. - A new API in FT_BITMAP_H (`FT_Bitmap_New', `FT_Bitmap_Convert', `FT_Bitmap_Copy', `FT_Bitmap_Embolden', `FT_Bitmap_Done') has been added. Its use is to convert an FT_Bitmap structure in 1bpp, 2bpp, 4bpp, or 8bpp format into another 8bpp FT_Bitmap, probably using a different pitch, and to further manipulate it. - A new API `FT_Outline_Embolden' (in FT_OUTLINE_H) gives finer control how outlines are embolded. - `FT_GlyphSlot_Embolden' (in FT_SYNTHESIS_H) now handles bitmaps also (code contributed by Chia I Wu). Note that this function is still experimental and may be replaced with a better API. - The method how BDF and PCF bitmap fonts are accessed has been refined. Formerly, FT_Set_Pixel_Sizes and FT_Set_Char_Size were synonyms in FreeType's BDF and PCF interface. This has changed now. FT_Set_Pixel_Sizes should be used to select the actual font dimensions (the `strike', which is the sum of the `FONT_ASCENT' and `FONT_DESCENT' properties), while FT_Set_Char_Size selects the `nominal' size (the `PIXELSIZE' property). In both functions, the width parameter is ignored. III. MISCELLANEOUS - The BDF driver no longer converts all returned bitmaps with a depth of 2bpp or 4bpp to a depth of 8bpp. The documentation has not mentioned this explicitly, but implementors might have relied on this after looking into the source files. - A new option `--ftversion' has been added to freetype-config to return the FreeType version. - The memory debugger has been updated to dump allocation statistics on all allocation sources in the library. This is useful to spot greedy allocations when loading and processing fonts. - We removed a huge array of constant pointers to constant strings in the `psnames' module. The problem was that compilations in PIC mode (i.e., when generating a Unix shared object/dll) put the array into the non-shared writable section of the library since absolute pointers are not relocatable by nature. This reduces the memory consumption by approximately 16KByte per process linked to FreeType. We now also store the array in a compressed form (as a trie) which saves about 20KByte of code as well. - Kirill Smelkov provided patches to make src/raster/ftraster.c compile stand-alone again. Modified: trunk/reactos/lib/freetype/ChangeLog Modified: trunk/reactos/lib/freetype/Jamfile Modified: trunk/reactos/lib/freetype/Jamrules Modified: trunk/reactos/lib/freetype/Makefile.freetype Modified: trunk/reactos/lib/freetype/README Added: trunk/reactos/lib/freetype/README.CVS Added: trunk/reactos/lib/freetype/autogen.sh Modified: trunk/reactos/lib/freetype/builds/amiga/README Modified: trunk/reactos/lib/freetype/builds/amiga/include/freetype/config/ftconfig .h Modified: trunk/reactos/lib/freetype/builds/amiga/include/freetype/config/ftmodule .h Added: trunk/reactos/lib/freetype/builds/amiga/makefile Added: trunk/reactos/lib/freetype/builds/amiga/makefile.os4 Modified: trunk/reactos/lib/freetype/builds/amiga/smakefile Modified: trunk/reactos/lib/freetype/builds/amiga/src/base/ftdebug.c Modified: trunk/reactos/lib/freetype/builds/amiga/src/base/ftsystem.c Modified: trunk/reactos/lib/freetype/builds/atari/ATARI.H Modified: trunk/reactos/lib/freetype/builds/atari/FNames.SIC Modified: trunk/reactos/lib/freetype/builds/atari/FREETYPE.PRJ Modified: trunk/reactos/lib/freetype/builds/atari/README.TXT Modified: trunk/reactos/lib/freetype/builds/compiler/gcc-dev.mk Modified: trunk/reactos/lib/freetype/builds/compiler/gcc.mk Modified: trunk/reactos/lib/freetype/builds/dos/detect.mk Modified: trunk/reactos/lib/freetype/builds/dos/dos-wat.mk Modified: trunk/reactos/lib/freetype/builds/freetype.mk Modified: trunk/reactos/lib/freetype/builds/unix/aclocal.m4 Modified: trunk/reactos/lib/freetype/builds/unix/config.guess Modified: trunk/reactos/lib/freetype/builds/unix/config.sub Modified: trunk/reactos/lib/freetype/builds/unix/configure Modified: trunk/reactos/lib/freetype/builds/unix/configure.ac Modified: trunk/reactos/lib/freetype/builds/unix/freetype-config.in Modified: trunk/reactos/lib/freetype/builds/unix/freetype2.m4 Modified: trunk/reactos/lib/freetype/builds/unix/ft-munmap.m4 Modified: trunk/reactos/lib/freetype/builds/unix/ftsystem.c Modified: trunk/reactos/lib/freetype/builds/unix/install-sh Modified: trunk/reactos/lib/freetype/builds/unix/install.mk Modified: trunk/reactos/lib/freetype/builds/unix/ltmain.sh Modified: trunk/reactos/lib/freetype/builds/unix/mkinstalldirs Modified: trunk/reactos/lib/freetype/builds/win32/detect.mk Modified: trunk/reactos/lib/freetype/builds/win32/visualc/freetype.dsp Modified: trunk/reactos/lib/freetype/builds/win32/visualc/freetype.vcproj Modified: trunk/reactos/lib/freetype/builds/win32/visualc/index.html Modified: trunk/reactos/lib/freetype/configure Modified: trunk/reactos/lib/freetype/devel/ftoption.h Modified: trunk/reactos/lib/freetype/docs/CHANGES Modified: trunk/reactos/lib/freetype/docs/CUSTOMIZE Modified: trunk/reactos/lib/freetype/docs/DEBUG Modified: trunk/reactos/lib/freetype/docs/FTL.txt Modified: trunk/reactos/lib/freetype/docs/GPL.txt Modified: trunk/reactos/lib/freetype/docs/INSTALL Modified: trunk/reactos/lib/freetype/docs/INSTALL.ANY Modified: trunk/reactos/lib/freetype/docs/INSTALL.GNU Modified: trunk/reactos/lib/freetype/docs/INSTALL.UNX Modified: trunk/reactos/lib/freetype/docs/INSTALL.VMS Modified: trunk/reactos/lib/freetype/docs/PATENTS Modified: trunk/reactos/lib/freetype/docs/TODO Modified: trunk/reactos/lib/freetype/docs/TRUETYPE Modified: trunk/reactos/lib/freetype/docs/UPGRADE.UNX Modified: trunk/reactos/lib/freetype/docs/VERSION.DLL Modified: trunk/reactos/lib/freetype/docs/formats.txt Modified: trunk/reactos/lib/freetype/docs/license.txt Modified: trunk/reactos/lib/freetype/docs/modules.txt Modified: trunk/reactos/lib/freetype/docs/raster.txt Modified: trunk/reactos/lib/freetype/docs/release Modified: trunk/reactos/lib/freetype/freetype.def Modified: trunk/reactos/lib/freetype/freetype.xml Modified: trunk/reactos/lib/freetype/include/freetype/cache/ftccache.h Modified: trunk/reactos/lib/freetype/include/freetype/cache/ftcglyph.h Modified: trunk/reactos/lib/freetype/include/freetype/cache/ftcmru.h Modified: trunk/reactos/lib/freetype/include/freetype/config/ftconfig.h Modified: trunk/reactos/lib/freetype/include/freetype/config/ftheader.h Modified: trunk/reactos/lib/freetype/include/freetype/config/ftmodule.h Modified: trunk/reactos/lib/freetype/include/freetype/config/ftoption.h Modified: trunk/reactos/lib/freetype/include/freetype/config/ftstdlib.h Modified: trunk/reactos/lib/freetype/include/freetype/freetype.h Modified: trunk/reactos/lib/freetype/include/freetype/ftbdf.h Added: trunk/reactos/lib/freetype/include/freetype/ftbitmap.h Modified: trunk/reactos/lib/freetype/include/freetype/ftcache.h Modified: trunk/reactos/lib/freetype/include/freetype/ftchapters.h Modified: trunk/reactos/lib/freetype/include/freetype/fterrors.h Modified: trunk/reactos/lib/freetype/include/freetype/ftgzip.h Modified: trunk/reactos/lib/freetype/include/freetype/ftimage.h Modified: trunk/reactos/lib/freetype/include/freetype/ftlzw.h Modified: trunk/reactos/lib/freetype/include/freetype/ftmac.h Modified: trunk/reactos/lib/freetype/include/freetype/ftmoderr.h Added: trunk/reactos/lib/freetype/include/freetype/ftotval.h Modified: trunk/reactos/lib/freetype/include/freetype/ftoutln.h Modified: trunk/reactos/lib/freetype/include/freetype/ftpfr.h Modified: trunk/reactos/lib/freetype/include/freetype/ftrender.h Modified: trunk/reactos/lib/freetype/include/freetype/ftsizes.h Modified: trunk/reactos/lib/freetype/include/freetype/ftstroke.h Modified: trunk/reactos/lib/freetype/include/freetype/fttypes.h Modified: trunk/reactos/lib/freetype/include/freetype/ftwinfnt.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/ftcalc.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/ftmemory.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/ftobjs.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/ftserv.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/ftstream.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/fttrace.h Added: trunk/reactos/lib/freetype/include/freetype/internal/ftvalid.h Modified: trunk/reactos/lib/freetype/include/freetype/internal/internal.h [truncated at 100 lines; 163 more skipped] _____ Modified: trunk/reactos/lib/freetype/ChangeLog --- trunk/reactos/lib/freetype/ChangeLog 2005-07-21 03:26:42 UTC (rev 16674) +++ trunk/reactos/lib/freetype/ChangeLog 2005-07-21 04:38:26 UTC (rev 16675) @@ -1,3 +1,2006 @@ +2005-06-08 Werner Lemberg <wl(a)gnu.org> + + + * Version 2.1.10 released. + ========================== + + + * src/pcf/readme: Renamed to... + * src/pcf/README: This. + +2005-06-07 Detlef W³rkner <TetiSoft(a)apg.lahn.de> + + * builds/amiga/*: Added copyright notes, reworked some comments. + +2005-06-05 Werner Lemberg <wl(a)gnu.org> + + * Add copyright notices to all files which don't have one. + + * docs/license.txt: Renamed to... + * docs/LICENSE.TXT: This. + * docs/FTL.txt: Renamed to... + * docs/FTL.TXT: This. + * docs/GPL.txt: Renamed to... + * docs/GPL.TXT: This. + + * docs/PATENTS: Slightly reworded. Suggested by Sylvain Beucler + <beuc(a)gnu.org>. + +2005-06-04 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/ftimage.h (FT_Outline_MoveToFunc, + FT_Outline_LineToFunc, FT_Outline_ConicToFunc, + FT_Outline_CubicToFunc, FT_Raster_RenderFunc), + include/freetype/ftrender.h (FT_Glyph_TransformFunc, + FT_Renderer_RenderFunc, FT_Renderer_TransformFunc): Don't use + `const' to stay compatible with FreeType 2.1.9. + +2005-06-01 Adam D. Moss <adam(a)gimp.org> + + * src/base/ftstroke.c (ft_stroker_inside): Revert `sigma' patch from + 2004-07-11; this gives much better results under normal + circumstances. + +2005-05-30 Chia I Wu <b90201047(a)ntu.edu.tw> + + * include/freetype/ftbitmap.h (FT_Bitmap_Embolden): Minor + documentation improvements. + + * include/freetype/ftoutln.h (FT_Outline_Embolden): Fix typos. + + * src/base/ftbitmap.c (FT_Bitmap_Embolden): Add support for bitmap + of pixel_mode FT_PIXEL_MODE_GRAY2 or FT_PIXEL_MODE_GRAY4. + If xstr is larger than 8 and bitmap is of pixel_mode + FT_PIXEL_MODE_MONO, set xstr to 8 instead of returning error. + +2005-05-29 Chia I Wu <b90201047(a)ntu.edu.tw> + + * src/base/ftbitmap.c (FT_Bitmap_Embolden): Fix emboldening bitmap + of mode FT_PIXEL_MODE_GRAY. Also add support for mode + FT_PIXEL_MODE_LCD and FT_PIXEL_MODE_LCD_V. + (ft_bitmap_assure_buffer): FT_PIXEL_MODE_LCD and FT_PIXEL_MODE_LCD_V + should have ppb (pixel per byte) 1. + Zero the padding when there's no need to allocate memory. + + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Handle slot->advance + too. + More suited emboldening strength. + +2005-05-28 Chia I Wu <b90201047(a)ntu.edu.tw> + + * src/base/ftbitmap.c (FT_Bitmap_Embolden): Handle negative pitch. + Handle FT_PIXEL_MODE_GRAY with num_gray != 256. + Improve speed for FT_PIXEL_MODE_GRAY. + (ft_bitmap_assure_buffer): Accept FT_PIXEL_MODE_LCD and + FT_PIXEL_MODE_LCD_V. + +2005-05-27 Chia I Wu <b90201047(a)ntu.edu.tw> + + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Initialize `error'. + + * src/base/ftobjs.c (ft_cmap_done_internal): New function. + (FT_CMap_Done): Remove cmap from cmap list. + (destroy_charmaps, FT_CMap_New): Don't call FT_CMap_Done but + ft_cmap_done_internal. + +2005-05-26 Werner Lemberg <wl(a)gnu.org> + + * docs/GPL.txt: Update postal address of FSF. + +2005-05-26 Chia I Wu <b90201047(a)ntu.edu.tw> + + * include/freetype/ftbitmap.h (FT_Bitmap_Embolden): Improve + documentation. + + * src/base/ftsynth.c (FT_BOLD_THRESHOLD): Removed. + (FT_GlyphSlot_Embolden): Check whether slot is bitmap owner. + Always modify the metrics. + +2005-05-24 Werner Lemberg <wl(a)gnu.org> + + * docs/CHANGES: Updated. + +2005-05-24 Chia I Wu <b90201047(a)ntu.edu.tw> + + * include/freetype/ftbitmap.h (FT_Bitmap_Embolden): New declaration. + + * include/freetype/ftoutln.h (FT_Outline_Embolden): New declaration. + + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): New auxiliary + function. + (FT_Bitmap_Embolden): New function. + + * src/base/ftoutln.c (FT_Outline_Embolden): New function. + + * src/base/ftsynth.c: Don't include FT_INTERNAL_CALC_H and + FT_TRIGONOMETRY_H but FT_BITMAP_H. + (FT_GlyphSlot_Embolden): Use FT_Outline_Embolden or + FT_Bitmap_Embolden. + +2005-05-24 Werner Lemberg <wl(a)gnu.org> + + * configure: Always remove config.mk, builds/unix/unix-def.mk, and + builds/unix/unix-cc.mk. This fixes repeated calls of the script. + Reported by Nelson Beebe and Behdad Esfahbod. + + * README.CVS: Mention file permissions. + +2005-05-23 Werner Lemberg <wl(a)gnu.org> + + * builds/amiga/makefile.os4 (WARNINGS), builds/compiler/gcc-dev.mk + (CFLAGS), builds/compiler/gcc.mk (CFLAGS): Remove + -fno-strict-aliasing. + + * src/sfnt/rules.mk (SFNT_DRV_SRC): Don't include ttsbit0.c -- + it is currently loaded from ttsbit.c. + +2005-05-23 Behdad Esfahbod <behdad(a)cs.toronto.edu> + + Say you have `(Foo*)x' and want to assign, pass, or return it as + `(Bar*)'. If you simply say `x' or `(Bar*)x', then the C compiler + would warn you that type casting incompatible pointer types breaks + strict-aliasing. The solution is to cast to `(void*)' instead which + is the generic pointer type, so the compiler knows that it should + make no strict-aliasing assumption on `x'. But the problem with + `(void*)x' is that seems like in C++, unlike C, `void*' is not a + generic pointer type and assigning `void*' to `Bar*' without a cast + causes an error. The solution is to cast to `Bar*' too, with + `(Bar*)(void*)x' as the result -- this is what the patch does. + + * include/freetype/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP), + include/freetype/cache/ftcmru.h (FTC_MRULIST_LOOKUP_CMP): Remove + cast on lvalue, use a temporary pointer instead. + Cast temporarily to (void*) to not break strict aliasing. + + * include/freetype/internal/ftmemory.h (FT_MEM_ALLOC, + FT_MEM_REALLOC, FT_MEM_QALLOC, FT_MEM_QREALLOC, FT_MEM_FREE), + src/base/ftglyph.c (FT_Glyph_To_Bitmap): Cast temporarily to (void*) + to not break strict aliasing. + + * src/base/ftinit.c (FT_USE_MODULE): Fix wrong type information. + + * builds/unix/configure.ac (XX_CFLAGS): Remove -fno-strict-aliasing. + +2005-05-23 David Turner <dturner(a)freetype.org> + + Fix Savannah bug #12213 (incorrect behaviour of the cache sub-system + in low-memory conditions). + + * include/freetype/cache/ftccache.h (FTC_CACHE_TRYLOOP, + FTC_CACHE_TRYLOOP_END): New macros. + + * src/cache/ftccache.c (FTC_Cache_NewNode), src/cache/ftcsbits.c + (ftc_snode_compare): Use FT_CACHE_TRYLOOP and FTC_CACE_TRYLOOP_END. + +2005-05-23 Werner Lemberg <wl(a)gnu.org> + + * src/base/rules.mk (BASE_SRC): Don't add ftsynth.c here but... + (BASE_EXT_SRC): Here. + +2005-05-22 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftrfork.c (raccess_guess_apple_generic): Mark + `version_number' and `entry_length' as unused. + (raccess_guess_linux_double_from_file_name): Remove `memory'. + (raccess_make_file_name): Mark `error' as unused. + + * src/bdf/bdflib.c (_bdf_parse_properties): Remove `memory'. + + * src/cid/cidobjs.c (cid_face_init): Remove `psnames'. + + * src/sfnt/sfobjs.c (sfnt_load_face): Remove `memory'. + + * src/truetype/ttgxvar.c (ft_var_readpackedpoints, + ft_var_readpackeddeltas, ft_var_load_avar): Mark `error' as unused. + + * src/base/rules.mk (BASE_SRC): Add ftsynth.c. + +2005-05-21 David Turner <david(a)freetype.org> + + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Fix a bug that + produced unpleasant artefacts when trying to embolden very sharp + corners. + +2005-05-20 Werner Lemberg <wl(a)gnu.org> + + * docs/CHANGES: Updated. + +2005-05-20 Chia I Wu <b90201047(a)ntu.edu.tw> + + * src/base/ftbitmap.c: Don't include FT_FREETYPE_H and FT_IMAGE_H + but FT_BITMAP_H. + (FT_Bitmap_Copy): New function (from ftglyph.c). + + * include/freetype/ftbitmap.h (FT_Bitmap_Copy): New public + definition. + + * src/base/ftglyph.c: Include FT_BITMAP_H. + (ft_bitmap_copy): Move to ftbitmap.c. + (ft_bitmap_glyph_init): Remove `memory' variable. + Create new bitmap object if FT_GLYPH_OWN_BITMAP isn't set. + (ft_bitmap_glyph_copy): Use FT_Bitmap_Copy. + (ft_bitmap_glyph_done): Use FT_Bitmap_Done. + (ft_outline_glyph_init): Use FT_Outline_Copy. + + * src/base/ftoutln.c (FT_Outline_Copy): Handle source == target. + (FT_Outline_Done_Internal): Check for valid `memory' pointer. + (FT_Outline_Translate, FT_Outline_Reverse, FT_Outline_Render, + FT_Outline_Transform): Check for valid `outline' pointer. + + * src/base/ftobjs.c (FT_New_GlyphSlot): Prepend glyph slot to + face->glyph, otherwise a new second glyph slot cannot be created. + (FT_Done_GlyphSlot): Fix memory leak. + (FT_Open_Face): Updated -- face->glyph is already managed by + FT_New_GlyphSlot. + + * src/type42/t42objs.c (T42_GlyphSlot_Done): Updated. + +2005-05-20 Kirill Smelkov <kirr(a)mns.spb.ru> + + * include/freetype/ftimage.h (FT_Raster_Params), + include/freetype/ftoutln.h (FT_Outline_Translate, + FT_Outline_Transform), src/base/ftoutln.c (FT_Outline_Translate, + FT_Outline_Transform): Decorate parameters with `const' where + appropriate. + Update all callers. + + * src/raster/ftraster.c (ft_black_reset), src/smooth/ftgrays.c + (gray_raster_reset): Remove `const' from `pool_base' argument. + +2005-05-18 Kirill Smelkov <kirr(a)mns.spb.ru> + + * src/raster/ftmisc.h: New file. Only needed if ftraster.c is + compiled as stand-alone. + + * src/raster/ftraster.c: Add comment how to compile as stand-alone. + s/FT_CONFIG_OPTION_STATIC_RASTER/FT_STATIC_RASTER/. + s/TT_STATIC_RASTER/FT_STATIC_RASTER/. + [_STANDALONE_]: Include ftimage.h and ftmisc.h. + (FT_TRACE1, FT_TRACE6, ft_memset, FT_MEM_ZERO): Define + conditionally. + (Render_Glyph, Render_Gray_Glyph): Return Raster_Err_None (or + Raster_Err_Unsupported). + (ft_black_new) [_STANDALONE_]: Fix type of `the_raster'. + (ft_black_init, ft_black_reset, ft_black_set_mode, ft_black_render): + Use `ras', not `raster'. + (ft_black_done): Use FT_UNUSED_RASTER. + (Horizontal_Sweep_Init, Horizontal_Sweep_Step, + Horizontal_Gray_Sweep_Span): Use FT_UNUSED_RASTER. + +2005-05-18 Werner Lemberg <wl(a)gnu.org> + + * docs/announce: Start updating. + + * docs/CHANGES: Updated. + +2005-05-16 Vitaliy Pasternak <v_a_pasternak(a)mail.ru> + + * builds/win32/visualc/freetype.vcproj: Updated. + Exclude debug info for `Release' versions to reduce library size. + +2005-05-16 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftobjs.c (FT_Open_Face): Make it work as documented, this + is, ignore `aface' completely if face_index < 0. Reported by David + Osborn <spam(a)habitualhiatus.com>. + +2005-05-16 Kirill Smelkov <kirr(a)mns.spb.ru> + + * include/freetype/ftimage.h (FT_Outline_MoveToFunc, + FT_Outline_LineTo_Func, FT_Outline_ConicToFunc, + FT_Outline_CubicToFunc), src/smooth/ftgrays.c (gray_render_conic, + gray_render_cubic, gray_move_to, gray_line_to, gray_conic_to, + gray_cubic_to, gray_render_span, gray_sweep): Decorate parameters + with `const' where appropriate. + +2005-05-11 Kirill Smelkov <kirr(a)mns.spb.ru> + + * include/freetype/ftimage.h (FT_Raster_RenderFunc), + include/freetype/ftrender.h (FT_Glyph_TransformFunc, + FT_Renderer_Render_Func, FT_Renderer_TransformFunc), + src/base/ftglyph.c (ft_outline_glyph_transform), + src/raster/ftrend1.c (ft_raster1_transform, ft_raster1_render), + src/smooth/ftgrays.c (FT_Outline_Decompose, gray_raster_render), + src/smooth/ftsmooth.c (ft_smooth_transform, + ft_smooth_render_generic, ft_smooth_render, ft_smooth_render_lcd, + ft_smooth_render_lcd_v): Decorate parameters with `const' where + appropriate. + + * src/raster/ftraster.c (RASTER_RENDER_POOL): Removed. Obsolete. + (ft_black_render): Decorate parameters with `const' where + appropriate. + +2005-05-11 Werner Lemberg <wl(a)gnu.org> + + * src/sfnt/ttcmap.c (tt_cmap4_set_range): Fix typo (FT_PEEK_SHORT -> + FT_PEEK_USHORT) which caused crashes. Reported by Ismail Donmez + <ismail(a)kde.org.tr>. + +2005-05-08 Werner Lemberg <wl(a)gnu.org> + + * include/freetype/internal/ftserv.h (FT_FACE_FIND_GLOBAL_SERVICE) + [__cplusplus]: Fix typo. + +2005-05-07 Werner Lemberg <wl(a)gnu.org> + + Handle unsorted SFNT type 4 cmaps correctly (reported by Dirck + Blaskey <listtarget(a)danbala.com>). + + * src/sfnt/ttcmap.h (TT_CMap): Add member `unsorted'. + * src/sfnt/ttcmac.c: Use SFNT_Err_Ok where appropriate. + + (tt_cmap0_validate, tt_cmap2_validate, tt_cmap6_validate, + tt_cmap8_validate, tt_cmap10_validate, tt_cmap12_validate): Use + `FT_Error' as return type. + (tt_cmap4_validate): Use `FT_Error' as return type. + Return error code for unsorted cmap. + (tt_cmap4_char_index, tt_cmap4_char_next): Use old code for unsorted + cmaps. + (tt_face_build_cmaps): Set `unsorted' variable in cmap. + +2005-05-07 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttpload.c (tt_face_get_location): Fix typo. + +2005-05-06 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffobjs.c (cff_face_init): Set ppem value in top + dictionary for SFNT-based CFF. + +2005-05-05 Werner Lemberg <wl(a)gnu.org> + + Handle malformed `loca' table entries. + + * docs/TODO: Add some bugs which should be fixed. + + * include/freetype/internal/tttypes.h (TT_FaceRec): Add `glyf_len' + element. + + * src/truetype/ttpload.c (tt_face_load_loca): Get length of `glyf' + table. + (tt_face_get_location): Fix computation of `asize' for malformed + `loca' entries. + +2005-05-01 David Turner <david(a)freetype.org> + + * Jamfile: Remove `otvalid' from the list of compiled modules. + + * include/freetype/internal/ftserv.h: Add compiler pragmas to get + rid of annoying warnings with Visual C++ compiler in maximum warning + mode. + + * src/autofit/afhints.c, src/autofit/aflatin.c, src/base/ftstroke.c, + src/bdf/bdfdrivr.c, src/cache/ftcbasic.c, src/cache/ftccmap.c, + src/cache/ftcmanag.c, src/cff/cffload.c, src/cid/cidload.c, + src/lzw/zopen.c, src/otvalid/otvgdef.c, src/pcf/pcfread.c, + src/sfnt/sfobjs.c, src/truetype/ttgxvar.c: Remove compiler warnings. + +2005-04-28 Werner Lemberg <wl(a)gnu.org> + + * docs/TODO: Updated. + +2005-04-24 Werner Lemberg <wl(a)gnu.org> + + * src/otvalid/otvcommn.c + (otv_GSUBGPOS_have_MarkAttachmentType_flag): Handle table == 0. + +2005-04-16 Werner Lemberg <wl(a)gnu.org> + + * src/cff/cffobjs.c (cff_face_init): Set default upem value in top + font dict also. + Handle font matrix settings in subfonts. + + * src/cff/cffgload.c (cff_slot_load): Use the correct font matrix + for CID-keyed fonts with subfonts. + + * docs/formats.txt: Updated. + +2005-04-14 Kirill Smelkov <kirr(a)mns.spb.ru> + + * include/freetype/freetype.h (FT_Vector_Transform), + include/freetype/ftimage.h (FT_Raster_Params), + include/freetype/ftoutln.h, src/base/ftoutln.c (FT_Outline_Get_CBox, + FT_Outline_Copy, FT_Outline_Transform, FT_Vector_Transform, + FT_Outline_Get_Bitmap), src/raster/ftraster.c (ft_black_render), + src/smooth/ftgrays.c (gray_raster_render): Decorate parameters with + `const' where appropriate. + +2005-04-14 Werner Lemberg <wl(a)gnu.org> + + * src/type1/t1load.c (parse_charstrings): Catch this non-standard + beginning of the /CharStrings dictionary: + + /CharStrings 118 dict def + Private begin + CharStrings begin + + * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Fix arguments + to call of tt_sbit_decoder_load_bitmap. + +2005-04-13 Werner Lemberg <wl(a)gnu.org> + + * docs/TODO: Updated. + + * autogen.sh: Use `--force' for all commands. + +2005-04-09 Werner Lemberg <wl(a)gnu.org> + + * src/pshinter/pshalgo.c (ps_hints_apply): Change scaling values + only if `fitted' is not zero. + +2005-04-06 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttgload.c (tt_face_get_metrics) [FT_OPTIMIZE_MEMORY]: + Fix typo which sometimes causes wrong metrics for the last glyph. + +2005-04-04 David Turner <david(a)freetype.org> + + * devel/ftoption.h, include/freetype/config/ftoption.h + (FT_OPTIMIZE_MEMORY): Comment out this macro for the upcoming 2.1.10 + release. + (*_CHESTER_*): Removed. No longer used. + + * src/autofit/afhints.c (af_axis_hints_new_segment, + af_axis_hints_new_edge): Small tweak to use less heap memory. + +2005-04-03 Werner Lemberg <wl(a)gnu.org> + + * src/type1/t1parse.c (T1_New_Parser): Relax the check for a valid + first line in the font. + +2005-04-03 Werner Lemberg <wl(a)gnu.org> + + * docs/CHANGES, include/freetype/freetype.h: Improve documentation + of FT_Set_Pixel_Sizes and FT_Set_Char_Size. + +2005-03-26 Detlef W³rkner <TetiSoft(a)apg.lahn.de> + + * builds/amiga/src/base/ftsystem.c (ft_amiga_stream_io): Fix buffer + offsets after a large read. + +2005-03-26 Werner Lemberg <wl(a)gnu.org> + + * src/autofit/afglobal.c (af_face_globals_get_metrics): + s/index/gidx/. + + * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Fix compiler + warnings. + + * src/sfnt/rules.mk (SFNT_DRV_SRC): Add ttsbit0.c. + + * src/sfnt/ttsbit0.h: Dummy file for build with `make'. + +2005-03-26 Detlef W³rkner <TetiSoft(a)apg.lahn.de> + + Update of the Amiga port. + + * builds/amiga/makefile, builds/amiga/makefile.os4, + builds/amiga/smakefile: Included the base extension files + (ftbitmap.c, ftotval.c, ftpfr.c, ftstroke.c, ftxf86.c). + +2005-03-25 Detlef W³rkner <TetiSoft(a)apg.lahn.de> + + Update of the Amiga port. + + * builds/amiga/makefile, builds/amiga/smakefile: Handle new modules. + + * builds/amiga/makefile.os4: Makefile for AmigaOS4 SDK. + + * builds/amiga/README: Updated. + + * builds/amiga/include/freetype/config/ftconfig.h: Handle gcc for + AmigaOS4. + + * builds/amiga/include/freetype/config/ftmodule.h: Handle new + modules. + + * builds/amiga/src/base/ftdebug.c: Updated to current version of + default ftdebug.c. + Add various include files and macros to have proper support for + both AmigaOS4 and older AmigaOS versions. + Don't declare KVPrintF explicitly. + Replace getenv with GetVar. + Actually enable debugging code. + + * builds/amiga/src/base/ftsystem.c: Major rewrite. + +2005-03-23 Werner Lemberg <wl(a)gnu.org> + + * tests/*: Removed. + +2005-03-23 Werner Lemberg <wl(a)gnu.org> + + * docs/CHANGES, docs/INSTALL.ANY: Updated. + + * include/freetype/ftmoderr.h: Replace `Autohint' with `Autofit'. + Add `OTvalid'. + + * src/autofit/aferrors.h: New file. + + * src/autofit/afglobal.c, src/autofit/afhints.c, + src/autofit/aflatin.c, src/autofit/afloader.c: s/FT_Err_/AF_Err_/. + Include aferrors.h. + + * src/autofit/rules.mk (AUTOF_DRV_H): Include aferrors.h. + + * src/otvalid/otverror.h: s/FT_Mod_Err_OTV/FT_Mod_Err_OTvalid/. + +2005-03-22 David Turner <david(a)freetype.org> + + * src/autohint/*: Removed. + * Jamfile: Updated. + +2005-03-15 David Turner <david(a)freetype.org> + + * src/bdf/bdflib.c: Remove compiler warnings. + (hash_rehash, hash_init): Don't call FT_MEM_ZERO. + (_bdf_list_t): Add `memory' field. + (_bdf_list_init, _bdf_list_done, _bdf_list_ensure): New functions. + (_bdf_shift, _bdf_join): Rename to... + (_bdf_list_shift, _bdf_list_join): This. + (_bdf_split): Renamed to... + (_bdf_list_split): This. Use new functions. + (bdf_internal_readstream): Removed. + (NO_SKIP): New macro. + (_bdf_readstream): Rewritten. + (bdf_create_property, _bdf_add_comment): Improve allocation. + (_bdf_set_default_spacing, _bdf_parse_glyphs): Updated. Improve + allocation. + (_bdf_parse_properties, _bdf_parse_start): Updated. + (bdf_load_font): Updated to use new functions. + + * src/type1/t1parse.c (check_type1_format): New function. + (T1_New_Parser): Use it to check font header before allocating + anything on the heap. + + * src/type42/t42parse.c (t42_parser_init): Modify functions to check + the font header before allocating anything on the heap. + + * include/freetype/internal/ftmemory.h (FT_ARRAY_MAX, + FT_ARRAY_CHECK): New macros. + + * src/base/ftstream.c (FT_Stream_TryRead): New function. + * include/freetype/internal/ftstream.h: Updated. + + * src/pcf/pcfread.c (pcf_read_TOC), src/pcf/pcfutil.c + (BitOrderInvert, TwoByteSwap, FourByteSwap): Minor fixes and + simplifications. Try to protect the PCF driver from doing stupid + things with broken fonts. + + * src/lzw/ftlzw.c (FT_Stream_OpenLZW): Check the LZW header before + doing anything else. This avoids unnecessary heap allocations + (400KByte of heap memory for the LZW decoder). + + * src/gzip/ftgzip.c (FT_Stream_OpenGZip): Ditto for the gzip + decoder, although the code savings are smaller. + + * docs/CHANGES: Updated. + +2005-03-10 David Turner <david(a)freetype.org> + + * src/tools/glnames.py: Add comment to explain the compression + being used for the Adobe Glyph List. + +2005-03-10 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttpload.c (tt_face_load_cvt, tt_face_load_fpgm): + Fix serious typo which prevented correct TT rendering. + + * include/freetype/internal/ftmemory.h: Undo change from 2005-03-03. + To suppress warnings it is sufficient to use `-fno-strict-aliasing'. + +2005-03-10 Werner Lemberg <wl(a)gnu.org> + + * src/tools/glnames.py: Formatted. + Format output to be in sync with other FreeType code. + Import `re' and `os.path'. + (StringTable) <__init__>: Add parameter to initialize master table + name. + (StringTable) <dump>: Don't pass master table name. + (StringTable) <dump_sublist>: Emit explanatory comment. + Simplify and make output more human readable. + (t1_bias, glyph_list, adobe_glyph_names): Removed. Unused. + (main): Use `basename' for file name in header. + + * src/psnames/pstables.h: Regenerated. + +2005-03-09 David Turner <david(a)freetype.org> + + * src/tools/glnames.py: Rewrite the generator for the `pstables.h' + header file which contains various constant tables related to glyph + names. It now uses a different, more compact storage scheme that + saves about 20KB. This also closes Savannah bug #12262. + + * src/psnames/pstables.h: Regenerated. + + * src/psnames/psmodule.c (ps_unicode_value): Use + `ft_get_adobe_glyph_index', a new function defined in `pstables.h'. + (ps_get_macintosh_name, ps_get_standard_strings): Updated. + + * src/base/ftobjs.c (FT_Set_Char_Sizes): Handle fractional sizes + more carefully. This fixes Savannah bug #12263. + +2005-03-06 David Turner <david(a)freetype.org> + + * src/otvalid/otvgsub.c, src/otvalid/otvgpos.c: Make static tables + constant. + + * src/autofit/aflatin.c (af_latin_metrics_init): Fix Savannah bug + #12212 (auto-hinter refuses to work if no Unicode charmap in font). + +2005-03-05 Werner Lemberg <wl(a)gnu.org> + + * autogen.sh: New script for bootstrapping. + + * README.CVS: New file which documents bootstrapping. + + * builds/unix/aclocal.m4, builds/unix/config.guess, + builds/unix/config.sub, builds/unix/configure, + builds/unix/ltmain.sh: Removed. + +2005-03-04 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftutil.c: Include FT_INTERNAL_OBJECTS_H. + +2005-03-03 Werner Lemberg <wl(a)gnu.org> + + Various fixes for C and C++ compiling. + + * src/autofit/*: Add copyright messages. + + * src/autofit/afhints.c (af_glyph_hints_done): Don't use + `AF_Dimension' but `int' for loop counter. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths): Don't use + `AF_Dimension' but `int' for loop counter. + Use proper enumeration value for `render_mode'. + (af_latin_metrics_scale_dim): Don't shadow variables. + (af_latin_hints_compute_segments): Use proper cast for `major_dir' + and `segment_dir'. + (af_latin_align_linked_edge, af_latin_hint_edges): Fix arguments of call to + `af_latin_compute_stem_width'. + (af_latin_hints_apply): Don't use `AF_Dimension' but `int' for loop + counter. + + * src/base/ftdbgmem.c (ft_mem_table_get_source, FT_DumpMemory): Use + proper cast for memory allocation. + + * src/cff/cffdrivr.c (cff_get_kerning): Use proper cast for + initialization of `sfnt'. + + * src/sfnt/sfdriver.c: Include `ttkern.h'. + + * src/sfnt/ttkern.c (tt_face_get_kerning): Don't shadow variables. + + * src/truetype/ttgload.c: Include `ttpload.h'. + +2005-03-03 David Turner <david(a)freetype.org> + + * include/freetype/internal/ftmemory.h (FT_ALLOC, FT_REALLOC, + FT_QALLOC, FT_QREALLOC) [gcc >= 3.3]: Provide macro versions which + avoid compiler warnings. + (FT_NEW, FT_NEW_ARRAY, FT_RENEW_ARRAY, FT_QNEW, FT_QNEW_ARRAY, + FT_QRENEW_ARRAY, FT_ALLOC_ARRAY, FT_REALLOC_ARRAY): Updated. + + * include/freetype/internal/ftserv.h (FT_FACE_FIND_SERVICE, + FT_FACE_FIND_GLOBAL_SERVICE, FT_FACE_LOOKUP_SERVICE) [__cpluscplus]: + Provide macro versions which avoid compiler warnings. + + * src/base/ftutil.c (ft_highpow2): New utility function. + + * include/freetype/internal/ftobjs.h: Updated. + + * src/pfr/pfrload.c (pfr_get_gindex, pfr_compare_kern_pairs, + pfr_sort_kerning_pairs): Don't define if FT_OPTIMIZE_MEMORY is set. + (pfr_phy_font_done): Don't handle `kern_pairs' if FT_OPTIMIZE_MEMORY + is set. + (pfr_phy_font_load): Don't call `pfr_sort_kerning_pairs' if + FT_OPTIMIZE_MEMORY is set. + + * src/pfr/pfrobjs.c (pfr_slot_load): Comment out some code which + doesn't work with broken fonts. + (pfr_face_get_kerning) [FT_OPTIMIZE_MEMORY]: Implement. + + * src/pfr/pfrtypes.h (PFR_KernItemRec): Optimize member types. + (PFR_NEXT_KPAIR): New macro. + (PFR_PhyFontRec): Don't define `kern_pairs' if FT_OPTIMIZE_MEMORY is + set. + + * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Introduce + temporary variable to avoid gcc warning. + (tt_face_load_sbit_image): Mark unused variables with FT_UNUSED. + + * src/truetype/ttpload.c (tt_face_load_loca) [FT_OPTIMIZE_MEMORY]: + Remove redundant variable. + + * include/freetype/config/ftmodule.h: Moving the order of drivers to + speed up font loading. The PCF and BDF loaders are still slow and + consume far too much memory. + +2005-03-03 Werner Lemberg <wl(a)gnu.org> + + * devel/ftoption.h: Updated to recent changes. + +2005-03-02 Werner Lemberg <wl(a)gnu.org> + + * src/autofit/afdummy.c, src/autofit/afdummy.h + (af_dummy_script_class): Fix type. + + * src/autofit/aflatin.c, src/autofit/aflatin.h + (af_latin_script_class): Fix type. + + * src/autofit/rules.mk (AUTOF_DRV_SRC): Fix typo. + +2005-03-01 David Turner <david(a)freetype.org> + + * src/sfnt/ttkern.c (tt_face_load_kern, tt_face_get_kerning), + src/sfnt/ttsbit0.c (tt_face_load_sbit_strikes, + tt_sbit_decoder_load_byte_aligned, tt_sbit_decoder_load_compound, + tt_sbit_decoder_load_image), src/sfnt/ttload.c + (tt_face_load_metrics): Remove compiler warnings + -- redundant variables, missing initializations, etc. + + * src/sfnt/ttsbit.h: Handle FT_OPTIMIZE_MEMORY. + + * src/autofit/rules.mk, src/autofit/module.mk, + src/autofit/afangles.h: New files. + + * src/autofit/afhints.c (af_axis_hints_new_segment, + af_axis_hints_new_edge): New functions. + (af_glyph_hints_done): Do proper deallocation. + (af_glyph_hints_reload): Only reallocate points array. This + drastically reduces heap usage. + + * src/autofit/afhints.h (AF_PointRec, AF_SegmentRec): Optimize + member types and positions. + (AF_AxisHintsRec): Add `max_segments' and `max_edges'. + (af_axis_hints_new_segment, af_axis_hints_new_edge): New prototypes. + + * src/autofit/aflatin.c (af_latin_metricsc_scale): Don't call + AF_SCALER_EQUAL_SCALES. + (af_latin_hints_compute_segments): Change return type to FT_Error. + Update all callers. + Improve segment allocation. + (af_latin_hints_compute_edges): Change return type to FT_Error. + Update all callers. + Improve edge allocation and link handling. + (af_latin_hints_detect_features): Change return type to FT_Error. + Update all callers. + + * src/autofit/aflatin.h: Updated. + + * src/autofit/afloader.c (af_loader_load_g) + <FT_GLYPH_FORMAT_OUTLINE>: Assure axis->num_edges > 1. This fixes + a bug with certain fonts. + + * include/freetype/config/ftmodule.h: The auto-fitter is now the + only supported auto-hinting module. + + * include/freetype/config/ftstdlib.h (FT_INT_MAX): New macro. + +2005-02-28 Werner Lemberg <wl(a)gnu.org> + + * src/truetype/ttpload.c (tt_face_load_loca): Fix typo. + + * src/sfnt/ttkern.c: Include `ttkern.h'. + (FT_COMPONENT): Updated. + + * include/freetype/internal/fttrace.h: Add entry for `ttkern'. + + * src/sfnt/ttsbit0.c: s/FT_Err_/SFNT_Err_/. + Decorate constants with `U' and `L' where necessary. + + * src/sfnt/ttcmap.c (tt_cmap4_next): Remove unused variable. + +2005-02-28 David Turner <david(a)freetype.org> + + * src/base/ftdbgmem.c (FT_DumpMemory): Added sorting of memory + sources according to decreasing maximum cumulative allocations. + (ft_mem_source_compare): New auxiliary function. + + * src/sfnt/ttsbit0.c: New file, implementing a heap-optimized + embedded bitmap loader. + + * src/sfnt/ttsbit.c: Include `ft2build.h', FT_INTERNAL_DEBUG_H, + FT_INTERNAL_STREAM_H, FT_TRUETYPE_TAGS_H. + Load `ttsbit0.c' if FT_OPTIMIZE_MEMORY is set, otherwise use + file contents. + (tt_face_load_sbit_strikes): Set up root fields to indicate the + strikes. This fixes Savannah bug #12107. + Use `static' keyword for `sbit_line_metrics_field', + `strike_start_fields', `strike_end_fields'. + + * include/freetype/internal/tttypes.h (TT_FaceRec): Define + `sbit_table', `sbit_table_size', `sbit_num_strikes' if + FT_OPTIMIZE_MEMORY is set. + Don't define `num_sbit_strikes' and `sbit_strikes' if + FT_OPTIMIZE_MEMORY is set. + + * src/cff/cffobjs.c (sbit_size_reset): Handle FT_OPTIMIZE_MEMORY. + + * src/sfnt/sfobjs.c (sfnt_load_face): Fixed bug that prevented + loading SFNT fonts without a `kern' table. + Properly pass root->face_flags. + Remove code for TT_CONFIG_OPTION_EMBEDDED_BITMAPS. + + * src/sfnt/sfdriver.c (sfnt_interface) + [TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Don't use `tt_find_sbit_image' + and `tt_load_sbit_metrics'. + + * src/sfnt/ttcmap.c: Optimize linear charmap scanning for Format 4. + (OPT_CMAP4): New macro. + (TT_CMap4Rec) [OPT_CMAP4]: New structure. + (tt_cmap4_init, tt_cmap4_set_range, tt_cmap4_next, tt_cmap4_reset) + [OPT_CMAP4]: New functions. + (tt_cmap4_char_next) [OPT_CMAP4]: Use `tt_cmap4_next' and + `tt_cmap4_reset'. + (tt_cmap4_class_rec) [OPT_CMAP4]: Use `TT_CMap4Rec' and + `tt_cmap4_init'. + + * src/truetype/ttobjs.c (Reset_SBit_Size): Handle + FT_OPTIMIZE_MEMORY. + + * src/autofit/afhints.h (AF_PointRec, AF_SegmentRec, AF_EdgeRec): + Optimize member types. + + * src/autofit/afloader.c (af_loader_done): Call + `af_glyph_hints_done'. + +2005-02-27 David Turner <david(a)freetype.org> + + * src/sfnt/ttkern.c (tt_face_load_kern): Fix a small bug which + caused invalid (random) return values for the horizontal kerning. + +2005-02-25 David Turner <david(a)freetype.org> + + Implement several memory optimizations to drastically reduce the + heap usage of FreeType, especially in the case of memory-mapped + files. The idea is to avoid loading and decoding tables in the + heap, and instead access the raw data whenever possible (i.e., when + it doesn't compromise performance). + + This has several benefits: For example, opening vera.ttf now uses + just a small amount of memory (even when the FT_Library footprint is + accounted for), until you start loading glyphs. Even then, you save + at least 20KB compared to the non-optimized case. Performance of + various operations, including open and close, has also been + dramatically improved. + + More optimizations to come, especially for the auto-hinter. + + * include/freetype/internal/sfnt.h (TT_Face_GetKerningFunc): New + function type. + (SFNT_Interface): Add it. + + * include/freetype/internal/tttypes.h (TT_HdmxEntryRec, TT_HdmxRec, + TT_Kern0_PairRec): Don't define if FT_OPTIMIZE_MEMORY is set. + (TT_FaceRec): Define `horz_metrics', `horz_metrics_size', + `vert_metrics', `vert_metrics_size', `hdmx_table', + `hdmx_table_size', `hdmx_record_count', `hdmx_record_size', + `hdmx_record_sizes', `kern_table', `kern_table_size, + `num_kern_tables', `kern_avail_bits', `kern_order_bits' if + FT_OPTIMIZE_MEMORY is set. + Don't define `hdmx', `num_kern_pairs', `kern_table_index', + `kern_pairs' if FT_OPTIMIZE_MEMORY is set. + + * src/base/ftdbgmem.c (ft_mem_table_set): Don't shadow variable. + Fix compiler warning. + + * src/cff/cffdrivr.c (Get_Kerning): Renamed to... + (cff_get_kerning): This. Simplify. + (cff_driver_class): Updated. + + * src/sfnt/Jamfile (_sources): Add `ttkern'. + * src/sfnt/rules.mk (SFNT_DRV_SRC): Add `ttkern.c'. + + * src/sfnt/sfdriver.c (sfnt_interface): Add `tt_face_get_kerning'. + + * src/sfnt/sfnt.c: Include `ttkern.c'. + + * src/sfnt/sfobjs.c: Include `ttkern.h'. + (sfnt_load_face): Consider the `kern' and `gasp' table as optional. + (sfnt_done_face): Call `tt_face_done_kern'. + Handle horizontal metrics for FT_OPTIMIZE_MEMORY. + + * src/sfnt/ttkern.c, src/sfnt/ttkern.h: New files. Code has been + taken from `ttload.c' and `ttload.h'. + Provide special versions of `tt_face_load_kern', + `tt_face_get_kerning', and `tt_face_done_kern' for + FT_OPTIMIZE_MEMORY. + + * src/sfnt/ttload.c (tt_face_load_metrics, tt_face_load_hdmx, + tt_face_free_hdmx): Provide version for FT_OPTIMIZE_MEMORY. + (tt_face_load_kern, tt_kern_pair_compare, TT_KERN_INDEX): Moved to + `ttkern.c'. + + * src/sfnt/ttload.h: Updated. + + * src/sfnt/ttsbit.c (sbit_metrics_field): Add `static' keyword. + + * src/truetype/ttdriver.c (Get_Kerning): Renamed to... + (tt_get_kerning): This. Simplify. + (tt_driver_class): Updated. + + * src/truetype/ttgload.c (TT_Get_Metrics): Renamed to... + (tt_face_get_metrics): This. Provide version for FT_OPTIMIZE_MEMORY. + Update all callers. + (Get_Advance_Widths): Replaced with... + (Get_Advance_WidthPtr): This. Provide version for + FT_OPTIMIZE_MEMORY. + Update all callers. + + * src/truetype/ttgload.h: Updated. + +2005-02-22 David Turner <david(a)freetype.org> + + * src/base/ftdbgmem.c: Partly rewritten. Added the ability to list + all allocation sites in the memory debugger. Also a new function + FT_DumpMemory() was added. It is only available in builds with + FT_DEBUG_MEMORY defined, and you must declare it in your own code to + use it, i.e., with something like: + + extern void FT_DumpMemory( FT_Memory ); + + ... + + FT_DumpMemory( memory ); + + * include/freetype/config/ftoption.h + (TT_CONFIG_OPTION_BYTECODE_INTERPRETER): Comment out definition -- + again. + (FT_OPTIMIZE_MEMORY): New configuration macro to control various + optimizations for reducing the heap footprint of memory-mapped + TrueType files. + + * include/freetype/internal/ftmemory.h (FT_ARRAY_ZERO): New + convenience macro. + + * include/freetype/internal/tttypes.h (TT_FaceRec) + [FT_OPTIMIZE_MEMORY]: Use optimized types for `num_locations' and + `glyph_locations'. + + * src/truetype/ttgload.c (load_truetype_glyph): Call + `tt_face_get_location'. + + * src/truetype/ttobjs.c (tt_face_init) + [FT_CONFIG_OPTION_INCREMENTAL]: Improve error handling. + (tt_face_done): Call `tt_face_done_loca'. + + * src/truetype/ttpload.c (tt_face_get_location, tt_face_done_loca): + New functions. If FT_OPTIMIZE_MEMORY is set, the locations table is + read directly from memory-mapped streams, instead of being decoded + into the heap. + (tt_face_load_loca) [FT_OPTIMIZE_MEMORY]: New implementation. + (tt_face_load_cvt, tt_face_load_fpgm): Only load table if the + bytecode interpreter is compiled in. + + * src/truetype/ttpload.h: Updated. + + * src/autohint/ahglyph.c (ah_outline_load): Improve allocation + logic. + +2005-02-20 Werner Lemberg <wl(a)gnu.org> + + * builds/unix/ltmain.sh: Regenerated with `libtoolize --force + --copy' from libtool 1.5.14. + * builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from + automake 1.9.4. + + * builds/unix/config.guess, builds/unix/config.sub: Updated from + `config' CVS module at subversions.gnu.org. + + * builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from + `texinfo' CVS module at subversions.gnu.org. + +2005-02-14 Werner Lemberg <wl(a)gnu.org> [truncated at 1000 lines; 56801 more skipped]

19 years, 6 months

[ion] 16674: - Fix "cd" usage when the initial directory is a directory right on top of the root drive. (Brandon Turner)

by ion＠svn.reactos.com

- Fix "cd" usage when the initial directory is a directory right on top of the root drive. (Brandon Turner) Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-20 23:35:59 UTC (rev 16673) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-21 03:26:42 UTC (rev 16674) @@ -340,7 +340,7 @@ szFinalPath[_tcslen(szFinalPath) - 1] = _T('\0'); /* Handle Root Directory Alone*/ - if (_tcslen(szPath) == 3 && szPath[1] == _T(':')) + if (_tcslen(szFinalPath) == 3 && szFinalPath[1] == _T(':')) { if(!SetRootPath(szFinalPath)) { @@ -377,7 +377,7 @@ break; _tcscat(szFinalPath,f.cFileName); - + if(IsExistingDirectory(szFinalPath)) { if(!SetRootPath(szFinalPath))

19 years, 6 months

[weiden] 16673: - Removed the Rtlp* string functions from the shared rtl library since they don't make sense in umode

by weiden＠svn.reactos.com

- Removed the Rtlp* string functions from the shared rtl library since they don't make sense in umode - Moved RtlpCreateUnicodeString to ntoskrnl for now, it however is depreciated but still used in various places - Added RtlpAllocateMemory and RtlpFreeMemory for rtl memory allocations (from paged pool in ntoskrnl and from the process heap in ntdll) that replace the ExAllocatePool* and ExFreePool implementations in ntdll Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Deleted: trunk/reactos/lib/rtl/libsupp.h Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-07-20 21:38:17 UTC (rev 16672) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-07-20 23:35:59 UTC (rev 16673) @@ -23,53 +23,29 @@ PVOID -STDCALL -ExAllocatePool( - IN POOL_TYPE PoolType, - IN SIZE_T Bytes -) +RtlpAllocateMemory(UINT Bytes, + ULONG Tag) { - return RtlAllocateHeap ( - RtlGetProcessHeap (), - 0, - Bytes); + UNREFERENCED_PARAMETER(Tag); + + return RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Bytes); } -PVOID -STDCALL -ExAllocatePoolWithTag( - IN POOL_TYPE PoolType, - IN SIZE_T Bytes, - IN ULONG Tag -) -{ - return RtlAllocateHeap ( - RtlGetProcessHeap (), - 0, - Bytes); -} VOID -STDCALL -ExFreePool(IN PVOID Mem) +RtlpFreeMemory(PVOID Mem, + ULONG Tag) { - RtlFreeHeap ( - RtlGetProcessHeap (), - 0, - Mem); + UNREFERENCED_PARAMETER(Tag); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + Mem); } -VOID -STDCALL -ExFreePoolWithTag(IN PVOID Mem, IN ULONG Tag) -{ - RtlFreeHeap ( - RtlGetProcessHeap (), - 0, - Mem); -} - #ifdef DBG VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line) _____ Deleted: trunk/reactos/lib/rtl/libsupp.h --- trunk/reactos/lib/rtl/libsupp.h 2005-07-20 21:38:17 UTC (rev 16672) +++ trunk/reactos/lib/rtl/libsupp.h 2005-07-20 23:35:59 UTC (rev 16673) @@ -1,31 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS System Libraries - * FILE: lib/rtl/libsupp.h - * PURPOSE: Run-Time Library Kernel Support Header - * PROGRAMMER: Alex Ionescu - */ - -/* INCLUDES ******************************************************************/ - -#define TAG_RTL TAG('R','t', 'l', ' ') - -PVOID -STDCALL -ExAllocatePoolWithTag( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes, - IN ULONG Tag -); - -VOID -STDCALL -ExFreePoolWithTag( - IN PVOID Pool, - IN ULONG Tag -); - -#define ExAllocatePool(p,n) ExAllocatePoolWithTag(p,n, TAG_RTL) -#define ExFreePool(P) ExFreePoolWithTag(P, TAG_RTL) - -/* EOF */ _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-07-20 21:38:17 UTC (rev 16672) +++ trunk/reactos/lib/rtl/registry.c 2005-07-20 23:35:59 UTC (rev 16673) @@ -23,7 +23,9 @@ #define NDEBUG #include <debug.h> +#define TAG_RTLREGISTRY TAG('R', 't', 'l', 'R') + /* FUNCTIONS ***************************************************************/ static NTSTATUS @@ -305,11 +307,10 @@ KeyPath->Length = 0; KeyPath->MaximumLength = Length; - KeyPath->Buffer = ExAllocatePool (PagedPool, - KeyPath->MaximumLength); + KeyPath->Buffer = RtlpAllocateStringMemory(KeyPath->MaximumLength, TAG_USTR); if (KeyPath->Buffer == NULL) { - DPRINT1 ("ExAllocatePool() failed\n"); + DPRINT1 ("RtlpAllocateMemory() failed\n"); RtlFreeUnicodeString (&SidString); return STATUS_NO_TOKEN; } @@ -450,7 +451,7 @@ QueryEntry->Name); BufferSize = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + 4096; - ValueInfo = ExAllocatePool(PagedPool, BufferSize); + ValueInfo = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); if (ValueInfo == NULL) { Status = STATUS_NO_MEMORY; @@ -467,7 +468,7 @@ { if (QueryEntry->Flags & RTL_QUERY_REGISTRY_REQUIRED) { - ExFreePool(ValueInfo); + RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); Status = STATUS_OBJECT_NAME_NOT_FOUND; break; } @@ -483,7 +484,7 @@ { ValueString->Length = SourceString->Length; ValueString->MaximumLength = SourceString->MaximumLength; - ValueString->Buffer = ExAllocatePool(PagedPool, BufferSize); + ValueString->Buffer = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); if (!ValueString->Buffer) break; ValueString->Buffer[0] = 0; @@ -521,7 +522,7 @@ if (ValueString->Buffer == NULL) { ValueString->MaximumLength = ValueInfo->DataLength; - ValueString->Buffer = ExAllocatePool(PagedPool, ValueString->MaximumLength); + ValueString->Buffer = RtlpAllocateMemory(ValueString->MaximumLength, TAG_RTLREGISTRY); if (ValueString->Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -544,7 +545,7 @@ ValueString = (PUNICODE_STRING)QueryEntry->EntryContext; - ExpandBuffer = ExAllocatePool(PagedPool, ValueInfo->DataLength * 2); + ExpandBuffer = RtlpAllocateMemory(ValueInfo->DataLength * 2, TAG_RTLREGISTRY); if (ExpandBuffer == NULL) { Status = STATUS_NO_MEMORY; @@ -567,7 +568,7 @@ { ValueString->MaximumLength = EnvExpandedValue.Length + sizeof(WCHAR); ValueString->Length = EnvExpandedValue.Length; - ValueString->Buffer = ExAllocatePool(PagedPool, ValueString->MaximumLength); + ValueString->Buffer = RtlpAllocateMemory(ValueString->MaximumLength, TAG_RTLREGISTRY); if (ValueString->Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -585,7 +586,7 @@ ValueString->Length); ((PWSTR)ValueString->Buffer)[ValueString->Length / sizeof(WCHAR)] = 0; - ExFreePool(ExpandBuffer); + RtlpFreeMemory(ExpandBuffer, TAG_RTLREGISTRY); } else { @@ -601,7 +602,7 @@ } - ExFreePool(ValueInfo); + RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); } else { @@ -612,7 +613,7 @@ QueryEntry->Name); BufferSize = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + 4096; - ValueInfo = ExAllocatePool(PagedPool, BufferSize); + ValueInfo = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); if (ValueInfo == NULL) { Status = STATUS_NO_MEMORY; @@ -661,7 +662,7 @@ { DPRINT("Expand REG_EXPAND_SZ type\n"); - ExpandBuffer = ExAllocatePool(PagedPool, ValueInfo->DataLength * 2); + ExpandBuffer = RtlpAllocateMemory(ValueInfo->DataLength * 2, TAG_RTLREGISTRY); if (ExpandBuffer == NULL) { Status = STATUS_NO_MEMORY; @@ -688,7 +689,7 @@ Context, QueryEntry->EntryContext); - ExFreePool(ExpandBuffer); + RtlpFreeMemory(ExpandBuffer, TAG_RTLREGISTRY); } else { @@ -706,7 +707,7 @@ } - ExFreePool(ValueInfo); + RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); if (!NT_SUCCESS(Status)) break; } @@ -727,14 +728,14 @@ DPRINT("Enumerate values\n"); BufferSize = sizeof(KEY_VALUE_FULL_INFORMATION) + 4096; - FullValueInfo = ExAllocatePool(PagedPool, BufferSize); + FullValueInfo = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); if (FullValueInfo == NULL) { Status = STATUS_NO_MEMORY; break; } ValueNameSize = 256 * sizeof(WCHAR); - ValueName = ExAllocatePool(PagedPool, ValueNameSize); + ValueName = RtlpAllocateMemory(ValueNameSize, TAG_RTLREGISTRY); if (ValueName == NULL) { Status = STATUS_NO_MEMORY; @@ -767,9 +768,9 @@ if (FullValueInfo->NameLength > ValueNameSize - sizeof(WCHAR)) { /* Should not happen, because the name length is limited to 255 characters */ - ExFreePool(ValueName); + RtlpFreeMemory(ValueName, TAG_RTLREGISTRY); ValueNameSize = FullValueInfo->NameLength + sizeof(WCHAR); - ValueName = ExAllocatePool(PagedPool, ValueNameSize); + ValueName = RtlpAllocateMemory(ValueNameSize, TAG_RTLREGISTRY); if (ValueName == NULL) { Status = STATUS_NO_MEMORY; @@ -808,7 +809,7 @@ DPRINT("Expand REG_EXPAND_SZ type\n"); StringPtr = (PWSTR)((ULONG_PTR)FullValueInfo + FullValueInfo->DataOffset); - ExpandBuffer = ExAllocatePool(PagedPool, FullValueInfo->DataLength * 2); + ExpandBuffer = RtlpAllocateMemory(FullValueInfo->DataLength * 2, TAG_RTLREGISTRY); if (ExpandBuffer == NULL) { Status = STATUS_NO_MEMORY; @@ -835,7 +836,7 @@ Context, QueryEntry->EntryContext); - ExFreePool(ExpandBuffer); + RtlpFreeMemory(ExpandBuffer, TAG_RTLREGISTRY); } else { @@ -855,8 +856,8 @@ Index++; } - ExFreePool(FullValueInfo); - ExFreePool(ValueName); + RtlpFreeMemory(FullValueInfo, TAG_RTLREGISTRY); + RtlpFreeMemory(ValueName, TAG_RTLREGISTRY); if (!NT_SUCCESS(Status)) break; } @@ -963,7 +964,7 @@ { BufferLength = SubKeyName->MaximumLength + sizeof(KEY_BASIC_INFORMATION); - KeyInfo = ExAllocatePool(PagedPool, BufferLength); + KeyInfo = RtlpAllocateMemory(BufferLength, TAG_RTLREGISTRY); if (KeyInfo == NULL) return(STATUS_NO_MEMORY); } @@ -992,7 +993,7 @@ if (KeyInfo != NULL) { - ExFreePool(KeyInfo); + RtlpFreeMemory(KeyInfo, TAG_RTLREGISTRY); } return(Status); @@ -1050,7 +1051,7 @@ if (DataLength != NULL) BufferLength = *DataLength; - ValueInfo = ExAllocatePool(PagedPool, BufferLength); + ValueInfo = RtlpAllocateMemory(BufferLength, TAG_RTLREGISTRY); if (ValueInfo == NULL) return(STATUS_NO_MEMORY); @@ -1076,7 +1077,7 @@ } } - ExFreePool(ValueInfo); + RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); return(Status); } _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-07-20 21:38:17 UTC (rev 16672) +++ trunk/reactos/lib/rtl/rtl.h 2005-07-20 23:35:59 UTC (rev 16673) @@ -16,9 +16,6 @@ /* Helper Header */ #include <reactos/helper.h> -/* LIBSUPP Header */ -#include "libsupp.h" - /* FIXME: Move this somewhere else, maybe */ #ifdef DBG extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); @@ -27,4 +24,14 @@ #define PAGED_CODE_RTL() #endif +extern PVOID RtlpAllocateMemory(UINT Bytes, ULONG Tag); +extern VOID RtlpFreeMemory(PVOID Mem, ULONG Tag); + +#define RtlpAllocateStringMemory RtlpAllocateMemory +#define RtlpFreeStringMemory RtlpFreeMemory + +#define TAG_USTR TAG('U', 'S', 'T', 'R') +#define TAG_ASTR TAG('A', 'S', 'T', 'R') +#define TAG_OSTR TAG('O', 'S', 'T', 'R') + /* EOF */ _____ Modified: trunk/reactos/lib/rtl/sid.c --- trunk/reactos/lib/rtl/sid.c 2005-07-20 21:38:17 UTC (rev 16672) +++ trunk/reactos/lib/rtl/sid.c 2005-07-20 23:35:59 UTC (rev 16673) @@ -16,6 +16,8 @@ #define NDEBUG #include <debug.h> +#define TAG_SID TAG('p', 'S', 'i', 'd') + /* FUNCTIONS ***************************************************************/ BOOLEAN STDCALL @@ -244,8 +246,8 @@ if (Sid == NULL) return STATUS_INVALID_PARAMETER; - pSid = (PSID)ExAllocatePool(PagedPool, - sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG)); + pSid = RtlpAllocateMemory(sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG), + TAG_SID); if (pSid == NULL) return STATUS_NO_MEMORY; @@ -294,7 +296,7 @@ { PAGED_CODE_RTL(); - ExFreePool(Sid); + RtlpFreeMemory(Sid, TAG_SID); return NULL; } @@ -370,7 +372,8 @@ Length = (wcs - Buffer) * sizeof(WCHAR); if (AllocateBuffer) { - String->Buffer = ExAllocatePool(PagedPool,Length + sizeof(WCHAR)); + String->Buffer = RtlpAllocateMemory(Length + sizeof(WCHAR), + TAG_SID); if (String->Buffer == NULL) return STATUS_NO_MEMORY; String->MaximumLength = Length + sizeof(WCHAR); _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-07-20 21:38:17 UTC (rev 16672) +++ trunk/reactos/lib/rtl/unicode.c 2005-07-20 23:35:59 UTC (rev 16673) @@ -27,11 +27,6 @@ /* GLOBALS *******************************************************************/ -#define TAG_USTR TAG('U', 'S', 'T', 'R') -#define TAG_ASTR TAG('A', 'S', 'T', 'R') -#define TAG_OSTR TAG('O', 'S', 'T', 'R') - - extern BOOLEAN NlsMbCodePageTag; extern BOOLEAN NlsMbOemCodePageTag; @@ -386,14 +381,14 @@ STDCALL RtlFreeAnsiString(IN PANSI_STRING AnsiString) { - if (AnsiString->Buffer == NULL) - return; + if (AnsiString->Buffer != NULL) + { + RtlpFreeStringMemory(AnsiString->Buffer, TAG_ASTR); - ExFreePoolWithTag(AnsiString->Buffer, TAG_ASTR); - - AnsiString->Buffer = NULL; - AnsiString->Length = 0; - AnsiString->MaximumLength = 0; + AnsiString->Buffer = NULL; + AnsiString->Length = 0; + AnsiString->MaximumLength = 0; + } } @@ -404,14 +399,14 @@ STDCALL RtlFreeOemString(IN POEM_STRING OemString) { - if (OemString->Buffer == NULL) - return; + if (OemString->Buffer != NULL) + { + RtlpFreeStringMemory(OemString->Buffer, TAG_OSTR); - ExFreePoolWithTag(OemString->Buffer, TAG_OSTR); - - OemString->Buffer = NULL; - OemString->Length = 0; - OemString->MaximumLength = 0; + OemString->Buffer = NULL; + OemString->Length = 0; + OemString->MaximumLength = 0; + } } @@ -422,14 +417,14 @@ STDCALL RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString) { - if (UnicodeString->Buffer == NULL) - return; + if (UnicodeString->Buffer != NULL) + { + RtlpFreeStringMemory(UnicodeString->Buffer, TAG_USTR); - ExFreePoolWithTag(UnicodeString->Buffer, TAG_USTR); - - UnicodeString->Buffer = NULL; - UnicodeString->Length = 0; - UnicodeString->MaximumLength = 0; + UnicodeString->Buffer = NULL; + UnicodeString->Length = 0; + UnicodeString->MaximumLength = 0; + } } /* @@ -696,17 +691,17 @@ Base, sizeof(Buffer), Buffer); - if (!NT_SUCCESS(Status)) - return Status; + if (NT_SUCCESS(Status)) + { + AnsiString.Buffer = Buffer; + AnsiString.Length = strlen (Buffer); + AnsiString.MaximumLength = sizeof(Buffer); - AnsiString.Buffer = Buffer; - AnsiString.Length = strlen (Buffer); - AnsiString.MaximumLength = sizeof(Buffer); + Status = RtlAnsiStringToUnicodeString (String, + &AnsiString, + FALSE); + } - Status = RtlAnsiStringToUnicodeString (String, - &AnsiString, - FALSE); - return Status; } @@ -733,17 +728,17 @@ Base, sizeof(Buffer), Buffer); - if (!NT_SUCCESS(Status)) - return Status; + if (NT_SUCCESS(Status)) + { + AnsiString.Buffer = Buffer; + AnsiString.Length = strlen (Buffer); + AnsiString.MaximumLength = sizeof(Buffer); - AnsiString.Buffer = Buffer; - AnsiString.Length = strlen (Buffer); - AnsiString.MaximumLength = sizeof(Buffer); + Status = RtlAnsiStringToUnicodeString (String, + &AnsiString, + FALSE); + } - Status = RtlAnsiStringToUnicodeString (String, - &AnsiString, - FALSE); - return Status; } @@ -972,22 +967,22 @@ } /* - * private + * @implemented * + * NOTES * This function always writes a terminating '\0'. * It performs a partial copy if ansi is too small. */ NTSTATUS -FASTCALL -RtlpUnicodeStringToAnsiString( +STDCALL +RtlUnicodeStringToAnsiString( IN OUT PANSI_STRING AnsiDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType) + IN BOOLEAN AllocateDestinationString) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Length; //including nullterm + ULONG Length; /* including nullterm */ if (NlsMbCodePageTag == TRUE) { @@ -1000,7 +995,7 @@ if (AllocateDestinationString) { - AnsiDest->Buffer = ExAllocatePoolWithTag(PoolType, Length, TAG_ASTR); + AnsiDest->Buffer = RtlpAllocateStringMemory(Length, TAG_ASTR); if (AnsiDest->Buffer == NULL) return STATUS_NO_MEMORY; @@ -1012,7 +1007,7 @@ } else if (Length > AnsiDest->MaximumLength) { - //make room for nullterm + /* make room for nullterm */ AnsiDest->Length = AnsiDest->MaximumLength - sizeof(CHAR); } @@ -1024,7 +1019,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePoolWithTag(AnsiDest->Buffer, TAG_ASTR); + RtlpFreeStringMemory(AnsiDest->Buffer, TAG_ASTR); return Status; } @@ -1032,44 +1027,23 @@ return Status; } + /* * @implemented * - * NOTES - * See RtlpUnicodeStringToAnsiString - */ -NTSTATUS -STDCALL -RtlUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToAnsiString( - AnsiDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - -/* - * private - * - * NOTES * This function always writes a terminating '\0'. * Does NOT perform a partial copy if unicode is too small! */ NTSTATUS -FASTCALL -RtlpOemStringToUnicodeString( +STDCALL +RtlOemStringToUnicodeString( IN OUT PUNICODE_STRING UniDest, IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType) + IN BOOLEAN AllocateDestinationString) { NTSTATUS Status; - ULONG Length; //including nullterm + ULONG Length; /* including nullterm */ if (NlsMbOemCodePageTag == TRUE) Length = RtlOemStringToUnicodeSize(OemSource); @@ -1083,7 +1057,7 @@ if (AllocateDestinationString) { - UniDest->Buffer = ExAllocatePoolWithTag(PoolType, Length, TAG_USTR); + UniDest->Buffer = RtlpAllocateStringMemory(Length, TAG_USTR); if (UniDest->Buffer == NULL) return STATUS_NO_MEMORY; @@ -1095,7 +1069,7 @@ return STATUS_BUFFER_TOO_SMALL; } - //FIXME: Do we need this????? -Gunnar + /* FIXME: Do we need this????? -Gunnar */ RtlZeroMemory (UniDest->Buffer, UniDest->Length); @@ -1107,7 +1081,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePoolWithTag(UniDest->Buffer, TAG_USTR); + RtlpFreeStringMemory(UniDest->Buffer, TAG_USTR); return Status; } @@ -1120,35 +1094,14 @@ * @implemented * * NOTES - * See RtlpOemStringToUnicodeString - */ -NTSTATUS -STDCALL -RtlOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpOemStringToUnicodeString( - UniDest, - OemSource, - AllocateDestinationString, - PagedPool); -} - -/* - * private - * - * NOTES * This function always '\0' terminates the string returned. */ NTSTATUS -FASTCALL -RtlpUnicodeStringToOemString( +STDCALL +RtlUnicodeStringToOemString( IN OUT POEM_STRING OemDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType) + IN BOOLEAN AllocateDestinationString) { NTSTATUS Status = STATUS_SUCCESS; ULONG Length; //including nullterm @@ -1165,7 +1118,7 @@ if (AllocateDestinationString) { - OemDest->Buffer = ExAllocatePoolWithTag(PoolType, Length, TAG_OSTR); + OemDest->Buffer = RtlpAllocateStringMemory(Length, TAG_OSTR); if (OemDest->Buffer == NULL) return STATUS_NO_MEMORY; @@ -1189,7 +1142,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePoolWithTag(OemDest->Buffer, TAG_OSTR); + RtlpFreeStringMemory(OemDest->Buffer, TAG_OSTR); return Status; } @@ -1197,26 +1150,6 @@ return Status; } -/* - * @implemented - * - * NOTES - * See RtlpUnicodeStringToOemString. - */ -NTSTATUS -STDCALL -RtlUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToOemString( - OemDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - #define ITU_IMPLEMENTED_TESTS (IS_TEXT_UNICODE_ODD_LENGTH|IS_TEXT_UNICODE_SIGNATURE) @@ -1278,23 +1211,23 @@ return Length; } + /* - * private + * @implemented * * NOTES * Same as RtlOemStringToUnicodeString but doesn't write terminating null * A partial copy is NOT performed if the dest buffer is too small! */ NTSTATUS -FASTCALL -RtlpOemStringToCountedUnicodeString( +STDCALL +RtlOemStringToCountedUnicodeString( IN OUT PUNICODE_STRING UniDest, IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType) + IN BOOLEAN AllocateDestinationString) { NTSTATUS Status; - ULONG Length; //excluding nullterm + ULONG Length; /* excluding nullterm */ if (NlsMbCodePageTag == TRUE) Length = RtlOemStringToUnicodeSize(OemSource) - sizeof(WCHAR); @@ -1306,7 +1239,7 @@ if (AllocateDestinationString == TRUE) { - UniDest->Buffer = ExAllocatePoolWithTag (PoolType, Length, TAG_USTR); + UniDest->Buffer = RtlpAllocateStringMemory (Length, TAG_USTR); if (UniDest->Buffer == NULL) return STATUS_NO_MEMORY; @@ -1327,7 +1260,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePoolWithTag(UniDest->Buffer, TAG_USTR); + RtlpFreeStringMemory(UniDest->Buffer, TAG_USTR); return Status; } @@ -1337,26 +1270,6 @@ /* * @implemented * - * NOTES - * See RtlpOemStringToCountedUnicodeString - */ -NTSTATUS -STDCALL -RtlOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpOemStringToCountedUnicodeString( - UniDest, - OemSource, - AllocateDestinationString, - PagedPool); -} - -/* - * @implemented - * * RETURNS * TRUE if the names are equal, FALSE if not * @@ -1577,17 +1490,14 @@ RtlEraseUnicodeString( IN PUNICODE_STRING String) { - if (String->Buffer == NULL) - return; + if (String->Buffer != NULL && + String->MaximumLength != 0) + { + RtlZeroMemory (String->Buffer, + String->MaximumLength); - if (String->MaximumLength == 0) - return; - - memset (String->Buffer, - 0, - String->MaximumLength); - - String->Length = 0; + String->Length = 0; + } } /* @@ -1643,19 +1553,18 @@ } /* - * private + * @implemented * * NOTES * Same as RtlUnicodeStringToOemString but doesn't write terminating null * Does a partial copy if the dest buffer is too small */ NTSTATUS -FASTCALL -RtlpUnicodeStringToCountedOemString( +STDCALL +RtlUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType) + IN BOOLEAN AllocateDestinationString) { NTSTATUS Status; ULONG Length; //excluding nullterm @@ -1672,7 +1581,7 @@ if (AllocateDestinationString) { - OemDest->Buffer = ExAllocatePoolWithTag(PoolType, Length, TAG_OSTR); + OemDest->Buffer = RtlpAllocateStringMemory(Length, TAG_OSTR); if (OemDest->Buffer == NULL) return STATUS_NO_MEMORY; @@ -1695,7 +1604,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePoolWithTag(OemDest->Buffer, TAG_OSTR); + RtlpFreeStringMemory(OemDest->Buffer, TAG_OSTR); } return Status; @@ -1703,29 +1612,9 @@ /* * @implemented - * - * NOTES - * See RtlpUnicodeStringToCountedOemString. */ NTSTATUS STDCALL -RtlUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToCountedOemString( - OemDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - -/* - * @implemented - */ -NTSTATUS -STDCALL RtlLargeIntegerToChar( IN PLARGE_INTEGER Value, IN ULONG Base, @@ -1771,19 +1660,18 @@ } /* - * private + * @implemented * * NOTES * dest is never '\0' terminated because it may be equal to src, and src * might not be '\0' terminated. dest->Length is only set upon success. */ NTSTATUS -FASTCALL -RtlpUpcaseUnicodeString( +STDCALL +RtlUpcaseUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType) + IN BOOLEAN AllocateDestinationString) { ULONG i; PWCHAR Src, Dest; @@ -1791,7 +1679,7 @@ if (AllocateDestinationString == TRUE) { UniDest->MaximumLength = UniSource->Length; - UniDest->Buffer = ExAllocatePoolWithTag(PoolType, UniDest->MaximumLength, TAG_USTR); + UniDest->Buffer = RtlpAllocateStringMemory(UniDest->MaximumLength, TAG_USTR); if (UniDest->Buffer == NULL) return STATUS_NO_MEMORY; } @@ -1818,40 +1706,18 @@ * @implemented * * NOTES - * See RtlpUpcaseUnicodeString - */ -NTSTATUS -STDCALL -RtlUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - - return RtlpUpcaseUnicodeString( - UniDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - -/* - * private - * - * NOTES * This function always writes a terminating '\0'. * It performs a partial copy if ansi is too small. */ NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToAnsiString( +STDCALL [truncated at 1000 lines; 556 more skipped]

19 years, 6 months

[weiden] 16672: fixed kdbg build

by weiden＠svn.reactos.com

fixed kdbg build Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S --- trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S 2005-07-20 19:44:47 UTC (rev 16671) +++ trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S 2005-07-20 21:38:17 UTC (rev 16672) @@ -1,4 +1,4 @@ -#include <internal/asm.h> +#include <ndk/asm.h> #include <ndk/i386/segment.h> .text _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-07-20 19:44:47 UTC (rev 16671) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-07-20 21:38:17 UTC (rev 16672) @@ -342,7 +342,7 @@ RtlZeroMemory(CacheEntry, sizeof (IMAGE_SYMBOL_INFO_CACHE)); /* fill entry */ - RtlpCreateUnicodeString(&CacheEntry->FileName, FileName->Buffer, PagedPool); + RtlCreateUnicodeString(&CacheEntry->FileName, FileName->Buffer); ASSERT(CacheEntry->FileName.Buffer); CacheEntry->RefCount = 1; CacheEntry->RosSymInfo = RosSymInfo;

19 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
57
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 July 2005