Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[janderwald] 42786: - Add bda driver
by janderwald＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: janderwald Date: Wed Aug 19 14:40:02 2009 New Revision: 42786 URL: http://svn.reactos.org/svn/reactos?rev=42786&view=rev Log: - Add bda driver Modified: trunk/reactos/tools/rgenstat/module_list.txt Modified: trunk/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/module_list… ============================================================================== --- trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] Wed Aug 19 14:40:02 2009 @@ -68,7 +68,6 @@ imm32 dll\win32\imm32 iphlpapi dll\win32\iphlpapi kernel32 dll\win32\kernel32 -ks drivers\ksfilter\ks lsasrv dll\win32\lsasrv lz32 dll\win32\lz32 mapi32 dll\win32\mapi32 @@ -96,7 +95,6 @@ opengl32 dll\win32\opengl32 powrprof dll\win32\powrprof psapi dll\win32\psapi -portcls drivers\wdm\audio\backpln\portcls riched20 dll\win32\riched20 riched32 dll\win32\riched32 rpcrt4 dll\win32\rpcrt4 @@ -132,5 +130,8 @@ wshirda dll\win32\wshirda wsock32 dll\win32\wsock32 wshtcpip dll\win32\wshtcpip +bda drivers\multimedia\bdasup framebuf drivers\video\displays\framebuf +ks drivers\ksfilter\ks +portcls drivers\wdm\audio\backpln\portcls vgaddi drivers\video\displays\vga

1 0

[janderwald] 42785: - Arch should learn english first before bashing gcc
by janderwald＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: janderwald Date: Wed Aug 19 14:32:56 2009 New Revision: 42785 URL: http://svn.reactos.org/svn/reactos?rev=42785&view=rev Log: - Arch should learn english first before bashing gcc Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Aug 19 14:32:56 2009 @@ -645,7 +645,6 @@ IN ULONG ProbeFlags, IN ULONG HeaderSize) { -#if 0 PMDL Mdl; PVOID Buffer; LOCK_OPERATION Operation; @@ -826,10 +825,10 @@ ExRaiseStatus(STATUS_INVALID_PARAMETER); } - if (StreamHeader->FrameExtend) + if (StreamHeader->FrameExtent) { /* allocate an mdl */ - Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtend, FALSE, TRUE, Irp); + Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtent, FALSE, TRUE, Irp); if (!Mdl) { @@ -857,10 +856,10 @@ } } - if (StreamHeader->FrameExtend) + if (StreamHeader->FrameExtent) { /* allocate an mdl */ - Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtend, Irp->MdlAddress != NULL, TRUE, Irp); + Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtent, Irp->MdlAddress != NULL, TRUE, Irp); if (!Mdl) { /* not enough memory */ @@ -933,6 +932,9 @@ /* alloc mdls */ goto AllocMdl; } + + /* check all stream headers */ + StreamHeader = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; _SEH2_TRY { @@ -965,7 +967,7 @@ if (ProbeFlags & KSPROBE_STREAMWRITE) { - if (StreamHeader->DataUsed > StreamHeader->FrameExtend) + if (StreamHeader->DataUsed > StreamHeader->FrameExtent) { /* frame extend can never be smaller */ ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); @@ -986,10 +988,10 @@ ExRaiseStatus(STATUS_INVALID_PARAMETER); } - if (StreamHeader->FrameExtend) + if (StreamHeader->FrameExtent) { /* allocate an mdl */ - Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtend, FALSE, TRUE, Irp); + Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtent, FALSE, TRUE, Irp); if (!Mdl) { @@ -1037,10 +1039,6 @@ } return STATUS_INVALID_BUFFER_SIZE; -#else - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -#endif } /*

1 0

