Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[npwoods] 20457: Modified rbuild to generate a map file of the boot loader

by npwoods＠svn.reactos.org

Modified rbuild to generate a map file of the boot loader Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-12-30 10:29:07 UTC (rev 20456) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-12-30 13:33:31 UTC (rev 20457) @@ -1321,7 +1321,7 @@ } void -MingwModuleHandler::GenerateBuildMapCode () +MingwModuleHandler::GenerateBuildMapCode ( const char *mapTarget ) { fprintf ( fMakefile, "ifeq ($(ROS_BUILDMAP),full)\n" ); @@ -1334,7 +1334,8 @@ fprintf ( fMakefile, "\t$(ECHO_OBJDUMP)\n" ); fprintf ( fMakefile, - "\t$(Q)${objdump} -d -S $@ > %s\n", + "\t$(Q)${objdump} -d -S %s > %s\n", + mapTarget ? mapTarget : "$@", mapFilename.c_str () ); fprintf ( fMakefile, @@ -1345,7 +1346,8 @@ fprintf ( fMakefile, "\t$(ECHO_NM)\n" ); fprintf ( fMakefile, - "\t$(Q)${nm} --numeric-sort $@ > %s\n", + "\t$(Q)${nm} --numeric-sort %s > %s\n", + mapTarget ? mapTarget : "$@", mapFilename.c_str () ); fprintf ( fMakefile, @@ -2672,6 +2674,7 @@ fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", junk_tmp.c_str () ); + GenerateBuildMapCode ( junk_tmp.c_str() ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", junk_tmp.c_str () ); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-12-30 10:29:07 UTC (rev 20456) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-12-30 13:33:31 UTC (rev 20457) @@ -119,6 +119,7 @@ const std::string& libsMacro, const std::string& pefixupParameters ); void GeneratePhonyTarget() const; + void GenerateBuildMapCode ( const char *mapTarget = NULL ); void GenerateRules (); void GenerateImportLibraryTargetIfNeeded (); void GetDefinitionDependencies ( string_list& dependencies ) const; @@ -199,7 +200,6 @@ bool IsWineModule () const; std::string GetDefinitionFilename () const; static std::string RemoveVariables ( std::string path); - void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); void CleanupCompilationUnitVector ( std::vector<CompilationUnit*>& compilationUnits ); void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const;

18 years, 8 months

[hpoussin] 20456: Forward ChangeServiceConfig2W call to services.exe

by hpoussin＠svn.reactos.org

