Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 15769: Optimized DstInvert32
by ion＠svn.reactos.com 04 Jun '05

04 Jun '05

Optimized DstInvert32 Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 10:05:20 UTC (rev 15768) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 13:20:34 UTC (rev 15769) @@ -398,32 +398,41 @@ } /* optimze functions for bitblt */ -BOOLEAN +VOID +FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) { - // return(~Dest); - ULONG DestX, DestY; - ULONG Dest; PULONG DestBits; + ULONG top = BltInfo->DestRect.top; + ULONG bottom = BltInfo->DestRect.left; + ULONG DestX = BltInfo->DestRect.right - left; + ULONG DestY = BltInfo->DestRect.bottom - top; + ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + /* Calculate the Initial Destination */ + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + + top * BltInfo->DestSurface->lDelta); - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++) - { - Dest = *DestBits; - *DestBits = ~Dest; - } + do while (DestY > 0) + { + do while (DestX > 0) + { + /* Invert bits */ + *DestBits =~ *DestBits; + + /* Update Position */ + DestBits++; + + /* Decrease distance to do */ + DestX--; + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + /* Update position */ + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + + /* Decrease distance to do */ + DestY--; } -return TRUE; } BOOLEAN

1 0

[hbirr] 15768: Make the bochs debug output in the very early boot phase available, if AUTO_ENABLE_BOCHS is defined.
by hbirr＠svn.reactos.com 04 Jun '05

04 Jun '05

Make the bochs debug output in the very early boot phase available, if AUTO_ENABLE_BOCHS is defined. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-06-04 09:58:35 UTC (rev 15767) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-06-04 10:05:20 UTC (rev 15768) @@ -450,8 +450,6 @@ /* Parse the Loaded Modules (by FreeLoader) and cache the ones we'll need */ ParseAndCacheLoadedModules(); - /* Initialize the kernel debugger parameters */ - KdInitSystem(0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Initialize the Dispatcher, Clock and Bug Check Mechanisms. */ KeInit2(); _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2005-06-04 09:58:35 UTC (rev 15767) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2005-06-04 10:05:20 UTC (rev 15768) @@ -11,15 +11,24 @@ #define NDEBUG #include <internal/debug.h> +/* Make bochs debug output in the very early boot phase available */ +//#define AUTO_ENABLE_BOCHS + /* VARIABLES ***************************************************************/ KD_PORT_INFORMATION PortInfo = {DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0}; ULONG KdpPortIrq; +#ifdef AUTO_ENABLE_BOCHS +KDP_DEBUG_MODE KdpDebugMode = {{{.Bochs=TRUE}}};; +PKDP_INIT_ROUTINE WrapperInitRoutine = KdpBochsInit; +KD_DISPATCH_TABLE WrapperTable = {.KdpInitRoutine = KdpBochsInit, .KdpPrintRoutine = KdpBochsDebugPrint}; +#else KDP_DEBUG_MODE KdpDebugMode; -LIST_ENTRY KdProviders; PKDP_INIT_ROUTINE WrapperInitRoutine; +KD_DISPATCH_TABLE WrapperTable; +#endif +LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; -KD_DISPATCH_TABLE WrapperTable; PKDP_INIT_ROUTINE InitRoutines[KdMax] = {KdpScreenInit, KdpSerialInit, @@ -158,8 +167,6 @@ /* Set Default Port Options */ if (BootPhase == 0) { - /* Initialize the Provider List */ - InitializeListHead(&KdProviders); /* Parse the Command Line */ p1 = (PCHAR)LoaderBlock->CommandLine; _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2005-06-04 09:58:35 UTC (rev 15767) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2005-06-04 10:05:20 UTC (rev 15768) @@ -24,9 +24,19 @@ { if (*Message == '\n') { - WRITE_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT, '\r'); +#if defined(_M_IX86) && defined(__GNUC__) + /* Don't use WRITE_PORT_UCHAR because hal isn't initialized yet in the very early boot phase. */ + __asm__("outb %0, %w1\n\t" :: "a" ('\r'), "d" (BOCHS_LOGGER_PORT)); +#else + WRITE_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT, '\r'); +#endif } +#if defined(_M_IX86) && defined(__GNUC__) + /* Don't use WRITE_PORT_UCHAR because hal isn't initialized yet in the very early boot phase. */ + __asm__("outb %0, %w1\n\t" :: "a" (*Message), "d" (BOCHS_LOGGER_PORT)); +#else WRITE_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT, *Message); +#endif Message++; } } _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-06-04 09:58:35 UTC (rev 15767) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-06-04 10:05:20 UTC (rev 15768) @@ -26,6 +26,11 @@ #endif /* __GNUC__ */ #endif +#if 0 +#undef ps +#define ps(args...) DPRINT1(args) +#endif + #define NDEBUG #include <internal/debug.h>

1 0

[mf] 15767: svn:ignore generated files
by mf＠svn.reactos.com 04 Jun '05

04 Jun '05

svn:ignore generated files Property changes on: trunk/reactos/apps/utils/net/arp ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/finger ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/ipconfig ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/netstat ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/ping ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/route ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/telnet ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/net/whois ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile Property changes on: trunk/reactos/apps/utils/rosperf ___________________________________________________________________ Name: svn:ignore - *.o *.a *.d *.exe *.coff *.sym *.map + *.o *.a *.d *.exe *.coff *.sym *.map makefile Property changes on: trunk/reactos/boot/freeldr/bootsect ___________________________________________________________________ Name: svn:ignore - *.exe *.bin *.h + *.exe *.bin *.h makefile Property changes on: trunk/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: svn:ignore - *.d *.map *.exe *.sys + *.d *.map *.exe *.sys makefile Property changes on: trunk/reactos/bootdata/bootcd ___________________________________________________________________ Name: svn:ignore + makefile Property changes on: trunk/reactos/bootdata/livecd ___________________________________________________________________ Name: svn:ignore + makefile Property changes on: trunk/reactos/drivers/bus/acpi ___________________________________________________________________ Name: svn:ignore - *.a *.d *.o *.sym *.sys *.map *.tmp acpi.coff objects + *.a *.d *.o *.sym *.sys *.map *.tmp acpi.coff objects makefile Property changes on: trunk/reactos/drivers/bus/isapnp ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp isapnp.coff isapnp.sys.unstripped *.d *.o *.a *.sym *.sys *.map + base.tmp junk.tmp temp.exp isapnp.coff isapnp.sys.unstripped *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/bus/pci ___________________________________________________________________ Name: svn:ignore - *.coff *.d *.o *.a *.sym *.sys *.map + *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/beep ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/blue ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/bootvid ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/debugout ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/mpu401 ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/null ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/parallel ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/ramdrv ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/serial ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/sndblst ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/dd/sound ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp *.coff *.sys *.sym *.map + base.tmp junk.tmp temp.exp *.coff *.sys *.sym *.map makefile Property changes on: trunk/reactos/drivers/fs/cdfs ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp cdfs.coff *.d *.sys *.o *.a *.sym *.map + base.tmp junk.tmp temp.exp cdfs.coff *.d *.sys *.o *.a *.sym *.map makefile Property changes on: trunk/reactos/drivers/fs/fs_rec ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp fs_rec.coff *.d *.o *.a *.sym *.sys *.map + base.tmp junk.tmp temp.exp fs_rec.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/fs/ms ___________________________________________________________________ Name: svn:ignore - msfs.coff *.o *.a *.sym *.sys *.map + msfs.coff *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/fs/mup ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp mup.coff *.o *.a *.sys *.sym *.map + base.tmp junk.tmp temp.exp mup.coff *.o *.a *.sys *.sym *.map makefile Property changes on: trunk/reactos/drivers/fs/np ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp npfs.coff *.d *.o *.a *.sym *.sys *.map + base.tmp junk.tmp temp.exp npfs.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/fs/ntfs ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp ntfs.coff *.d *.o *.a *.sym *.sys *.map + base.tmp junk.tmp temp.exp ntfs.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/fs/vfat ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp vfatfs.coff *.d *.o *.a *.sys *.sym *.map + base.tmp junk.tmp temp.exp vfatfs.coff *.d *.o *.a *.sys *.sym *.map makefile Property changes on: trunk/reactos/drivers/input/i8042prt ___________________________________________________________________ Name: svn:ignore - *.coff *.o *.a *.sys *.sym *.map + *.coff *.o *.a *.sys *.sym *.map makefile Property changes on: trunk/reactos/drivers/input/mouclass ___________________________________________________________________ Name: svn:ignore - mouclass.coff *.o *.a *.sym *.sys *.map + mouclass.coff *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/input/sermouse ___________________________________________________________________ Name: svn:ignore - *.coff *.o *.a *.sys *.sym *.map + *.coff *.o *.a *.sys *.sym *.map makefile Property changes on: trunk/reactos/drivers/lib/bzip2 ___________________________________________________________________ Name: svn:ignore - bzip2.dll bzip2.nostrip.sys bzip2.sym *.d *.o *.a *.map + bzip2.dll bzip2.nostrip.sys bzip2.sym *.d *.o *.a *.map makefile Property changes on: trunk/reactos/drivers/lib/csq ___________________________________________________________________ Name: svn:ignore - csq.a *.coff *.sym *.sys *.o *.map + csq.a *.coff *.sym *.sys *.o *.map makefile Property changes on: trunk/reactos/drivers/lib/ip ___________________________________________________________________ Name: svn:ignore - ip.a + ip.a makefile Property changes on: trunk/reactos/drivers/lib/oskittcp ___________________________________________________________________ Name: svn:ignore - oskittcp.a + oskittcp.a makefile Property changes on: trunk/reactos/drivers/net/afd ___________________________________________________________________ Name: svn:ignore - *.coff *.sym *.sys *.d *.o *.a *.map + *.coff *.sym *.sys *.d *.o *.a *.map makefile Property changes on: trunk/reactos/drivers/net/dd/ne2000 ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp ne2000.coff *.sym *.o *.a *.sys *.map + base.tmp junk.tmp temp.exp ne2000.coff *.sym *.o *.a *.sys *.map makefile Property changes on: trunk/reactos/drivers/net/dd/pcnet ___________________________________________________________________ Name: svn:ignore - *.o *.a *.d *.sys *.coff *.sym *.map + *.o *.a *.d *.sys *.coff *.sym *.map makefile Property changes on: trunk/reactos/drivers/net/ndis ___________________________________________________________________ Name: svn:ignore - objects ndis.coff *.d *.o *.a *.sym *.sys *.map + objects ndis.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/net/npf ___________________________________________________________________ Name: svn:ignore - *.coff *.d *.o *.a *.sym *.sys *.map + *.coff *.d *.o *.a *.sym *.sys *.map makefile Property changes on: trunk/reactos/drivers/net/tcpip ___________________________________________________________________ Name: svn:ignore - objects [truncated at 1000 lines; 4251 more skipped]

1 0

[mf] 15766: set tsvn:logminsize property
by mf＠svn.reactos.com 04 Jun '05

04 Jun '05

set tsvn:logminsize property Property changes on: trunk/reactos ___________________________________________________________________ Name: tsvn:logminsize + 10

1 0

[mf] 15765: set tsvn:logminsize property on root
by mf＠svn.reactos.com 04 Jun '05

04 Jun '05

set tsvn:logminsize property on root Property changes on: ___________________________________________________________________ Name: tsvn:logminsize + 10

1 0

[mf] 15764: set tsvn:logminsize property
by mf＠svn.reactos.com 04 Jun '05

04 Jun '05

set tsvn:logminsize property Property changes on: trunk/reactos/subsys/system/explorer ___________________________________________________________________ Name: tsvn:logminsize + 10

1 0

[ion] 15763: Add inbv header, stub InvbDisplayString, fix BSOD to always show on screen like it should, make bugcheck macros show the bugcheck data in the debug output. I hope this appeases Hartmut a bit =)
by ion＠svn.reactos.com 04 Jun '05

04 Jun '05

Add inbv header, stub InvbDisplayString, fix BSOD to always show on screen like it should, make bugcheck macros show the bugcheck data in the debug output. I hope this appeases Hartmut a bit =) Modified: trunk/reactos/include/ddk/kefuncs.h Modified: trunk/reactos/include/ntos/kefuncs.h Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Added: trunk/reactos/ntoskrnl/include/internal/inbv.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/include/ddk/kefuncs.h --- trunk/reactos/include/ddk/kefuncs.h 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/include/ddk/kefuncs.h 2005-06-04 00:25:04 UTC (rev 15763) @@ -2,7 +2,7 @@ #ifndef __INCLUDE_DDK_KEFUNCS_H #define __INCLUDE_DDK_KEFUNCS_H -#define KEBUGCHECK(a) DbgPrint("KeBugCheck at %s:%i\n",__FILE__,__LINE__), KeBugCheck(a) +#define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) /* KERNEL FUNCTIONS ********************************************************/ _____ Modified: trunk/reactos/include/ntos/kefuncs.h --- trunk/reactos/include/ntos/kefuncs.h 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/include/ntos/kefuncs.h 2005-06-04 00:25:04 UTC (rev 15763) @@ -6,8 +6,8 @@ #ifndef __INCLUDE_NTOS_KEFUNCS_H #define __INCLUDE_NTOS_KEFUNCS_H -#define KEBUGCHECK(a) DbgPrint("KeBugCheck at %s:%i\n",__FILE__,__LINE__), KeBugCheck(a) -#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx at %s:%i\n",__FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) +#define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) +#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) #ifdef __NTOSKRNL__ _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-04 00:25:04 UTC (rev 15763) @@ -66,7 +66,6 @@ { } - BOOLEAN STDCALL InbvCheckDisplayOwnership(VOID) @@ -74,15 +73,24 @@ return FALSE; } - BOOLEAN STDCALL InbvDisplayString(IN PCHAR String) { - return FALSE; + /* Call Bootvid (we don't support bootvid for now) + * vidDisplayString(String); + * so instead, we'll fall-back to HAL + */ + HalDisplayString(String); + + /* Call Headless (We don't support headless for now) + HeadlessDispatch(DISPLAY_STRING); + */ + + /* Return success */ + return TRUE; } - BOOLEAN STDCALL InbvResetDisplayParameters(ULONG SizeX, ULONG SizeY) _____ Added: trunk/reactos/ntoskrnl/include/internal/inbv.h --- trunk/reactos/ntoskrnl/include/internal/inbv.h 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h 2005-06-04 00:25:04 UTC (rev 15763) @@ -0,0 +1,15 @@ +#ifndef NTOSKRNL_INBV_H +#define NTOSKRNL_INBV_H + +/* INCLUDES ******************************************************************/ + +/* DEFINES *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +STDCALL +InbvDisplayString(IN PCHAR String); + +#endif /* NTOSKRNL_INBV_H */ + _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-04 00:25:04 UTC (rev 15763) @@ -64,6 +64,7 @@ #include <internal/safe.h> #include <internal/tag.h> #include <internal/test.h> +#include <internal/inbv.h> #include <napi/core.h> #include <napi/dbg.h> #include <napi/teb.h> _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-06-04 00:25:04 UTC (rev 15763) @@ -206,19 +206,19 @@ PCHAR BugCode; /* Find the message. This code is based on RtlFindMesssage -- Alex */ - for (i = 0; i < KiBugCodeMessages->NumberOfBlocks; i++) { - + for (i = 0; i < KiBugCodeMessages->NumberOfBlocks; i++) + { /* Check if the ID Matches */ if ((BugCheckCode >= KiBugCodeMessages->Blocks[i].LowId) && - (BugCheckCode <= KiBugCodeMessages->Blocks[i].HighId)) { - + (BugCheckCode <= KiBugCodeMessages->Blocks[i].HighId)) + { /* Get Offset to Entry */ MessageEntry = (ULONG_PTR)KiBugCodeMessages + KiBugCodeMessages->Blocks[i].OffsetToEntries; IdOffset = BugCheckCode - KiBugCodeMessages->Blocks[i].LowId; /* Get offset to ID */ - for (i = 0; i < IdOffset; i++) { - + for (i = 0; i < IdOffset; i++) + { /* Advance in the Entries */ MessageEntry += ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Length; } @@ -227,16 +227,18 @@ BugCode = ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; /* Return it in the OutputString */ - if (OutputString) { - + if (OutputString) + { OutputString->Buffer = BugCode; OutputString->Length = strlen(BugCode) + 1; OutputString->MaximumLength = strlen(BugCode) + 1; - - } else { - + } + else + { /* Direct Output to Screen */ - DbgPrint("%s\n", BugCode); + CHAR BugString[100]; + sprintf(BugString, "%s\n", BugCode); + InbvDisplayString(BugString); break; } } @@ -297,24 +299,25 @@ PLIST_ENTRY CurrentEntry; MODULE_TEXT_SECTION* CurrentSection = NULL; extern LIST_ENTRY ModuleTextListHead; + CHAR PrintString[100]; /* Make sure we're switching back to the blue screen and print messages on it */ HalReleaseDisplayOwnership(); - if (KdpDebugMode.Gdb) KdpDebugMode.Screen = TRUE; + KdpDebugMode.Screen = TRUE; /* Try to find out who did this. For this, we need a Trap Frame. * Note: Some special BSODs pass the Frame/EIP as a Param. MSDN has the * info so it eventually needs to be supported. */ - if (Tf) { - + if (Tf) + { /* For now, get Address from EIP */ Address = (PVOID)Tf->Eip; /* Try to get information on the module */ CurrentEntry = ModuleTextListHead.Flink; - while (CurrentEntry != &ModuleTextListHead && CurrentEntry != NULL) { - + while (CurrentEntry != &ModuleTextListHead && CurrentEntry) + { /* Get the current Section */ CurrentSection = CONTAINING_RECORD(CurrentEntry, MODULE_TEXT_SECTION, @@ -322,8 +325,8 @@ /* Check if this is the right one */ if ((Address != NULL && (Address >= (PVOID)CurrentSection->Base && - Address < (PVOID)(CurrentSection->Base + CurrentSection->Length)))) { - + Address < (PVOID)(CurrentSection->Base + CurrentSection->Length)))) + { /* We got it */ GotExtendedCrashInfo = TRUE; break; @@ -345,60 +348,67 @@ /* FIXMEs: Use inbv to clear, fill and write to screen. */ /* Show the STOP Message */ - DbgPrint("A problem has been detected and ReactOS has been shut down to prevent " - "damage to your computer.\n\n"); + InbvDisplayString("A problem has been detected and ReactOS has been shut down to prevent " + "damage to your computer.\n\n"); /* Show the module name of who caused this */ - if (GotExtendedCrashInfo) { - - DbgPrint("The problem seems to be caused by the following file: %S\n\n", CurrentSection->Name); + if (GotExtendedCrashInfo) + { + sprintf(PrintString, + "The problem seems to be caused by the following file: %S\n\n", + CurrentSection->Name); + InbvDisplayString(PrintString); } /* Find the Bug Code String */ KeGetBugMessageText(BugCheckCode, NULL); /* Show the techincal Data */ - DbgPrint("Technical information:\n\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\n\n", - BugCheckCode, - BugCheckParameter1, - BugCheckParameter2, - BugCheckParameter3, - BugCheckParameter4); + sprintf(PrintString, + "Technical information:\n\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\n\n", + BugCheckCode, + (PVOID)BugCheckParameter1, + (PVOID)BugCheckParameter2, + (PVOID)BugCheckParameter3, + (PVOID)BugCheckParameter4); + InbvDisplayString(PrintString); /* Show the module name and more data of who caused this */ - if (GotExtendedCrashInfo) { - - DbgPrint("*** %S - Address 0x%p base at 0x%p, DateStamp 0x%x\n\n", - CurrentSection->Name, - Address, - CurrentSection->Base, - 0); + if (GotExtendedCrashInfo) + { + sprintf(PrintString, + "*** %S - Address 0x%p base at 0x%p, DateStamp 0x%x\n\n", + CurrentSection->Name, + Address, + (PVOID)CurrentSection->Base, + 0); + InbvDisplayString(PrintString); } /* There can only be one Bugcheck per Bootup */ - if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) { - + if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) + { #ifdef CONFIG_SMP ULONG i; /* Freeze the other CPUs */ - for (i = 0; i < KeNumberProcessors; i++) { - if (i != KeGetCurrentProcessorNumber()) { - + for (i = 0; i < KeNumberProcessors; i++) + { + if (i != KeGetCurrentProcessorNumber()) + { /* Send the IPI and give them one second to catch up */ KiIpiSendRequest(1 << i, IPI_REQUEST_FREEZE); KeStallExecutionProcessor(1000000); } } #endif - /* Check if we got a Trap Frame */ - if (Tf) { - + if (Tf) + { /* Dump it */ KiDumpTrapFrame(Tf, BugCheckParameter1, BugCheckParameter2); - - } else { - + } + else + { /* We can only dump the frames */ #if defined(__GNUC__) KeDumpStackFrames((PULONG)__builtin_frame_address(0)); @@ -423,7 +433,8 @@ Tf); /* Wake up the Debugger */ - if (KdDebuggerEnabled) { + if (KdDebuggerEnabled) + { Ke386EnableInterrupts(); DbgBreakPointWithStatus(DBG_STATUS_BUGCHECK_SECOND); Ke386DisableInterrupts(); @@ -470,10 +481,11 @@ * BugCheckCode = Specifies the reason for the bug check * RETURNS: Doesn't */ -VOID STDCALL +VOID +STDCALL KeBugCheck(ULONG BugCheckCode) { - KeBugCheckEx(BugCheckCode, 0, 0, 0, 0); + KeBugCheckEx(BugCheckCode, 0, 0, 0, 0); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-06-03 23:21:21 UTC (rev 15762) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-06-04 00:25:04 UTC (rev 15763) @@ -135,7 +135,7 @@ current_entry = current_entry->Flink; } - address = (PVOID)((ULONG_PTR)address & ~0xC0000000); + address = (PVOID)((ULONG_PTR)address & ~KERNEL_BASE); } while(++i <= 1); return(FALSE);