[janderwald] 42784: - Implement KsProbeStreamIrp - Currently commented out as gcc finds it hard to find a member in a struct
by janderwald＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: janderwald Date: Wed Aug 19 14:24:28 2009 New Revision: 42784 URL: http://svn.reactos.org/svn/reactos?rev=42784&view=rev Log: - Implement KsProbeStreamIrp - Currently commented out as gcc finds it hard to find a member in a struct Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Aug 19 14:24:28 2009 @@ -645,8 +645,402 @@ IN ULONG ProbeFlags, IN ULONG HeaderSize) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; +#if 0 + PMDL Mdl; + PVOID Buffer; + LOCK_OPERATION Operation; + NTSTATUS Status = STATUS_SUCCESS; + PKSSTREAM_HEADER StreamHeader; + PIO_STACK_LOCATION IoStack; + ULONG Length; + BOOLEAN AllocateMdl = FALSE; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Length = IoStack->Parameters.DeviceIoControl.InputBufferLength; + + if (Irp->RequestorMode == KernelMode || Irp->AssociatedIrp.SystemBuffer) + { +AllocMdl: + /* check if alloc mdl flag is passed */ + if (!(ProbeFlags & KSPROBE_ALLOCATEMDL)) + { + /* nothing more to do */ + return STATUS_SUCCESS; + } + if (Irp->MdlAddress) + { +ProbeMdl: + if (ProbeFlags & KSPROBE_PROBEANDLOCK) + { + if (Irp->MdlAddress->MdlFlags & (MDL_PAGES_LOCKED | MDL_SOURCE_IS_NONPAGED_POOL)) + { + if (ProbeFlags & KSPROBE_SYSTEMADDRESS) + { + _SEH2_TRY + { + /* loop through all mdls and probe them */ + Mdl = Irp->MdlAddress; + do + { + /* the mapping can fail */ + Mdl->MdlFlags |= MDL_MAPPING_CAN_FAIL; + + if (Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) + { + /* no need to probe these pages */ + Buffer = Mdl->MappedSystemVa; + } + else + { + /* probe that mdl */ + Buffer = MmMapLockedPages(Mdl, KernelMode); + } + + /* check if the mapping succeeded */ + if (!Buffer) + { + /* raise exception we'll catch */ + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + /* iterate to next mdl */ + Mdl = Mdl->Next; + + }while(Mdl); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + } + } + else + { + _SEH2_TRY + { + /* loop through all mdls and probe them */ + Mdl = Irp->MdlAddress; + + /* determine operation */ + Operation = (ProbeFlags & KSPROBE_STREAMWRITE) ? IoWriteAccess : IoReadAccess; + + do + { + /* probe the pages */ + MmProbeAndLockPages(Mdl, Irp->RequestorMode, Operation); + + if (ProbeFlags & KSPROBE_SYSTEMADDRESS) + { + /* the mapping can fail */ + Mdl->MdlFlags |= MDL_MAPPING_CAN_FAIL; + + if (Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) + { + /* no need to probe these pages */ + Buffer = Mdl->MappedSystemVa; + } + else + { + /* probe that mdl */ + Buffer = MmMapLockedPages(Mdl, KernelMode); + } + + /* check if the mapping succeeded */ + if (!Buffer) + { + /* raise exception we'll catch */ + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + } + + /* iterate to next mdl */ + Mdl = Mdl->Next; + + }while(Mdl); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + } + } + return Status; + } + + /* check all stream headers */ + StreamHeader = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + + _SEH2_TRY + { + do + { + if (HeaderSize) + { + /* does the supplied header size match stream header size and no type changed */ + if (StreamHeader->Size != HeaderSize && !(StreamHeader->OptionsFlags & KSSTREAM_HEADER_OPTIONSF_TYPECHANGED)) + { + /* invalid stream header */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + } + else + { + /* stream must be at least of size KSSTREAM_HEADER and size must be 8-byte block aligned */ + if (StreamHeader->Size < sizeof(KSSTREAM_HEADER) || (StreamHeader->Size & 7)) + { + /* invalid stream header */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + } + + if (Length < StreamHeader->Size) + { + /* length is too short */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + if (ProbeFlags & KSPROBE_STREAMWRITE) + { + if (StreamHeader->DataUsed > StreamHeader->FrameExtent) + { + /* frame extend can never be smaller */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + /* is this stream change packet */ + if (StreamHeader->OptionsFlags & KSSTREAM_HEADER_OPTIONSF_TYPECHANGED) + { + if (Length != sizeof(KSSTREAM_HEADER) || (PVOID)StreamHeader != Irp->AssociatedIrp.SystemBuffer) + { + /* stream changed - must be send in a single packet */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + if (!(ProbeFlags & KSPROBE_ALLOWFORMATCHANGE)) + { + /* caller does not permit format changes */ + ExRaiseStatus(STATUS_INVALID_PARAMETER); + } + + if (StreamHeader->FrameExtend) + { + /* allocate an mdl */ + Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtend, FALSE, TRUE, Irp); + + if (!Mdl) + { + /* not enough memory */ + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + /* break-out to probe for the irp */ + break; + } + } + } + else + { + if (StreamHeader->DataUsed) + { + /* DataUsed must be zero for stream read operation */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + if (StreamHeader->OptionsFlags) + { + /* no flags supported for reading */ + ExRaiseStatus(STATUS_INVALID_PARAMETER); + } + } + + if (StreamHeader->FrameExtend) + { + /* allocate an mdl */ + Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtend, Irp->MdlAddress != NULL, TRUE, Irp); + if (!Mdl) + { + /* not enough memory */ + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + } + + /* move to next stream header */ + Length -= StreamHeader->Size; + StreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamHeader + StreamHeader->Size); + }while(Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + }_SEH2_END; + + /* now probe the allocated mdl's */ + if (!NT_SUCCESS(Status)) + return Status; + else + goto ProbeMdl; + } + + /* probe user mode buffers */ + if (Length && ( (!HeaderSize) || (Length % HeaderSize == 0) || ((ProbeFlags & KSPROBE_ALLOWFORMATCHANGE) && (Length == sizeof(KSSTREAM_HEADER))) ) ) + { + /* allocate stream header buffer */ + Irp->AssociatedIrp.SystemBuffer = ExAllocatePool(NonPagedPool, Length); + + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + _SEH2_TRY + { + if (ProbeFlags & KSPROBE_STREAMWRITE) + { + if (ProbeFlags & KSPROBE_MODIFY) + ProbeForWrite(Irp->UserBuffer, Length, sizeof(UCHAR)); + else + ProbeForRead(Irp->UserBuffer, Length, sizeof(UCHAR)); + } + else + { + /* stream reads means writing */ + ProbeForWrite(Irp->UserBuffer, Length, sizeof(UCHAR)); + } + + /* copy stream buffer */ + RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, Irp->UserBuffer, Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + }_SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + if (ProbeFlags & KSPROBE_ALLOCATEMDL) + { + /* alloc mdls */ + goto AllocMdl; + } + + _SEH2_TRY + { + do + { + if (HeaderSize) + { + /* does the supplied header size match stream header size and no type changed */ + if (StreamHeader->Size != HeaderSize && !(StreamHeader->OptionsFlags & KSSTREAM_HEADER_OPTIONSF_TYPECHANGED)) + { + /* invalid stream header */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + } + else + { + /* stream must be at least of size KSSTREAM_HEADER and size must be 8-byte block aligned */ + if (StreamHeader->Size < sizeof(KSSTREAM_HEADER) || (StreamHeader->Size & 7)) + { + /* invalid stream header */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + } + + if (Length < StreamHeader->Size) + { + /* length is too short */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + if (ProbeFlags & KSPROBE_STREAMWRITE) + { + if (StreamHeader->DataUsed > StreamHeader->FrameExtend) + { + /* frame extend can never be smaller */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + /* is this stream change packet */ + if (StreamHeader->OptionsFlags & KSSTREAM_HEADER_OPTIONSF_TYPECHANGED) + { + if (Length != sizeof(KSSTREAM_HEADER) || (PVOID)StreamHeader != Irp->AssociatedIrp.SystemBuffer) + { + /* stream changed - must be send in a single packet */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + if (!(ProbeFlags & KSPROBE_ALLOWFORMATCHANGE)) + { + /* caller does not permit format changes */ + ExRaiseStatus(STATUS_INVALID_PARAMETER); + } + + if (StreamHeader->FrameExtend) + { + /* allocate an mdl */ + Mdl = IoAllocateMdl(StreamHeader->Data, StreamHeader->FrameExtend, FALSE, TRUE, Irp); + + if (!Mdl) + { + /* not enough memory */ + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + /* break out to probe for the irp */ + AllocateMdl = TRUE; + break; + } + } + } + else + { + if (StreamHeader->DataUsed) + { + /* DataUsed must be zero for stream read operation */ + ExRaiseStatus(STATUS_INVALID_BUFFER_SIZE); + } + + if (StreamHeader->OptionsFlags) + { + /* no flags supported for reading */ + ExRaiseStatus(STATUS_INVALID_PARAMETER); + } + } + + /* move to next stream header */ + Length -= StreamHeader->Size; + StreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamHeader + StreamHeader->Size); + }while(Length); + + }_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + }_SEH2_END; + + /* now probe the allocated mdl's */ + if (NT_SUCCESS(Status)) + goto AllocMdl; + else + return Status; + } + + return STATUS_INVALID_BUFFER_SIZE; +#else + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +#endif } /*