Forward ChangeServiceConfig2W call to services.exe Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-12-30 01:41:02 UTC (rev 20455) +++ trunk/reactos/include/idl/svcctl.idl 2005-12-30 10:29:07 UTC (rev 20456) @@ -324,7 +324,11 @@ /* ScmrChangeServiceConfig2A */ /* Function 37 */ - /* ScmrChangeServiceConfig2W */ + DWORD ScmrChangeServiceConfig2W([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwInfoLevel, + [in, size_is(dwInfoSize)] unsigned char *lpInfo, + [in] DWORD dwInfoSize); /* Function 38 */ /* ScmrQueryServiceConfig2A */ _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-12-30 01:41:02 UTC (rev 20455) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-12-30 10:29:07 UTC (rev 20456) @@ -59,7 +59,7 @@ BuildTrusteeWithSidW@8 ;CancelOverlappedAccess@4 ;ChangeServiceConfig2A@12 -;ChangeServiceConfig2W@12 +ChangeServiceConfig2W@12 ChangeServiceConfigA@44 ChangeServiceConfigW@44 CheckTokenMembership@12 _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-30 01:41:02 UTC (rev 20455) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-30 10:29:07 UTC (rev 20456) @@ -78,6 +78,53 @@ /********************************************************************** + * ChangeServiceConfig2W + * + * @implemented + */ +BOOL WINAPI +ChangeServiceConfig2W(SC_HANDLE hService, + DWORD dwInfoLevel, + LPVOID lpInfo) +{ + DWORD lpInfoSize; + DWORD dwError; + + DPRINT("ChangeServiceConfig2W() called\n"); + + /* Determine the length of the lpInfo parameter */ + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + lpInfoSize = sizeof(SERVICE_DESCRIPTION); + case SERVICE_CONFIG_FAILURE_ACTIONS: + lpInfoSize = sizeof(SERVICE_FAILURE_ACTIONS); + default: + DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (lpInfo == NULL) + return TRUE; + + HandleBind(); + + dwError = ScmrChangeServiceConfig2W(BindingHandle, + (unsigned int)hService, + dwInfoLevel, + lpInfo, + lpInfoSize); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } +} + + +/********************************************************************** * ChangeServiceConfigA * * @implemented @@ -1553,7 +1600,7 @@ #if 0 DWORD dwError; - DPRINT("StartServiceW()\n", ScLock); + DPRINT("StartServiceW()\n"); HandleBind(); _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-12-30 01:41:02 UTC (rev 20455) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-12-30 10:29:07 UTC (rev 20456) @@ -2061,7 +2061,16 @@ /* Function 37 */ -/* ScmrChangeServiceConfig2W */ +unsigned long +ScmrChangeServiceConfig2W(handle_t BindingHandle, + unsigned int hService, + unsigned long dwInfoLevel, + unsigned char *lpInfo, + unsigned long dwInfoSize) +{ + DPRINT1("ScmrChangeServiceConfig2W() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 38 */

18 years, 8 months

[weiden] 20455: protect access to buffers with SEH in NtSetSecurityObject and NtQuerySecurityObject and ask for the proper access rights

by weiden＠svn.reactos.org

protect access to buffers with SEH in NtSetSecurityObject and NtQuerySecurityObject and ask for the proper access rights Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/se/semgr.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/se.h --- trunk/reactos/ntoskrnl/include/internal/se.h 2005-12-30 01:39:34 UTC (rev 20454) +++ trunk/reactos/ntoskrnl/include/internal/se.h 2005-12-30 01:41:02 UTC (rev 20455) @@ -274,6 +274,14 @@ KeLeaveCriticalRegion(); \ while(0) +VOID STDCALL +SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, + OUT PACCESS_MASK DesiredAccess); + +VOID STDCALL +SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, + OUT PACCESS_MASK DesiredAccess); + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_SE_H */ /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-12-30 01:39:34 UTC (rev 20454) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-12-30 01:41:02 UTC (rev 20455) @@ -159,47 +159,74 @@ IN ULONG Length, OUT PULONG ResultLength) { - POBJECT_HEADER Header; - PVOID Object; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + PVOID Object; + POBJECT_HEADER Header; + ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); - DPRINT("NtQuerySecurityObject() called\n"); + PreviousMode = ExGetPreviousMode(); - Status = ObReferenceObjectByHandle(Handle, - (SecurityInformation & SACL_SECURITY_INFORMATION) ? ACCESS_SYSTEM_SECURITY : 0, - NULL, - KeGetPreviousMode(), - &Object, - NULL); - if (!NT_SUCCESS(Status)) + if (PreviousMode != KernelMode) { - DPRINT1("ObReferenceObjectByHandle() failed (Status %lx)\n", Status); - return Status; + _SEH_TRY + { + ProbeForWrite(SecurityDescriptor, + Length, + sizeof(ULONG)); + ProbeForWriteUlong(ResultLength); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; } - Header = BODY_TO_HEADER(Object); - if (Header->Type == NULL) + /* get the required access rights for the operation */ + SeQuerySecurityAccessMask(SecurityInformation, + &DesiredAccess); + + Status = ObReferenceObjectByHandle(Handle, + DesiredAccess, + NULL, + PreviousMode, + &Object, + NULL); + + if (NT_SUCCESS(Status)) { - DPRINT1("Invalid object type\n"); - ObDereferenceObject(Object); - return STATUS_UNSUCCESSFUL; - } + Header = BODY_TO_HEADER(Object); + ASSERT(Header->Type != NULL); - *ResultLength = Length; - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - SecurityInformation, - SecurityDescriptor, - ResultLength, - NULL, - NonPagedPool, - NULL); + Status = Header->Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + SecurityInformation, + SecurityDescriptor, + &Length, + &Header->SecurityDescriptor, + Header->Type->TypeInfo.PoolType, + &Header->Type->TypeInfo.GenericMapping); - ObDereferenceObject(Object); + ObDereferenceObject(Object); - return Status; + /* return the required length */ + _SEH_TRY + { + *ResultLength = Length; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; } @@ -211,46 +238,81 @@ IN SECURITY_INFORMATION SecurityInformation, IN PSECURITY_DESCRIPTOR SecurityDescriptor) { - POBJECT_HEADER Header; - PVOID Object; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + PVOID Object; + POBJECT_HEADER Header; + SECURITY_DESCRIPTOR_RELATIVE *CapturedSecurityDescriptor; + ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; + NTSTATUS Status; - PAGED_CODE(); + PAGED_CODE(); - DPRINT("NtSetSecurityObject() called\n"); + /* make sure the caller doesn't pass a NULL security descriptor! */ + if (SecurityDescriptor == NULL) + { + return STATUS_ACCESS_DENIED; + } - Status = ObReferenceObjectByHandle(Handle, - (SecurityInformation & SACL_SECURITY_INFORMATION) ? ACCESS_SYSTEM_SECURITY : 0, - NULL, - KeGetPreviousMode(), - &Object, - NULL); - if (!NT_SUCCESS(Status)) + PreviousMode = ExGetPreviousMode(); + + /* capture and make a copy of the security descriptor */ + Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + PreviousMode, + PagedPool, + TRUE, + (PSECURITY_DESCRIPTOR*)&CapturedSecurityDescriptor); + if (!NT_SUCCESS(Status)) { - DPRINT1("ObReferenceObjectByHandle() failed (Status %lx)\n", Status); - return Status; + DPRINT1("Capturing the security descriptor failed! Status: 0x%lx\n", Status); + return Status; } - Header = BODY_TO_HEADER(Object); - if (Header->Type == NULL) + /* make sure the security descriptor passed by the caller + is valid for the operation we're about to perform */ + if (((SecurityInformation & OWNER_SECURITY_INFORMATION) && + (CapturedSecurityDescriptor->Owner == 0)) || + ((SecurityInformation & GROUP_SECURITY_INFORMATION) && + (CapturedSecurityDescriptor->Group == 0))) { - DPRINT1("Invalid object type\n"); - ObDereferenceObject(Object); - return STATUS_UNSUCCESSFUL; + Status = STATUS_INVALID_SECURITY_DESCR; } + else + { + /* get the required access rights for the operation */ + SeSetSecurityAccessMask(SecurityInformation, + &DesiredAccess); - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - SetSecurityDescriptor, - SecurityInformation, - SecurityDescriptor, - NULL, - NULL, - NonPagedPool, - NULL); + Status = ObReferenceObjectByHandle(Handle, + DesiredAccess, + NULL, + PreviousMode, + &Object, + NULL); - ObDereferenceObject(Object); + if (NT_SUCCESS(Status)) + { + Header = BODY_TO_HEADER(Object); + ASSERT(Header->Type != NULL); - return Status; + Status = Header->Type->TypeInfo.SecurityProcedure(Object, + SetSecurityDescriptor, + SecurityInformation, + (PSECURITY_DESCRIPTOR)SecurityDescriptor, + NULL, + &Header->SecurityDescriptor, + Header->Type->TypeInfo.PoolType, + &Header->Type->TypeInfo.GenericMapping); + + ObDereferenceObject(Object); + } + } + + /* release the descriptor */ + SeReleaseSecurityDescriptor((PSECURITY_DESCRIPTOR)CapturedSecurityDescri ptor, + PreviousMode, + TRUE); + + return Status; } _____ Modified: trunk/reactos/ntoskrnl/se/semgr.c --- trunk/reactos/ntoskrnl/se/semgr.c 2005-12-30 01:39:34 UTC (rev 20454) +++ trunk/reactos/ntoskrnl/se/semgr.c 2005-12-30 01:41:02 UTC (rev 20455) @@ -1037,7 +1037,7 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { - SECURITY_SUBJECT_CONTEXT SubjectSecurityContext; + SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; KPROCESSOR_MODE PreviousMode; PTOKEN Token; NTSTATUS Status; @@ -1082,8 +1082,6 @@ return STATUS_ACCESS_VIOLATION; } - RtlZeroMemory(&SubjectSecurityContext, - sizeof(SECURITY_SUBJECT_CONTEXT)); SubjectSecurityContext.ClientToken = Token; SubjectSecurityContext.ImpersonationLevel = Token->ImpersonationLevel; @@ -1118,4 +1116,37 @@ return Status; } +VOID STDCALL +SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, + OUT PACCESS_MASK DesiredAccess) +{ + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) + { + *DesiredAccess |= READ_CONTROL; + } + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + *DesiredAccess |= ACCESS_SYSTEM_SECURITY; + } +} + +VOID STDCALL +SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, + OUT PACCESS_MASK DesiredAccess) +{ + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) + { + *DesiredAccess |= WRITE_OWNER; + } + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + *DesiredAccess |= WRITE_DAC; + } + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + *DesiredAccess |= ACCESS_SYSTEM_SECURITY; + } +} + /* EOF */

18 years, 8 months

[navaraf] 20454: Fix a cut & paste error.

by navaraf＠svn.reactos.org