1 0

[greatlrd] 15762: more optimze of blt. icon draw lite faster
by greatlrd＠svn.reactos.com 03 Jun '05

03 Jun '05

more optimze of blt. icon draw lite faster Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-06-03 22:44:38 UTC (rev 15761) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-06-03 23:21:21 UTC (rev 15762) @@ -120,6 +120,11 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); +BOOLEAN DIB_32DstInvert(PBLTINFO); +BOOLEAN DIB32_Srccopy(PBLTINFO BltInfo); +BOOLEAN DIB32_ColorFill(PBLTINFO BltInfo, ULONG); +BOOLEAN DIB32_SrcPaint(PBLTINFO BltInfo); + extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; #define MASK1BPP(x) (1<<(7-((x)&7))) _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 22:44:38 UTC (rev 15761) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 23:21:21 UTC (rev 15762) @@ -19,6 +19,7 @@ /* $Id$ */ #include <w32k.h> + VOID DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { @@ -311,205 +312,31 @@ case ROP4_BLACKNESS: //return(0x00000000); - - -#ifdef _M_IX86 - if (BltInfo->DestRect.left!=0) - { - SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; - for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { - memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * - BltInfo->DestSurface->lDelta + - BltInfo->DestRect.left), 0x00000000, SourceX); - } - - } - else - { - SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * - BltInfo->DestRect.right); - - memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * - BltInfo->DestSurface->lDelta, 0x00000000, SourceX); - - - } -#else - for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { - DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.left, BltInfo->DestRect.right, DestY, 0x00000000); - } -#endif - - return TRUE; + return DIB32_ColorFill(BltInfo, 0x00000000); break; case ROP4_WHITENESS: //return(0xFFFFFFFF); -#ifdef _M_IX86 - if (BltInfo->DestRect.left!=0) - { - SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; - for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { - memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * - BltInfo->DestSurface->lDelta + - BltInfo->DestRect.left), 0xFFFFFFFF, SourceX); - } - - } - else - { - SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * - BltInfo->DestRect.right); - - memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * - BltInfo->DestSurface->lDelta, 0xFFFFFFFF, SourceX); - - - } -#else - for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { - DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.left, BltInfo->DestRect.left, DestY, 0xFFFFFFFF); - } -#endif - return TRUE; + return DIB32_ColorFill(BltInfo, 0xFFFFFFFF); break; case ROP4_SRCCOPY: - // return(Source); - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - { - /* calc dest start position */ - PBYTE Destbyteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; - PDWORD Destaddr = (PDWORD)Destbyteaddr + BltInfo->DestRect.left; - LONG DestxlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; - - /* calc src start position */ - - SourceY = BltInfo->SourcePoint.y; - - for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) - { - - if (SourceY > BltInfo->SourceSurface->sizlBitmap.cy) break; - - SourceX = BltInfo->SourcePoint.x; - - for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, SourceX++, Destaddr++) - { - if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; - - *Destaddr = DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest); - } - Destaddr+=DestxlDelta; - } - return TRUE; - break; - } - - - case BMF_32BPP: - { - INT Destdelta; - INT Sourcedelta; - register PBYTE Destaddr; - register PBYTE Srcaddr; - LONG DesmaxX, DesmaxY; - LONG SrcmaxX, SrcmaxY; - - - SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; - SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y; - - - DesmaxX = BltInfo->DestRect.right - BltInfo->DestRect.left; - DesmaxY = BltInfo->DestRect.bottom - BltInfo->DestRect.top; - - - if (DesmaxX > SrcmaxX ) DesmaxX = SrcmaxX; - if (DesmaxY > SrcmaxY ) DesmaxY = SrcmaxY; - - - Destdelta = BltInfo->DestSurface->lDelta; - Sourcedelta = BltInfo->SourceSurface->lDelta; - Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; - Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + BltInfo->SourcePoint.x; - - DesmaxX *= 4; - if (DesmaxY > 0) - { - do - { - RtlCopyMemory(Destaddr, Srcaddr, DesmaxX); - Destaddr += Destdelta; - Srcaddr += Sourcedelta; - } - while (--DesmaxY); - } - return TRUE; - break; - } - - default: - break; - } - - break; + // return(Source); + return DIB32_Srccopy(BltInfo); + break; - case ROP4_NOTSRCERASE: - // return(~(Dest | Source)); - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - { - /* calc dest start position */ - PBYTE Destbyteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; - PDWORD Destaddr = (PDWORD)Destbyteaddr + BltInfo->DestRect.left; - LONG DestxlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + case ROP4_DSTINVERT: + // return(~Dest); + return DIB_32DstInvert(BltInfo); + break; - SourceY = BltInfo->SourcePoint.y; - - for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) - { - - if (SourceY > BltInfo->SourceSurface->sizlBitmap.cy) break; - - SourceX = BltInfo->SourcePoint.x; - - for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, SourceX++, Destaddr++) - { - if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; - - *Destaddr = ~(*Destaddr | DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } - Destaddr+=DestxlDelta; - } - return TRUE; - break; - - default: - break; - } - } - break; - + case ROP4_SRCPAINT: + // return(Dest | Source); + return DIB32_SrcPaint(BltInfo); + break; - default: - break; + default: + break; } UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); @@ -570,6 +397,250 @@ return TRUE; } +/* optimze functions for bitblt */ +BOOLEAN +DIB_32DstInvert(PBLTINFO BltInfo) +{ + // return(~Dest); + ULONG DestX, DestY; + ULONG Dest; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++) + { + Dest = *DestBits; + *DestBits = ~Dest; + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + } +return TRUE; +} + +BOOLEAN +DIB32_SrcPaint(PBLTINFO BltInfo) +{ + BOOLEAN status = FALSE; + + // return(Source); + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + ULONG Dest; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + + Dest = *DestBits; + *DestBits = (Dest | DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } + + } + status = TRUE; + break; + + case BMF_32BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + ULONG Dest; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + + Dest = *DestBits; + *DestBits = (Dest | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } + + } + status = TRUE; + break; + + default: + break; + } + + return status; +} +BOOLEAN +DIB32_Srccopy(PBLTINFO BltInfo) +{ + BOOLEAN status = FALSE; + + // return(Source); + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + ULONG Dest; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) + BltInfo->DestSurface->lDelta; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; + + Dest = *DestBits; + *DestBits = DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits - delta); + SourceY++; + } + + } + status = TRUE; + break; + + case BMF_32BPP: + { + INT Destdelta; + INT Sourcedelta; + register PBYTE Destaddr; + register PBYTE Srcaddr; + LONG DesmaxX, DesmaxY; + LONG SrcmaxX, SrcmaxY; + + SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; + SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y; + + DesmaxX = BltInfo->DestRect.right - BltInfo->DestRect.left; + DesmaxY = BltInfo->DestRect.bottom - BltInfo->DestRect.top; + + if (DesmaxX > SrcmaxX ) DesmaxX = SrcmaxX; + if (DesmaxY > SrcmaxY ) DesmaxY = SrcmaxY; + + Destdelta = BltInfo->DestSurface->lDelta; + Sourcedelta = BltInfo->SourceSurface->lDelta; + Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; + Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + BltInfo->SourcePoint.x; + + DesmaxX *= 4; + if (DesmaxY > 0) + { + do + { + RtlCopyMemory(Destaddr, Srcaddr, DesmaxX); + Destaddr += Destdelta; + Srcaddr += Sourcedelta; + } + while (--DesmaxY); + } + status = TRUE; + break; + } + default: + break; + } + +return status; +} + +BOOLEAN +DIB32_ColorFill(PBLTINFO BltInfo, ULONG color) +{ + ULONG DestY; + +#ifdef _M_IX86 + ULONG SourceX; + + if (BltInfo->DestRect.left!=0) + { + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { + memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * + BltInfo->DestSurface->lDelta + + BltInfo->DestRect.left), color, SourceX); + } + + } else { + SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right); + + memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * + BltInfo->DestSurface->lDelta, color, SourceX); + + } +#else + ULONG SourceY; + + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { + DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.left, BltInfo->DestRect.right, DestY, color); + } +#endif + + return TRUE; +} /* ======================================= Stretching functions goes below