1 0

[janderwald] 42783: - fix check
by janderwald＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: janderwald Date: Wed Aug 19 14:19:56 2009 New Revision: 42783 URL: http://svn.reactos.org/svn/reactos?rev=42783&view=rev Log: - fix check Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4278… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Wed Aug 19 14:19:56 2009 @@ -2548,7 +2548,7 @@ ULONG DataUsed; PVOID Data; ULONG OptionsFlags; -#if _WIN64 +#ifdef _WIN64 ULONG Reserved; #endif } KSSTREAM_HEADER, *PKSSTREAM_HEADER;

1 0

[janderwald] 42782: - Add flags
by janderwald＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: janderwald Date: Wed Aug 19 14:14:42 2009 New Revision: 42782 URL: http://svn.reactos.org/svn/reactos?rev=42782&view=rev Log: - Add flags Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4278… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Wed Aug 19 14:14:42 2009 @@ -2548,9 +2548,23 @@ ULONG DataUsed; PVOID Data; ULONG OptionsFlags; +#if _WIN64 + ULONG Reserved; +#endif } KSSTREAM_HEADER, *PKSSTREAM_HEADER; - +#define KSSTREAM_HEADER_OPTIONSF_SPLICEPOINT 0x00000001 +#define KSSTREAM_HEADER_OPTIONSF_PREROLL 0x00000002 +#define KSSTREAM_HEADER_OPTIONSF_DATADISCONTINUITY 0x00000004 +#define KSSTREAM_HEADER_OPTIONSF_TYPECHANGED 0x00000008 +#define KSSTREAM_HEADER_OPTIONSF_TIMEVALID 0x00000010 +#define KSSTREAM_HEADER_OPTIONSF_TIMEDISCONTINUITY 0x00000040 +#define KSSTREAM_HEADER_OPTIONSF_FLUSHONPAUSE 0x00000080 +#define KSSTREAM_HEADER_OPTIONSF_DURATIONVALID 0x00000100 +#define KSSTREAM_HEADER_OPTIONSF_ENDOFSTREAM 0x00000200 +#define KSSTREAM_HEADER_OPTIONSF_BUFFEREDTRANSFER 0x00000400 +#define KSSTREAM_HEADER_OPTIONSF_VRAM_DATA_TRANSFER 0x00000800 +#define KSSTREAM_HEADER_OPTIONSF_LOOPEDDATA 0x80000000 /* =============================================================== XP / DX8