Fix a cut & paste error. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-12-30 01:28:29 UTC (rev 20453) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-12-30 01:39:34 UTC (rev 20454) @@ -1598,7 +1598,7 @@ DestRect.top = SpecifiedDestRect.top + dc->w.DCOrgY; DestRect.right = SpecifiedDestRect.right + dc->w.DCOrgX; DestRect.bottom = SpecifiedDestRect.bottom + dc->w.DCOrgY; - IntLPtoDP(dc, (LPRECT)&DestRect, 2); + IntLPtoDP(dc, (LPPOINT)&DestRect, 2); IntEngBitBlt( &BitmapObj->SurfObj, NULL,

18 years, 8 months

[navaraf] 20453: Transform correctly the coordinates.

by navaraf＠svn.reactos.org

Transform correctly the coordinates. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-12-30 01:19:41 UTC (rev 20452) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-12-30 01:28:29 UTC (rev 20453) @@ -1598,6 +1598,7 @@ DestRect.top = SpecifiedDestRect.top + dc->w.DCOrgY; DestRect.right = SpecifiedDestRect.right + dc->w.DCOrgX; DestRect.bottom = SpecifiedDestRect.bottom + dc->w.DCOrgY; + IntLPtoDP(dc, (LPRECT)&DestRect, 2); IntEngBitBlt( &BitmapObj->SurfObj, NULL,

18 years, 8 months

[navaraf] 20452: Transform correctly the coordinates.

by navaraf＠svn.reactos.org

Transform correctly the coordinates. Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-12-30 01:14:27 UTC (rev 20451) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-12-30 01:19:41 UTC (rev 20452) @@ -116,6 +116,8 @@ DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; + IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); + SourcePoint.x = XSrc; SourcePoint.y = YSrc; _____ Modified: trunk/reactos/subsys/win32k/objects/brush.c --- trunk/reactos/subsys/win32k/objects/brush.c 2005-12-30 01:14:27 UTC (rev 20451) +++ trunk/reactos/subsys/win32k/objects/brush.c 2005-12-30 01:19:41 UTC (rev 20452) @@ -480,6 +480,8 @@ DestRect.bottom = YLeft + dc->w.DCOrgY + 1; } + IntLPtoDP(dc, (LPPOINT)&DestRect, 2); + BrushOrigin.x = BrushObj->ptOrigin.x + dc->w.DCOrgX; BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY;

18 years, 8 months

[mbosma] 20451: Tag version 6b

by mbosma＠svn.reactos.org

Tag version 6b Added: vendor/libjpeg/6b/ _____ Copied: vendor/libjpeg/6b (from rev 20450, vendor/libjpeg/current)

18 years, 8 months

[mbosma] 20450: Import libjpeg

by mbosma＠svn.reactos.org