1 0

[hpoussin] 15761: Don't define asm macros that are not used
by hpoussin＠svn.reactos.com 03 Jun '05

03 Jun '05

Don't define asm macros that are not used Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-06-03 21:18:09 UTC (rev 15760) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-06-03 22:44:38 UTC (rev 15761) @@ -217,9 +217,6 @@ #define KBD_WRAP_MASK 0x1F -#define disable() __asm__("cli\n\t") -#define enable() __asm__("sti\n\t") - #define ALT_PRESSED (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED) #define CTRL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)

1 0

[gvg] 15760: Fix DBG := 0 build
by gvg＠svn.reactos.com 03 Jun '05

03 Jun '05

Fix DBG := 0 build Modified: trunk/reactos/lib/kjs/kjs.xml Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/lib/kjs/kjs.xml --- trunk/reactos/lib/kjs/kjs.xml 2005-06-03 19:54:52 UTC (rev 15759) +++ trunk/reactos/lib/kjs/kjs.xml 2005-06-03 21:18:09 UTC (rev 15760) @@ -2,6 +2,7 @@ <include base="kjs">.</include> <include base="kjs">src</include> <include base="kjs">include</include> + <define name="__NO_CTYPE_INLINES" /> <directory name="ksrc"> <file>setjmp.S</file> <file>longjmp.S</file> _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-06-03 19:54:52 UTC (rev 15759) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-06-03 21:18:09 UTC (rev 15760) @@ -12,8 +12,8 @@ <library>pseh</library> <library>rtl</library> <library>rosrtl</library> + <library>rossym</library> <library>string</library> - <library>rossym</library> <directory name="include"> <pch>ntoskrnl.h</pch> </directory> @@ -346,4 +346,7 @@ <file>token.c</file> </directory> <file>ntoskrnl.rc</file> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> </module>

1 0

← Newer
1
...
57
58
59
60
61
62
63
64
65
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 June 2005