1 0

[mkupfer] 42781: - third part of German translation of rapps entries. - change some entries to proper values
by mkupfer＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: mkupfer Date: Wed Aug 19 13:28:00 2009 New Revision: 42781 URL: http://svn.reactos.org/svn/reactos?rev=42781&view=rev Log: - third part of German translation of rapps entries. - change some entries to proper values Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Simple Direct Media Layer (SDL) Mixer @@ -10,3 +10,10 @@ URLSite = Unknown URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip CDPath = none + + +[Section.0407] +Licence = Unbekannt +Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Simple Direct Media Layer (SDL) Runtime @@ -10,3 +10,11 @@ URLSite = Unknown URLDownload = http://www.libsdl.org/release/SDL-1.2.13-win32.zip CDPath = none + + +[Section.0407] +Name = Simple Direct Media Layer (SDL) Laufzeitumgebung +Licence = Unbekannt +Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Mozilla SeaMonkey @@ -15,3 +15,10 @@ Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Licence = ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾ URLSite = http://www.mozilla-europe.org/ru/ + +[Section.0407] +Licence = Unbekannt +Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. +Size = 8.9M +URLSite = http://www.mozilla-europe.org/de/ +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/contrib-localized/se… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = SMPlayer @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe CDPath = none + + +[Section.0407] +Licence = Unbekannt +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Aug 19 13:28:00 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Mozilla Thunderbird 2.0 @@ -7,12 +7,18 @@ Description = The most popular and one of the best free Mail Clients out there. Size = 6.4M Category = 5 -URLSite = http://www.mozilla.com/en-US/ +URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 7.0M -URLSite = http://www.mozilla-europe.org/ru/ +URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… + +[Section.0407] +Description = Der populÃ¤rste und einer der besten freien Mail-Clients. +Size = 6.2M +URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w…