Import libjpeg Added: vendor/libjpeg/ Added: vendor/libjpeg/current/ Added: vendor/libjpeg/current/README Added: vendor/libjpeg/current/ansi2knr.1 Added: vendor/libjpeg/current/ansi2knr.c Added: vendor/libjpeg/current/cderror.h Added: vendor/libjpeg/current/cdjpeg.c Added: vendor/libjpeg/current/cdjpeg.h Added: vendor/libjpeg/current/change.log Added: vendor/libjpeg/current/cjpeg.1 Added: vendor/libjpeg/current/cjpeg.c Added: vendor/libjpeg/current/ckconfig.c Added: vendor/libjpeg/current/coderules.doc Added: vendor/libjpeg/current/config.guess Added: vendor/libjpeg/current/config.sub Added: vendor/libjpeg/current/configure Added: vendor/libjpeg/current/djpeg.1 Added: vendor/libjpeg/current/djpeg.c Added: vendor/libjpeg/current/example.c Added: vendor/libjpeg/current/filelist.doc Added: vendor/libjpeg/current/install-sh Added: vendor/libjpeg/current/install.doc Added: vendor/libjpeg/current/jcapimin.c Added: vendor/libjpeg/current/jcapistd.c Added: vendor/libjpeg/current/jccoefct.c Added: vendor/libjpeg/current/jccolor.c Added: vendor/libjpeg/current/jcdctmgr.c Added: vendor/libjpeg/current/jchuff.c Added: vendor/libjpeg/current/jchuff.h Added: vendor/libjpeg/current/jcinit.c Added: vendor/libjpeg/current/jcmainct.c Added: vendor/libjpeg/current/jcmarker.c Added: vendor/libjpeg/current/jcmaster.c Added: vendor/libjpeg/current/jcomapi.c Added: vendor/libjpeg/current/jconfig.bcc Added: vendor/libjpeg/current/jconfig.cfg Added: vendor/libjpeg/current/jconfig.dj Added: vendor/libjpeg/current/jconfig.doc Added: vendor/libjpeg/current/jconfig.mac Added: vendor/libjpeg/current/jconfig.manx Added: vendor/libjpeg/current/jconfig.mc6 Added: vendor/libjpeg/current/jconfig.sas Added: vendor/libjpeg/current/jconfig.st Added: vendor/libjpeg/current/jconfig.vc Added: vendor/libjpeg/current/jconfig.vms Added: vendor/libjpeg/current/jconfig.wat Added: vendor/libjpeg/current/jcparam.c Added: vendor/libjpeg/current/jcphuff.c Added: vendor/libjpeg/current/jcprepct.c Added: vendor/libjpeg/current/jcsample.c Added: vendor/libjpeg/current/jctrans.c Added: vendor/libjpeg/current/jdapimin.c Added: vendor/libjpeg/current/jdapistd.c Added: vendor/libjpeg/current/jdatadst.c Added: vendor/libjpeg/current/jdatasrc.c Added: vendor/libjpeg/current/jdcoefct.c Added: vendor/libjpeg/current/jdcolor.c Added: vendor/libjpeg/current/jdct.h Added: vendor/libjpeg/current/jddctmgr.c Added: vendor/libjpeg/current/jdhuff.c Added: vendor/libjpeg/current/jdhuff.h Added: vendor/libjpeg/current/jdinput.c Added: vendor/libjpeg/current/jdmainct.c Added: vendor/libjpeg/current/jdmarker.c Added: vendor/libjpeg/current/jdmaster.c Added: vendor/libjpeg/current/jdmerge.c Added: vendor/libjpeg/current/jdphuff.c Added: vendor/libjpeg/current/jdpostct.c Added: vendor/libjpeg/current/jdsample.c Added: vendor/libjpeg/current/jdtrans.c Added: vendor/libjpeg/current/jerror.c Added: vendor/libjpeg/current/jerror.h Added: vendor/libjpeg/current/jfdctflt.c Added: vendor/libjpeg/current/jfdctfst.c Added: vendor/libjpeg/current/jfdctint.c Added: vendor/libjpeg/current/jidctflt.c Added: vendor/libjpeg/current/jidctfst.c Added: vendor/libjpeg/current/jidctint.c Added: vendor/libjpeg/current/jidctred.c Added: vendor/libjpeg/current/jinclude.h Added: vendor/libjpeg/current/jmemansi.c Added: vendor/libjpeg/current/jmemdos.c Added: vendor/libjpeg/current/jmemdosa.asm Added: vendor/libjpeg/current/jmemmac.c Added: vendor/libjpeg/current/jmemmgr.c Added: vendor/libjpeg/current/jmemname.c Added: vendor/libjpeg/current/jmemnobs.c Added: vendor/libjpeg/current/jmemsys.h Added: vendor/libjpeg/current/jmorecfg.h Added: vendor/libjpeg/current/jpegint.h Added: vendor/libjpeg/current/jpeglib.h Added: vendor/libjpeg/current/jpegtran.1 Added: vendor/libjpeg/current/jpegtran.c Added: vendor/libjpeg/current/jquant1.c Added: vendor/libjpeg/current/jquant2.c Added: vendor/libjpeg/current/jutils.c Added: vendor/libjpeg/current/jversion.h Added: vendor/libjpeg/current/libjpeg.doc Added: vendor/libjpeg/current/ltconfig Added: vendor/libjpeg/current/ltmain.sh [truncated at 100 lines; 47 more skipped] _____ Added: vendor/libjpeg/current/README --- vendor/libjpeg/current/README 2005-12-30 00:18:48 UTC (rev 20449) +++ vendor/libjpeg/current/README 2005-12-30 01:00:43 UTC (rev 20450) @@ -0,0 +1,385 @@ +The Independent JPEG Group's JPEG software +========================================== + +README for release 6b of 27-Mar-1998 +==================================== + +This distribution contains the sixth public release of the Independent JPEG +Group's free JPEG software. You are welcome to redistribute this software and +to use it for any purpose, subject to the conditions under LEGAL ISSUES, below. + +Serious users of this software (particularly those incorporating it into +larger programs) should contact IJG at jpeg-info(a)uunet.uu.net to be added to +our electronic mailing list. Mailing list members are notified of updates +and have a chance to participate in technical discussions, etc. + +This software is the work of Tom Lane, Philip Gladstone, Jim Boucher, +Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, +Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG +Group. + +IJG is not affiliated with the official ISO JPEG standards committee. + + +DOCUMENTATION ROADMAP +===================== + +This file contains the following sections: + +OVERVIEW General description of JPEG and the IJG software. +LEGAL ISSUES Copyright, lack of warranty, terms of distribution. +REFERENCES Where to learn more about JPEG. +ARCHIVE LOCATIONS Where to find newer versions of this software. +RELATED SOFTWARE Other stuff you should get. +FILE FORMAT WARS Software *not* to get. +TO DO Plans for future IJG releases. + +Other documentation files in the distribution are: + +User documentation: + install.doc How to configure and install the IJG software. + usage.doc Usage instructions for cjpeg, djpeg, jpegtran, + rdjpgcom, and wrjpgcom. + *.1 Unix-style man pages for programs (same info as usage.doc). + wizard.doc Advanced usage instructions for JPEG wizards only. + change.log Version-to-version change highlights. +Programmer and internal documentation: + libjpeg.doc How to use the JPEG library in your own programs. + example.c Sample code for calling the JPEG library. + structure.doc Overview of the JPEG library's internal structure. + filelist.doc Road map of IJG files. + coderules.doc Coding style rules --- please read if you contribute code. + +Please read at least the files install.doc and usage.doc. Useful information +can also be found in the JPEG FAQ (Frequently Asked Questions) article. See +ARCHIVE LOCATIONS below to find out where to obtain the FAQ article. + +If you want to understand how the JPEG code works, we suggest reading one or +more of the REFERENCES, then looking at the documentation files (in roughly +the order listed) before diving into the code. + + +OVERVIEW +======== + +This package contains C software to implement JPEG image compression and +decompression. JPEG (pronounced "jay-peg") is a standardized compression +method for full-color and gray-scale images. JPEG is intended for compressing +"real-world" scenes; line drawings, cartoons and other non-realistic images +are not its strong suit. JPEG is lossy, meaning that the output image is not +exactly identical to the input image. Hence you must not use JPEG if you +have to have identical output bits. However, on typical photographic images, +very good compression levels can be obtained with no visible change, and +remarkably high compression levels are possible if you can tolerate a +low-quality image. For more details, see the references, or just experiment +with various compression settings. + +This software implements JPEG baseline, extended-sequential, and progressive +compression processes. Provision is made for supporting all variants of these +processes, although some uncommon parameter settings aren't implemented yet. +For legal reasons, we are not distributing code for the arithmetic-coding +variants of JPEG; see LEGAL ISSUES. We have made no provision for supporting +the hierarchical or lossless processes defined in the standard. + +We provide a set of library routines for reading and writing JPEG image files, +plus two sample applications "cjpeg" and "djpeg", which use the library to +perform conversion between JPEG and some other popular image file formats. +The library is intended to be reused in other applications. + +In order to support file conversion and viewing software, we have included +considerable functionality beyond the bare JPEG coding/decoding capability; +for example, the color quantization modules are not strictly part of JPEG +decoding, but they are essential for output to colormapped file formats or +colormapped displays. These extra functions can be compiled out of the +library if not required for a particular application. We have also included +"jpegtran", a utility for lossless transcoding between different JPEG +processes, and "rdjpgcom" and "wrjpgcom", two simple applications for +inserting and extracting textual comments in JFIF files. + +The emphasis in designing this software has been on achieving portability and +flexibility, while also making it fast enough to be useful. In particular, +the software is not intended to be read as a tutorial on JPEG. (See the +REFERENCES section for introductory material.) Rather, it is intended to +be reliable, portable, industrial-strength code. We do not claim to have +achieved that goal in every aspect of the software, but we strive for it. + +We welcome the use of this software as a component of commercial products. +No royalty is required, but we do ask for an acknowledgement in product +documentation, as described under LEGAL ISSUES. + + +LEGAL ISSUES +============ + +In plain English: + +1. We don't promise that this software works. (But if you find any bugs, + please let us know!) +2. You can use this software for whatever you want. You don't have to pay us. +3. You may not pretend that you wrote this software. If you use it in a + program, you must acknowledge somewhere in your documentation that + you've used the IJG code. + +In legalese: + +The authors make NO WARRANTY or representation, either express or implied, +with respect to this software, its quality, accuracy, merchantability, or +fitness for a particular purpose. This software is provided "AS IS", and you, +its user, assume the entire risk as to its quality and accuracy. + +This software is copyright (C) 1991-1998, Thomas G. Lane. +All Rights Reserved except as specified below. + +Permission is hereby granted to use, copy, modify, and distribute this +software (or portions thereof) for any purpose, without fee, subject to these +conditions: +(1) If any part of the source code for this software is distributed, then this +README file must be included, with this copyright and no-warranty notice +unaltered; and any additions, deletions, or changes to the original files +must be clearly indicated in accompanying documentation. +(2) If only executable code is distributed, then the accompanying +documentation must state that "this software is based in part on the work of +the Independent JPEG Group". +(3) Permission for use of this software is granted only if the user accepts +full responsibility for any undesirable consequences; the authors accept +NO LIABILITY for damages of any kind. + +These conditions apply to any software derived from or based on the IJG code, +not just to the unmodified library. If you use our work, you ought to +acknowledge us. + +Permission is NOT granted for the use of any IJG author's name or company name +in advertising or publicity relating to this software or products derived from +it. This software may be referred to only as "the Independent JPEG Group's +software". + +We specifically permit and encourage the use of this software as the basis of +commercial products, provided that all warranty or liability claims are +assumed by the product vendor. + + +ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, +sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. +ansi2knr.c is NOT covered by the above copyright and conditions, but instead +by the usual distribution terms of the Free Software Foundation; principally, +that you must include source code if you redistribute it. (See the file +ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part +of any program generated from the IJG code, this does not limit you more than +the foregoing paragraphs do. + +The Unix configuration script "configure" was produced with GNU Autoconf. +It is copyright by the Free Software Foundation but is freely distributable. +The same holds for its supporting scripts (config.guess, config.sub, +ltconfig, ltmain.sh). Another support script, install-sh, is copyright +by M.I.T. but is also freely distributable. + +It appears that the arithmetic coding option of the JPEG spec is covered by +patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot +legally be used without obtaining one or more licenses. For this reason, +support for arithmetic coding has been removed from the free JPEG software. +(Since arithmetic coding provides only a marginal gain over the unpatented +Huffman mode, it is unlikely that very many implementations will support it.) +So far as we are aware, there are no patent restrictions on the remaining +code. + +The IJG distribution formerly included code to read and write GIF files. +To avoid entanglement with the Unisys LZW patent, GIF reading support has +been removed altogether, and the GIF writer has been simplified to produce +"uncompressed GIFs". This technique does not use the LZW algorithm; the +resulting GIF files are larger than usual, but are readable by all standard +GIF decoders. + +We are required to state that + "The Graphics Interchange Format(c) is the Copyright property of + CompuServe Incorporated. GIF(sm) is a Service Mark property of + CompuServe Incorporated." + + +REFERENCES +========== + +We highly recommend reading one or more of these references before trying to +understand the innards of the JPEG software. + +The best short technical introduction to the JPEG compression algorithm is + Wallace, Gregory K. "The JPEG Still Picture Compression Standard", + Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44. +(Adjacent articles in that issue discuss MPEG motion picture compression, +applications of JPEG, and related topics.) If you don't have the CACM issue +handy, a PostScript file containing a revised version of Wallace's article is +available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz. The file (actually +a preprint for an article that appeared in IEEE Trans. Consumer Electronics) +omits the sample images that appeared in CACM, but it includes corrections +and some added material. Note: the Wallace article is copyright ACM and IEEE, +and it may not be used for commercial purposes. + +A somewhat less technical, more leisurely introduction to JPEG can be found in +"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by +M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1. This book provides +good explanations and example C code for a multitude of compression methods +including JPEG. It is an excellent source if you are comfortable reading C +code but don't know much about data compression in general. The book's JPEG +sample code is far from industrial-strength, but when you are ready to look +at a full implementation, you've got one here... + +The best full description of JPEG is the textbook "JPEG Still Image Data +Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published +by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1. Price US$59.95, 638 pp. +The book includes the complete text of the ISO JPEG standards (DIS 10918-1 +and draft DIS 10918-2). This is by far the most complete exposition of JPEG +in existence, and we highly recommend it. + +The JPEG standard itself is not available electronically; you must order a +paper copy through ISO or ITU. (Unless you feel a need to own a certified +official copy, we recommend buying the Pennebaker and Mitchell book instead; +it's much cheaper and includes a great deal of useful explanatory material.) +In the USA, copies of the standard may be ordered from ANSI Sales at (212) +642-4900, or from Global Engineering Documents at (800) 854-7179. (ANSI +doesn't take credit card orders, but Global does.) It's not cheap: as of +1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7% +shipping/handling. The standard is divided into two parts, Part 1 being the +actual specification, while Part 2 covers compliance testing methods. Part 1 +is titled "Digital Compression and Coding of Continuous-tone Still Images, +Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS +10918-1, ITU-T T.81. Part 2 is titled "Digital Compression and Coding of +Continuous-tone Still Images, Part 2: Compliance testing" and has document +numbers ISO/IEC IS 10918-2, ITU-T T.83. + +Some extensions to the original JPEG standard are defined in JPEG Part 3, +a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84. IJG +currently does not support any Part 3 extensions. + +The JPEG standard does not specify all details of an interchangeable file +format. For the omitted details we follow the "JFIF" conventions, revision +1.02. A copy of the JFIF spec is available from: + Literature Department + C-Cube Microsystems, Inc. + 1778 McCarthy Blvd. + Milpitas, CA 95035 + phone (408) 944-6300, fax (408) 944-6314 +A PostScript version of this document is available by FTP at +ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz. There is also a plain text +version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing +the figures. + +The TIFF 6.0 file format specification can be obtained by FTP from +ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz. The JPEG incorporation scheme +found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems. +IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6). +Instead, we recommend the JPEG design proposed by TIFF Technical Note #2 +(Compression tag 7). Copies of this Note can be obtained from ftp.sgi.com or +from ftp://ftp.uu.net/graphics/jpeg/. It is expected that the next revision +of the TIFF spec will replace the 6.0 JPEG design with the Note's design. +Although IJG's own code does not support TIFF/JPEG, the free libtiff library +uses our library to implement TIFF/JPEG per the Note. libtiff is available +from ftp://ftp.sgi.com/graphics/tiff/. + + +ARCHIVE LOCATIONS +================= + +The "official" archive site for this software is ftp.uu.net (Internet +address 192.48.96.9). The most recent released version can always be found +there in directory graphics/jpeg. This particular version will be archived +as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz. If you don't have +direct Internet access, UUNET's archives are also available via UUCP; contact +help(a)uunet.uu.net for information on retrieving files that way. + +Numerous Internet sites maintain copies of the UUNET files. However, only +ftp.uu.net is guaranteed to have the latest official version. + +You can also obtain this software in DOS-compatible "zip" archive format from +the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or +on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12 +"JPEG Tools". Again, these versions may sometimes lag behind the ftp.uu.net +release. + +The JPEG FAQ (Frequently Asked Questions) article is a useful source of +general information about JPEG. It is updated constantly and therefore is +not included in this distribution. The FAQ is posted every two weeks to +Usenet newsgroups comp.graphics.misc, news.answers, and other groups. +It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/ +and other news.answers archive sites, including the official news.answers +archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/. +If you don't have Web or FTP access, send e-mail to mail-server(a)rtfm.mit.edu +with body + send usenet/news.answers/jpeg-faq/part1 + send usenet/news.answers/jpeg-faq/part2 + + +RELATED SOFTWARE +================ + +Numerous viewing and image manipulation programs now support JPEG. (Quite a +few of them use this library to do so.) The JPEG FAQ described above lists +some of the more popular free and shareware viewers, and tells where to +obtain them on Internet. + +If you are on a Unix machine, we highly recommend Jef Poskanzer's free +PBMPLUS software, which provides many useful operations on PPM-format image +files. In particular, it can convert PPM images to and from a wide range of +other formats, thus making cjpeg/djpeg considerably more useful. The latest +version is distributed by the NetPBM group, and is available from numerous +sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/. +Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is; +you are likely to have difficulty making it work on any non-Unix machine. + +A different free JPEG implementation, written by the PVRG group at Stanford, +is available from ftp://havefun.stanford.edu/pub/jpeg/. This program +is designed for research and experimentation rather than production use; +it is slower, harder to use, and less portable than the IJG code, but it +is easier to read and modify. Also, the PVRG code supports lossless JPEG, +which we do not. (On the other hand, it doesn't do progressive JPEG.) + + +FILE FORMAT WARS +================ + +Some JPEG programs produce files that are not compatible with our library. +The root of the problem is that the ISO JPEG committee failed to specify a +concrete file format. Some vendors "filled in the blanks" on their own, +creating proprietary formats that no one else could read. (For example, none +of the early commercial JPEG implementations for the Macintosh were able to +exchange compressed files.) + +The file format we have adopted is called JFIF (see REFERENCES). This format +has been agreed to by a number of major commercial JPEG vendors, and it has +become the de facto standard. JFIF is a minimal or "low end" representation. +We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF +Technical Note #2) for "high end" applications that need to record a lot of +additional data about an image. TIFF/JPEG is fairly new and not yet widely +supported, unfortunately. + +The upcoming JPEG Part 3 standard defines a file format called SPIFF. +SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should +be able to read the most common variant of SPIFF. SPIFF has some technical +advantages over JFIF, but its major claim to fame is simply that it is an +official standard rather than an informal one. At this point it is unclear +whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto +standard. IJG intends to support SPIFF once the standard is frozen, but we +have not decided whether it should become our default output format or not. +(In any case, our decoder will remain capable of reading JFIF indefinitely.) + +Various proprietary file formats incorporating JPEG compression also exist. +We have little or no sympathy for the existence of these formats. Indeed, +one of the original reasons for developing this free software was to help +force convergence on common, open format standards for JPEG files. Don't +use a proprietary file format! + + +TO DO +===== + +The major thrust for v7 will probably be improvement of visual quality. +The current method for scaling the quantization tables is known not to be +very good at low Q values. We also intend to investigate block boundary +smoothing, "poor man's variable quantization", and other means of improving +quality-vs-file-size performance without sacrificing compatibility. + +In future versions, we are considering supporting some of the upcoming JPEG +Part 3 extensions --- principally, variable quantization and the SPIFF file +format. + +As always, speeding things up is of great interest. + +Please send bug reports, offers of help, etc. to jpeg-info(a)uunet.uu.net. _____ Added: vendor/libjpeg/current/ansi2knr.1 --- vendor/libjpeg/current/ansi2knr.1 2005-12-30 00:18:48 UTC (rev 20449) +++ vendor/libjpeg/current/ansi2knr.1 2005-12-30 01:00:43 UTC (rev 20450) @@ -0,0 +1,36 @@ +.TH ANSI2KNR 1 "19 Jan 1996" +.SH NAME +ansi2knr \- convert ANSI C to Kernighan & Ritchie C +.SH SYNOPSIS +.I ansi2knr +[--varargs] input_file [output_file] +.SH DESCRIPTION +If no output_file is supplied, output goes to stdout. +.br +There are no error messages. +.sp +.I ansi2knr +recognizes function definitions by seeing a non-keyword identifier at the left +margin, followed by a left parenthesis, with a right parenthesis as the last +character on the line, and with a left brace as the first token on the +following line (ignoring possible intervening comments). It will recognize a +multi-line header provided that no intervening line ends with a left or right +brace or a semicolon. These algorithms ignore whitespace and comments, except +that the function name must be the first thing on the line. +.sp +The following constructs will confuse it: +.br + - Any other construct that starts at the left margin and follows the +above syntax (such as a macro or function call). +.br + - Some macros that tinker with the syntax of the function header. +.sp +The --varargs switch is obsolete, and is recognized only for +backwards compatibility. The present version of +.I ansi2knr +will always attempt to convert a ... argument to va_alist and va_dcl. +.SH AUTHOR +L. Peter Deutsch <ghost(a)aladdin.com> wrote the original ansi2knr and +continues to maintain the current version; most of the code in the current +version is his work. ansi2knr also includes contributions by Francois +Pinard <pinard(a)iro.umontreal.ca> and Jim Avera <jima(a)netcom.com>. _____ Added: vendor/libjpeg/current/ansi2knr.c --- vendor/libjpeg/current/ansi2knr.c 2005-12-30 00:18:48 UTC (rev 20449) +++ vendor/libjpeg/current/ansi2knr.c 2005-12-30 01:00:43 UTC (rev 20450) @@ -0,0 +1,693 @@ +/* ansi2knr.c */ +/* Convert ANSI C function definitions to K&R ("traditional C") syntax */ + +/* +ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY. No author or distributor accepts responsibility to anyone for the +consequences of using it or for whether it serves any particular purpose or +works at all, unless he says so in writing. Refer to the GNU General Public +License (the "GPL") for full details. + +Everyone is granted permission to copy, modify and redistribute ansi2knr, +but only under the conditions described in the GPL. A copy of this license +is supposed to have been given to you along with ansi2knr so you can know +your rights and responsibilities. It should be in a file named COPYLEFT. +[In the IJG distribution, the GPL appears below, not in a separate file.] +Among other things, the copyright notice and this notice must be preserved +on all copies. + +We explicitly state here what we believe is already implied by the GPL: if +the ansi2knr program is distributed as a separate set of sources and a +separate executable file which are aggregated on a storage medium together +with another program, this in itself does not bring the other program under +the GPL, nor does the mere fact that such a program or the procedures for +constructing it invoke the ansi2knr executable bring any other part of the +program under the GPL. +*/ + +/* +---------- Here is the GNU GPL file COPYLEFT, referred to above ---------- +----- These terms do NOT apply to the JPEG software itself; see README ------ + + GHOSTSCRIPT GENERAL PUBLIC LICENSE + (Clarified 11 Feb 1988) + + Copyright (C) 1988 Richard M. Stallman + Everyone is permitted to copy and distribute verbatim copies of this + license, but changing it is not allowed. You can also use this wording + to make the terms for other programs. + + The license agreements of most software companies keep you at the +mercy of those companies. By contrast, our general public license is +intended to give everyone the right to share Ghostscript. To make sure +that you get the rights we want you to have, we need to make +restrictions that forbid anyone to deny you these rights or to ask you +to surrender the rights. Hence this license agreement. + + Specifically, we want to make sure that you have the right to give +away copies of Ghostscript, that you receive source code or else can get +it if you want it, that you can change Ghostscript or use pieces of it +in new free programs, and that you know you can do these things. + + To make sure that everyone has such rights, we have to forbid you to +deprive anyone else of these rights. For example, if you distribute +copies of Ghostscript, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + Also, for our own protection, we must make certain that everyone finds +out that there is no warranty for Ghostscript. If Ghostscript is +modified by someone else and passed on, we want its recipients to know +that what they have is not what we distributed, so that any problems +introduced by others will not reflect on our reputation. + + Therefore we (Richard M. Stallman and the Free Software Foundation, +Inc.) make the following terms which say what you must do to be allowed +to distribute or change Ghostscript. + + + COPYING POLICIES + + 1. You may copy and distribute verbatim copies of Ghostscript source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy a valid copyright and license +notice "Copyright (C) 1989 Aladdin Enterprises. All rights reserved. +Distributed by Free Software Foundation, Inc." (or with whatever year is +appropriate); keep intact the notices on all files that refer to this +License Agreement and to the absence of any warranty; and give any other +recipients of the Ghostscript program a copy of this License Agreement +along with the program. You may charge a distribution fee for the +physical act of transferring a copy. + + 2. You may modify your copy or copies of Ghostscript or any portion of +it, and copy and distribute such modifications under the terms of +Paragraph 1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating + that you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, + that in whole or in part contains or is a derivative of Ghostscript + or any part thereof, to be licensed at no charge to all third + parties on terms identical to those contained in this License + Agreement (except that you may choose to grant more extensive + warranty protection to some or all third parties, at your option). + + c) You may charge a distribution fee for the physical act of + transferring a copy, and you may at your option offer warranty + protection in exchange for a fee. + +Mere aggregation of another unrelated program with this program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other program under the scope of these terms. + + 3. You may copy and distribute Ghostscript (or a portion or derivative +of it, under Paragraph 2) in object code or executable form under the +terms of Paragraphs 1 and 2 above provided that you also do one of the +following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal + shipping charge) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +For an executable file, complete source code means all the source code for +all modules it contains; but, as a special exception, it need not include +source code for modules which are standard libraries that accompany the +operating system on which the executable file runs. + + 4. You may not copy, sublicense, distribute or transfer Ghostscript +except as expressly provided under this License Agreement. Any attempt +otherwise to copy, sublicense, distribute or transfer Ghostscript is +void and your rights to use the program under this License agreement +shall be automatically terminated. However, parties who have received +computer software programs from you with this License Agreement will not +have their licenses terminated so long as such parties remain in full +compliance. + + 5. If you wish to incorporate parts of Ghostscript into other free +programs whose distribution conditions are different, write to the Free +Software Foundation at 675 Mass Ave, Cambridge, MA 02139. We have not +yet worked out a simple rule that can be stated here, but we will often +permit this. We will be guided by the two goals of preserving the free +status of all derivatives of our free software and of promoting the +sharing and reuse of software. + +Your comments and suggestions about our licensing policies and our +software are welcome! Please contact the Free Software Foundation, +Inc., 675 Mass Ave, Cambridge, MA 02139, or call (617) 876-3296. + + NO WARRANTY + + BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY +NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW. EXCEPT +WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD +M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES +PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE +ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH +YOU. SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M. +STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN +ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE +GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING +ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE +(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU +HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM +BY ANY OTHER PARTY. + +-------------------- End of file COPYLEFT ------------------------------ +*/ + +/* + * Usage: + ansi2knr input_file [output_file] + * If no output_file is supplied, output goes to stdout. + * There are no error messages. + * + * ansi2knr recognizes function definitions by seeing a non-keyword + * identifier at the left margin, followed by a left parenthesis, + * with a right parenthesis as the last character on the line, + * and with a left brace as the first token on the following line + * (ignoring possible intervening comments). + * It will recognize a multi-line header provided that no intervening + * line ends with a left or right brace or a semicolon. + * These algorithms ignore whitespace and comments, except that + * the function name must be the first thing on the line. + * The following constructs will confuse it: + * - Any other construct that starts at the left margin and + * follows the above syntax (such as a macro or function call). + * - Some macros that tinker with the syntax of the function header. + */ + +/* + * The original and principal author of ansi2knr is L. Peter Deutsch + * <ghost(a)aladdin.com>. Other authors are noted in the change history + * that follows (in reverse chronological order): + lpd 96-01-21 added code to cope with not HAVE_CONFIG_H and with + compilers that don't understand void, as suggested by + Tom Lane + lpd 96-01-15 changed to require that the first non-comment token + on the line following a function header be a left brace, + to reduce sensitivity to macros, as suggested by Tom Lane + <tgl(a)sss.pgh.pa.us> + lpd 95-06-22 removed #ifndefs whose sole purpose was to define + undefined preprocessor symbols as 0; changed all #ifdefs + for configuration symbols to #ifs + lpd 95-04-05 changed copyright notice to make it clear that + including ansi2knr in a program does not bring the entire + program under the GPL + lpd 94-12-18 added conditionals for systems where ctype macros + don't handle 8-bit characters properly, suggested by + Francois Pinard <pinard(a)iro.umontreal.ca>; + removed --varargs switch (this is now the default) + lpd 94-10-10 removed CONFIG_BROKETS conditional + lpd 94-07-16 added some conditionals to help GNU `configure', + suggested by Francois Pinard <pinard(a)iro.umontreal.ca>; + properly erase prototype args in function parameters, + contributed by Jim Avera <jima(a)netcom.com>; + correct error in writeblanks (it shouldn't erase EOLs) + lpd 89-xx-xx original version + */ + +/* Most of the conditionals here are to make ansi2knr work with */ +/* or without the GNU configure machinery. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include <stdio.h> +#include <ctype.h> + +#if HAVE_CONFIG_H + +/* + For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h). + This will define HAVE_CONFIG_H and so, activate the following lines. + */ + +# if STDC_HEADERS || HAVE_STRING_H +# include <string.h> +# else +# include <strings.h> +# endif + +#else /* not HAVE_CONFIG_H */ + +/* Otherwise do it the hard way */ + +# ifdef BSD +# include <strings.h> +# else +# ifdef VMS + extern int strlen(), strncmp(); +# else +# include <string.h> +# endif +# endif + +#endif /* not HAVE_CONFIG_H */ + +#if STDC_HEADERS +# include <stdlib.h> +#else +/* + malloc and free should be declared in stdlib.h, + but if you've got a K&R compiler, they probably aren't. + */ +# ifdef MSDOS +# include <malloc.h> +# else +# ifdef VMS + extern char *malloc(); + extern void free(); +# else + extern char *malloc(); + extern int free(); +# endif +# endif + +#endif + +/* + * The ctype macros don't always handle 8-bit characters correctly. + * Compensate for this here. + */ +#ifdef isascii +# undef HAVE_ISASCII /* just in case */ +# define HAVE_ISASCII 1 +#else +#endif +#if STDC_HEADERS || !HAVE_ISASCII +# define is_ascii(c) 1 +#else +# define is_ascii(c) isascii(c) +#endif + +#define is_space(c) (is_ascii(c) && isspace(c)) +#define is_alpha(c) (is_ascii(c) && isalpha(c)) +#define is_alnum(c) (is_ascii(c) && isalnum(c)) + +/* Scanning macros */ +#define isidchar(ch) (is_alnum(ch) || (ch) == '_') +#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_') + +/* Forward references */ +char *skipspace(); +int writeblanks(); +int test1(); +int convert1(); + +/* The main program */ +int +main(argc, argv) + int argc; + char *argv[]; +{ FILE *in, *out; +#define bufsize 5000 /* arbitrary size */ + char *buf; + char *line; + char *more; + /* + * In previous versions, ansi2knr recognized a --varargs switch. + * If this switch was supplied, ansi2knr would attempt to convert + * a ... argument to va_alist and va_dcl; if this switch was not + * supplied, ansi2knr would simply drop any such arguments. + * Now, ansi2knr always does this conversion, and we only + * check for this switch for backward compatibility. + */ + int convert_varargs = 1; + + if ( argc > 1 && argv[1][0] == '-' ) + { if ( !strcmp(argv[1], "--varargs") ) + { convert_varargs = 1; + argc--; + argv++; + } + else + { fprintf(stderr, "Unrecognized switch: %s\n", argv[1]); + exit(1); + } + } + switch ( argc ) + { + default: + printf("Usage: ansi2knr input_file [output_file]\n"); + exit(0); + case 2: + out = stdout; + break; + case 3: + out = fopen(argv[2], "w"); + if ( out == NULL ) + { fprintf(stderr, "Cannot open output file %s\n", argv[2]); + exit(1); + } + } + in = fopen(argv[1], "r"); + if ( in == NULL ) + { fprintf(stderr, "Cannot open input file %s\n", argv[1]); + exit(1); + } + fprintf(out, "#line 1 \"%s\"\n", argv[1]); + buf = malloc(bufsize); + line = buf; + while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL ) + { +test: line += strlen(line); + switch ( test1(buf) ) + { + case 2: /* a function header */ + convert1(buf, out, 1, convert_varargs); + break; + case 1: /* a function */ + /* Check for a { at the start of the next line. */ + more = ++line; +f: if ( line >= buf + (bufsize - 1) ) /* overflow check */ + goto wl; + if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL ) + goto wl; + switch ( *skipspace(more, 1) ) + { + case '{': + /* Definitely a function header. */ + convert1(buf, out, 0, convert_varargs); + fputs(more, out); + break; + case 0: + /* The next line was blank or a comment: */ + /* keep scanning for a non-comment. */ + line += strlen(line); + goto f; + default: + /* buf isn't a function header, but */ + /* more might be. */ + fputs(buf, out); + strcpy(buf, more); + line = buf; + goto test; + } + break; + case -1: /* maybe the start of a function */ + if ( line != buf + (bufsize - 1) ) /* overflow check */ + continue; + /* falls through */ + default: /* not a function */ +wl: fputs(buf, out); + break; + } + line = buf; + } + if ( line != buf ) + fputs(buf, out); + free(buf); + fclose(out); + fclose(in); + return 0; +} + +/* Skip over space and comments, in either direction. */ +char * +skipspace(p, dir) + register char *p; + register int dir; /* 1 for forward, -1 for backward */ +{ for ( ; ; ) + { while ( is_space(*p) ) + p += dir; + if ( !(*p == '/' && p[dir] == '*') ) + break; + p += dir; p += dir; + while ( !(*p == '*' && p[dir] == '/') ) + { if ( *p == 0 ) + return p; /* multi-line comment?? */ + p += dir; + } + p += dir; p += dir; + } + return p; +} + +/* + * Write blanks over part of a string. + * Don't overwrite end-of-line characters. + */ +int +writeblanks(start, end) + char *start; + char *end; +{ char *p; + for ( p = start; p < end; p++ ) + if ( *p != '\r' && *p != '\n' ) + *p = ' '; + return 0; +} + +/* + * Test whether the string in buf is a function definition. + * The string may contain and/or end with a newline. + * Return as follows: + * 0 - definitely not a function definition; + * 1 - definitely a function definition; + * 2 - definitely a function prototype (NOT USED); + * -1 - may be the beginning of a function definition, + * append another line and look again. + * The reason we don't attempt to convert function prototypes is that + * Ghostscript's declaration-generating macros look too much like + * prototypes, and confuse the algorithms. + */ +int +test1(buf) + char *buf; +{ register char *p = buf; + char *bend; + char *endfn; + int contin; + + if ( !isidfirstchar(*p) ) + return 0; /* no name at left margin */ + bend = skipspace(buf + strlen(buf) - 1, -1); + switch ( *bend ) + { + case ';': contin = 0 /*2*/; break; + case ')': contin = 1; break; + case '{': return 0; /* not a function */ + case '}': return 0; /* not a function */ + default: contin = -1; + } + while ( isidchar(*p) ) + p++; + endfn = p; + p = skipspace(p, 1); + if ( *p++ != '(' ) + return 0; /* not a function */ + p = skipspace(p, 1); + if ( *p == ')' ) + return 0; /* no parameters */ + /* Check that the apparent function name isn't a keyword. */ + /* We only need to check for keywords that could be followed */ + /* by a left parenthesis (which, unfortunately, is most of them). */ + { static char *words[] = + { "asm", "auto", "case", "char", "const", "double", + "extern", "float", "for", "if", "int", "long", + "register", "return", "short", "signed", "sizeof", + "static", "switch", "typedef", "unsigned", + "void", "volatile", "while", 0 + }; + char **key = words; + char *kp; + int len = endfn - buf; + + while ( (kp = *key) != 0 ) + { if ( strlen(kp) == len && !strncmp(kp, buf, len) ) + return 0; /* name is a keyword */ + key++; + } + } + return contin; +} + +/* Convert a recognized function definition or header to K&R syntax. */ +int +convert1(buf, out, header, convert_varargs) + char *buf; + FILE *out; + int header; /* Boolean */ + int convert_varargs; /* Boolean */ +{ char *endfn; + register char *p; + char **breaks; + unsigned num_breaks = 2; /* for testing */ + char **btop; + char **bp; + char **ap; + char *vararg = 0; + + /* Pre-ANSI implementations don't agree on whether strchr */ + /* is called strchr or index, so we open-code it here. */ + for ( endfn = buf; *(endfn++) != '('; ) + ; +top: p = endfn; + breaks = (char **)malloc(sizeof(char *) * num_breaks * 2); + if ( breaks == 0 ) + { /* Couldn't allocate break table, give up */ + fprintf(stderr, "Unable to allocate break table!\n"); + fputs(buf, out); + return -1; + } + btop = breaks + num_breaks * 2 - 2; + bp = breaks; + /* Parse the argument list */ + do + { int level = 0; + char *lp = NULL; + char *rp; + char *end = NULL; + + if ( bp >= btop ) + { /* Filled up break table. */ [truncated at 1000 lines; 57126 more skipped]