1 0

[gschneider] 42780: - GetGlyphOutline: fail if output or transformation matrix buffers are not passed - Fixes three gdi32 font winetests
by gschneider＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: gschneider Date: Wed Aug 19 13:23:31 2009 New Revision: 42780 URL: http://svn.reactos.org/svn/reactos?rev=42780&view=rev Log: - GetGlyphOutline: fail if output or transformation matrix buffers are not passed - Fixes three gdi32 font winetests Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Wed Aug 19 13:23:31 2009 @@ -929,6 +929,7 @@ DWORD ret; UINT c; DPRINT("GetGlyphOutlineA uChar %x\n", uChar); + if (!lpgm || !lpmat2) return GDI_ERROR; if(!(uFormat & GGO_GLYPH_INDEX)) { int len; char mbchs[2]; @@ -966,7 +967,7 @@ ) { DPRINT("GetGlyphOutlineW uChar %x\n", uChar); - if (!lpgm & !lpmat2) return GDI_ERROR; + if (!lpgm || !lpmat2) return GDI_ERROR; if (!lpvBuffer) cbBuffer = 0; return NtGdiGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE); }

1 0

[gschneider] 42779: - Sync and adapt Wine font metric code for setting first, last, default and break characters - Fixes approx 80 gdi32 font winetests
by gschneider＠svn.reactos.org 19 Aug '09

19 Aug '09

Author: gschneider Date: Wed Aug 19 13:02:10 2009 New Revision: 42779 URL: http://svn.reactos.org/svn/reactos?rev=42779&view=rev Log: - Sync and adapt Wine font metric code for setting first, last, default and break characters - Fixes approx 80 gdi32 font winetests Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed Aug 19 13:02:10 2009 @@ -566,6 +566,18 @@ } +static BOOL face_has_symbol_charmap(FT_Face ft_face) +{ + int i; + + for(i = 0; i < ft_face->num_charmaps; i++) + { + if(ft_face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL) + return TRUE; + } + return FALSE; +} + static void FASTCALL FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, TT_OS2 *pOS2, TT_HoriHeader *pHori, FT_WinFNT_HeaderRec *pWin) { @@ -644,10 +656,36 @@ TM->tmOverhang = 0; TM->tmDigitizedAspectX = 96; TM->tmDigitizedAspectY = 96; - TM->tmFirstChar = pOS2->usFirstCharIndex; - TM->tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0xffff; - TM->tmLastChar = pOS2->usLastCharIndex; - TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' '; + if (face_has_symbol_charmap(Face) || (pOS2->usFirstCharIndex >= 0xf000 && pOS2->usFirstCharIndex < 0xf100)) + { + USHORT cpOEM, cpAnsi; + + EngGetCurrentCodePage(&cpOEM, &cpAnsi); + TM->tmFirstChar = 0; + switch(cpAnsi) + { + case 1257: /* Baltic */ + TM->tmLastChar = 0xf8fd; + break; + default: + TM->tmLastChar = 0xf0ff; + } + TM->tmBreakChar = 0x20; + TM->tmDefaultChar = 0x1f; + } + else + { + TM->tmFirstChar = pOS2->usFirstCharIndex; /* Should be the first char in the cmap */ + TM->tmLastChar = pOS2->usLastCharIndex; /* Should be min(cmap_last, os2_last) */ + + if(pOS2->usFirstCharIndex <= 1) + TM->tmBreakChar = pOS2->usFirstCharIndex + 2; + else if (pOS2->usFirstCharIndex > 0xff) + TM->tmBreakChar = 0x20; + else + TM->tmBreakChar = pOS2->usFirstCharIndex; + TM->tmDefaultChar = TM->tmBreakChar - 1; + } TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0; TM->tmUnderlined = FontGDI->Underline; TM->tmStruckOut = FontGDI->StrikeOut;

1 0

[cgutman] 42778: - Fix release build
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Wed Aug 19 00:15:06 2009 New Revision: 42778 URL: http://svn.reactos.org/svn/reactos?rev=42778&view=rev Log: - Fix release build Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Wed Aug 19 00:15:06 2009 @@ -14,7 +14,6 @@ #define NTOS_MODE_USER #define _CRT_SECURE_NO_DEPRECATE #define WINSOCK_API_LINKAGE -#define DBG 1 /* C Header */ #include <stdio.h>

1 0