18 years, 8 months

[weiden] 20449: fixed returned status code in RtlAnsiStringToUnicodeString and properly free allocated memory in case converting the string failed

by weiden＠svn.reactos.org

fixed returned status code in RtlAnsiStringToUnicodeString and properly free allocated memory in case converting the string failed Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-12-29 22:54:24 UTC (rev 20448) +++ trunk/reactos/lib/rtl/unicode.c 2005-12-30 00:18:48 UTC (rev 20449) @@ -75,15 +75,15 @@ if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; UniDest->Length = (USHORT)Length - sizeof(WCHAR); - if (AllocateDestinationString == TRUE) + if (AllocateDestinationString) { UniDest->Buffer = RtlpAllocateStringMemory(Length, TAG_USTR); UniDest->MaximumLength = Length; if (!UniDest->Buffer) return STATUS_NO_MEMORY; } - else if (Length >= UniDest->MaximumLength) + else if (UniDest->Length >= UniDest->MaximumLength) { - return STATUS_BUFFER_TOO_SMALL; + return STATUS_BUFFER_OVERFLOW; } Status = RtlMultiByteToUnicodeN(UniDest->Buffer, @@ -92,9 +92,13 @@ AnsiSource->Buffer, AnsiSource->Length); - if (!NT_SUCCESS(Status) && AllocateDestinationString) + if (!NT_SUCCESS(Status)) { - RtlpFreeStringMemory(UniDest->Buffer, TAG_USTR); + if (AllocateDestinationString) + { + RtlpFreeStringMemory(UniDest->Buffer, TAG_USTR); + UniDest->Buffer = NULL; + } return Status; }

18 years, 8 months

[turner] 20448: Use only NtCreateKey and better suited access rights.

by turner＠svn.reactos.org

Use only NtCreateKey and better suited access rights. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-12-29 22:43:44 UTC (rev 20447) +++ trunk/reactos/lib/kernel32/file/move.c 2005-12-29 22:54:24 UTC (rev 20448) @@ -109,24 +109,17 @@ NULL, NULL); - Status = NtOpenKey(&Reboot, - KEY_ALL_ACCESS, - &ObjectAttributes); + Status = NtCreateKey(&Reboot, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); if (!NT_SUCCESS(Status)) { - Status = NtCreateKey(&Reboot, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - NULL); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + DPRINT1("NtCreateKey() failed (Status 0x%lx)\n", Status); RtlFreeUnicodeString( &source_name ); RtlFreeUnicodeString( &dest_name ); return FALSE;

18 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
71
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 December 2005