[cgutman] 42777: - I guess kdesvn didn't realize that when I check the box for include/reactos/winsock that I actually wanted the files in it to be committed also
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 23:54:55 2009 New Revision: 42777 URL: http://svn.reactos.org/svn/reactos?rev=42777&view=rev Log: - I guess kdesvn didn't realize that when I check the box for include/reactos/winsock that I actually wanted the files in it to be committed also Added: trunk/reactos/include/reactos/winsock/nsp_dns.h (with props) trunk/reactos/include/reactos/winsock/ws2help.h (with props) Added: trunk/reactos/include/reactos/winsock/nsp_dns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ns… ============================================================================== --- trunk/reactos/include/reactos/winsock/nsp_dns.h (added) +++ trunk/reactos/include/reactos/winsock/nsp_dns.h [iso-8859-1] Tue Aug 18 23:54:55 2009 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 Headers + * FILE: include/winsock/nsp_dns.h + * PURPOSE: WinSock 2 Shared NSP Header + */ + + +#ifndef __NSP_DNS_H +#define __NSP_DNS_H + +/* Includes */ +#include <svcguid.h> + +/* Globals */ +GUID HostnameGuid = SVCID_HOSTNAME; +GUID AddressGuid = SVCID_INET_HOSTADDRBYINETSTRING; +GUID HostAddrByNameGuid = SVCID_INET_HOSTADDRBYNAME; +GUID IANAGuid = SVCID_INET_SERVICEBYNAME; +GUID InetHostName = SVCID_INET_HOSTADDRBYNAME; +GUID Ipv6Guid = SVCID_DNS_TYPE_AAAA; + +/* Macros and Defines */ +#define RNR_BUFFER_SIZE 512 + +#endif + Propchange: trunk/reactos/include/reactos/winsock/nsp_dns.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/winsock/ws2help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ws… ============================================================================== --- trunk/reactos/include/reactos/winsock/ws2help.h (added) +++ trunk/reactos/include/reactos/winsock/ws2help.h [iso-8859-1] Tue Aug 18 23:54:55 2009 @@ -1,0 +1,163 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 Helper DLL + * FILE: include/libs/winsock/ws2help.h + * PURPOSE: WinSock 2 Helper DLL header + */ + +#ifndef __WS2HELP_H +#define __WS2HELP_H + +/* Types */ +typedef struct _WSH_HANDLE +{ + LONG RefCount; + HANDLE Handle; +} WSH_HANDLE, *PWAH_HANDLE; + +typedef struct _WSH_HASH_TABLE +{ + DWORD Size; + PWAH_HANDLE Handles[1]; +} WSH_HASH_TABLE, *PWAH_HASH_TABLE; + +typedef struct _WSH_SEARCH_TABLE +{ + volatile PWAH_HASH_TABLE HashTable; + volatile PLONG CurrentCount; + LONG Count1; + LONG Count2; + LONG SpinCount; + BOOL Expanding; + CRITICAL_SECTION Lock; +} WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE; + +typedef struct _WSH_HANDLE_TABLE +{ + DWORD Mask; + WSH_SEARCH_TABLE SearchTables[1]; +} WSH_HANDLE_TABLE, *PWAH_HANDLE_TABLE; + +//typedef struct _WSH_HANDLE_TABLE *PWAH_HANDLE_TABLE; + +typedef BOOL +(WINAPI *PWAH_HANDLE_ENUMERATE_PROC)( + IN PVOID Context, + IN PWAH_HANDLE Handle +); + +PWAH_HANDLE +WINAPI +WahReferenceContextByHandle( + IN PWAH_HANDLE_TABLE Table, + IN HANDLE Handle +); + +DWORD +WINAPI +WahRemoveHandleContext( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle +); + +DWORD +WINAPI +WahCloseSocketHandle( + IN HANDLE HelperHandle, + IN SOCKET Socket +); + +DWORD +WINAPI +WahOpenCurrentThread( + IN HANDLE HelperHandle, + OUT LPWSATHREADID ThreadId +); + +DWORD +WINAPI +WahCloseApcHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahCloseThread( + IN HANDLE HelperHandle, + IN LPWSATHREADID ThreadId +); + +DWORD +WINAPI +WahCloseHandleHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahCloseNotificationHandleHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahOpenNotificationHandleHelper( + OUT PHANDLE HelperHandle +); + +DWORD +WINAPI +WahCreateNotificationHandle( + IN HANDLE HelperHandle, + OUT PHANDLE NotificationHelperHandle +); + +INT +WINAPI +WahWaitForNotification( + IN HANDLE NotificationHelperHandle, + IN HANDLE lpNotificationHandle, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine +); + +INT +WINAPI +WahNotifyAllProcesses( + IN HANDLE NotificationHelperHandle +); + +BOOL +WINAPI +WahEnumerateHandleContexts( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE_ENUMERATE_PROC Callback, + IN PVOID Context +); + +DWORD +WINAPI +WahCreateHandleContextTable( + OUT PWAH_HANDLE_TABLE *Table +); + +DWORD +WINAPI +WahDestroyHandleContextTable( + IN PWAH_HANDLE_TABLE Table +); + +PWAH_HANDLE +WINAPI +WahInsertHandleContext( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle +); + +DWORD +WINAPI +WahOpenApcHelper( + OUT PHANDLE ApcHelperHandle +); + +#endif Propchange: trunk/reactos/include/reactos/winsock/ws2help.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
66
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 August 2009