Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[greatlrd] 15849: dib16_hline revert GvG change until some rewrite the asm code to handler the 4 align right. for now it does

by greatlrd＠svn.reactos.com

dib16_hline revert GvG change until some rewrite the asm code to handler the 4 align right. for now it does the test 0x01,%%edi is wrong it must be test 0x03,%%edi for not break cmd in 16bpp and other apps Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 19:04:32 UTC (rev 15848) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 20:18:32 UTC (rev 15849) @@ -53,7 +53,7 @@ " shl $16, %%eax\n" " andl $0xffff, %0\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ " or %0, %%eax\n" -" test $0x03, %%edi\n" /* Align to fullword boundary */ +" test $0x01, %%edi\n" /* Align to fullword boundary */ " jz .L1\n" " stosw\n" " dec %1\n"

19 years, 3 months

[gvg] 15848: Speed up 24bpp fills

by gvg＠svn.reactos.com

Speed up 24bpp fills Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-09 18:33:45 UTC (rev 15847) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-09 19:04:32 UTC (rev 15848) @@ -38,16 +38,100 @@ DIB_24BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x1 << 1) + x1; - LONG cx = x1; + ULONG Count = x2 - x1; +#ifndef _M_IX86 + ULONG MultiCount; + ULONG Fill[3]; +#endif - c &= 0xFFFFFF; - while(cx < x2) { - *(PUSHORT)(addr) = c & 0xFFFF; - addr += 2; - *(addr) = c >> 16; - addr += 1; - ++cx; - } + if (Count < 8) + { + /* For small fills, don't bother doing anything fancy */ + while (Count--) + { + *(PUSHORT)(addr) = c; + addr += 2; + *(addr) = c >> 16; + addr += 1; + } + } + else + { + /* Align to 4-byte address */ + while (0 != ((ULONG_PTR) addr & 0x3)) + { + *(PUSHORT)(addr) = c; + addr += 2; + *(addr) = c >> 16; + addr += 1; + Count--; + } + /* If the color we need to fill with is 0ABC, then the final mem pattern + * (note little-endianness) would be: + * + * |C.B.A|C.B.A|C.B.A|C.B.A| <- pixel borders + * |C.B.A.C|B.A.C.B|A.C.B.A| <- ULONG borders + * + * So, taking endianness into account again, we need to fill with these + * ULONGs: CABC BCAB ABCA */ +#ifdef _M_IX86 + /* This is about 30% faster than the generic C code below */ + __asm__ __volatile__ ( +" movl %1, %%ecx\n" +" andl $0xffffff, %%ecx\n" /* 0ABC */ +" movl %%ecx, %%ebx\n" /* Construct BCAB in ebx */ +" shrl $8, %%ebx\n" +" movl %%ecx, %%eax\n" +" shll $16, %%eax\n" +" orl %%eax, %%ebx\n" +" movl %%ecx, %%edx\n" /* Construct ABCA in edx */ +" shll $8, %%edx\n" +" movl %%ecx, %%eax\n" +" shrl $16, %%eax\n" +" orl %%eax, %%edx\n" +" movl %%ecx, %%eax\n" /* Construct CABC in eax */ +" shll $24, %%eax\n" +" orl %%ecx, %%eax\n" +" movl %2, %%ecx\n" /* Load count */ +" shr $2, %%ecx\n" +" movl %3, %%edi\n" /* Load dest */ +".L1:\n" +" movl %%eax, (%%edi)\n" /* Store 4 pixels, 12 bytes */ +" movl %%ebx, 4(%%edi)\n" +" movl %%edx, 8(%%edi)\n" +" addl $12, %%edi\n" +" dec %%ecx\n" +" jnz .L1\n" +" movl %%edi, %0\n" + : "=m"(addr) + : "m"(c), "m"(Count), "m"(addr) + : "%eax", "%ebx", "%ecx", "%edx", "%edi"); +#else + c = c & 0xffffff; /* 0ABC */ + Fill[0] = c | (c << 24); /* CABC */ + Fill[1] = (c >> 8) | (c << 16); /* BCAB */ + Fill[2] = (c << 8) | (c >> 16); /* ABCA */ + MultiCount = Count / 4; + do + { + *(PULONG)addr = Fill[0]; + addr += 4; + *(PULONG)addr = Fill[1]; + addr += 4; + *(PULONG)addr = Fill[2]; + addr += 4; + } + while (0 != --MultiCount); +#endif + Count = Count & 0x03; + while (0 != Count--) + { + *(PUSHORT)(addr) = c; + addr += 2; + *(addr) = c >> 16; + addr += 1; + } + } } VOID @@ -308,12 +392,12 @@ { ULONG DestY; - for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) - { - DIB_24BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); - } + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_24BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); + } -return TRUE; + return TRUE; } //NOTE: If you change something here, please do the same in other dibXXbpp.c files!

19 years, 3 months

[greatlrd] 15847: correct the spelling for some comment thx w3seek

by greatlrd＠svn.reactos.com

correct the spelling for some comment thx w3seek Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 18:03:05 UTC (rev 15846) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 18:33:45 UTC (rev 15847) @@ -425,7 +425,7 @@ return TRUE; } -/* Optimze for bitBlt */ +/* Optimize for bitBlt */ BOOLEAN DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-09 18:03:05 UTC (rev 15846) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-09 18:33:45 UTC (rev 15847) @@ -478,7 +478,7 @@ return TRUE; } -/* Optimze for bitBlt */ +/* BitBlt Optimize */ BOOLEAN DIB_1BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-09 18:03:05 UTC (rev 15846) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-09 18:33:45 UTC (rev 15847) @@ -302,7 +302,7 @@ return TRUE; } -/* BitBlt Optimze */ +/* BitBlt Optimize */ BOOLEAN DIB_24BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-09 18:03:05 UTC (rev 15846) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-09 18:33:45 UTC (rev 15847) @@ -464,8 +464,9 @@ return TRUE; } -/* optimze functions for bitblt */ +/* Optimize functions for bitblt */ + BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-06-09 18:03:05 UTC (rev 15846) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-06-09 18:33:45 UTC (rev 15847) @@ -356,7 +356,7 @@ return TRUE; } -/* BitBlt Optimze */ +/* BitBlt Optimize */ BOOLEAN DIB_4BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-09 18:03:05 UTC (rev 15846) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-09 18:33:45 UTC (rev 15847) @@ -345,7 +345,7 @@ return TRUE; } -/* Optimze BitBlt */ +/* BitBlt Optimize */ BOOLEAN DIB_8BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) {

19 years, 3 months

[greatlrd] 15846: fix a comment

by greatlrd＠svn.reactos.com

fix a comment Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 17:58:33 UTC (rev 15845) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 18:03:05 UTC (rev 15846) @@ -66,7 +66,7 @@ " jz .L2\n" " stosw\n" ".L2:\n" - : // no output */ + : /* no output */ : "r"(c), "r"(Count), "D"(addr) : "%eax", "%ecx"); #else /* _M_IX86 */

19 years, 3 months

[greatlrd] 15845: fix a bug in hline for 16bpp it did not do Align to fullword boundary correct GvG did spot this lite bug. fix fill bug in 8bpp now it will boot agein thx waxdragon that did spot this problem.

by greatlrd＠svn.reactos.com

fix a bug in hline for 16bpp it did not do Align to fullword boundary correct GvG did spot this lite bug. fix fill bug in 8bpp now it will boot agein thx waxdragon that did spot this problem. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 02:12:33 UTC (rev 15844) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 17:58:33 UTC (rev 15845) @@ -49,11 +49,11 @@ __asm__( " cld\n" -" andl $0xffff, %0\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ " mov %0, %%eax\n" " shl $16, %%eax\n" +" andl $0xffff, %0\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ " or %0, %%eax\n" -" test $0x01, %%edi\n" /* Align to fullword boundary */ +" test $0x03, %%edi\n" /* Align to fullword boundary */ " jz .L1\n" " stosw\n" " dec %1\n" _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-09 02:12:33 UTC (rev 15844) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-09 17:58:33 UTC (rev 15845) @@ -352,7 +352,7 @@ ULONG DestY; for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) { - DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); + DIB_8BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); } return TRUE;

19 years, 3 months

[jimtabor] 15844: Added HcdInterfaceName from hpoussin new uhci devctrl.c.

by jimtabor＠svn.reactos.com

Added HcdInterfaceName from hpoussin new uhci devctrl.c. Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-06-09 02:01:06 UTC (rev 15843) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-06-09 02:12:33 UTC (rev 15844) @@ -25,6 +25,7 @@ PDEVICE_OBJECT FunctionalDeviceObject; PDEVICE_OBJECT NextDeviceObject; //UNICODE_STRING RegistryPath; + UNICODE_STRING HcdInterfaceName; PKINTERRUPT InterruptObject; KSPIN_LOCK InterruptSpinLock; PCM_RESOURCE_LIST AllocatedResources;

19 years, 3 months

[jimtabor] 15843: Attached Linux device to Device Extension.

by jimtabor＠svn.reactos.com

Attached Linux device to Device Extension. Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-06-09 01:43:07 UTC (rev 15842) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-06-09 02:01:06 UTC (rev 15843) @@ -25,7 +25,7 @@ // This should be removed, but for testing purposes it's here -struct pci_dev *dev; +//struct pci_dev *dev; //struct pci_device_id *dev_id; #define USB_UHCI_TAG TAG('u','s','b','u') @@ -124,9 +124,19 @@ return STATUS_SUCCESS; } + VOID STDCALL DriverUnload(PDRIVER_OBJECT DriverObject) { + POHCI_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT DeviceObject; + struct pci_dev *dev; + + DeviceObject = DriverObject->DeviceObject; + DeviceExtension = (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + dev = DeviceExtension->pdev; + DPRINT1("DriverUnload()\n"); // Exit usb device @@ -147,10 +157,14 @@ { NTSTATUS Status; POHCI_DEVICE_EXTENSION DeviceExtension = (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + struct pci_dev *dev; // Fill generic linux structs dev = ExAllocatePoolWithTag(PagedPool, sizeof(struct pci_dev), USB_UHCI_TAG); - + + /* dev->data = (struct usb_hcd hcd) used in uhci-hub.c called from uhci-hcd.c */ + DeviceExtension->pdev = dev; + init_wrapper(dev); dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension;

19 years, 3 months

[jimtabor] 15842: Fixing to start pnp of usb drivers.

by jimtabor＠svn.reactos.com

Fixing to start pnp of usb drivers. Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-06-08 17:29:59 UTC (rev 15841) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-06-09 01:43:07 UTC (rev 15842) @@ -42,6 +42,8 @@ ULONG DeviceOpened; //KMUTEX DeviceLock; //CHAR MiniPortDeviceExtension[1]; + BOOLEAN IsFDO; + struct pci_dev * pdev; } OHCI_DEVICE_EXTENSION, *POHCI_DEVICE_EXTENSION;

19 years, 3 months

[greatlrd] 15841: add my self to CREDITS

by greatlrd＠svn.reactos.com

add my self to CREDITS Modified: trunk/reactos/CREDITS _____ Modified: trunk/reactos/CREDITS --- trunk/reactos/CREDITS 2005-06-08 16:28:41 UTC (rev 15840) +++ trunk/reactos/CREDITS 2005-06-08 17:29:59 UTC (rev 15841) @@ -46,6 +46,7 @@ David Welch <welch(a)cwcom.net> Jonathan Wilson <jonwil(a)tpgi.com.au> Art Yerkes <ayerkes(a)speakeasy.net> +Magnus Olsen (magnus(a)greatlord.com) Graphic Design from

19 years, 3 months

[greatlrd] 15840: Optimze DIB32_bitblt for both DGB=0 and DGB=1

by greatlrd＠svn.reactos.com

Optimze DIB32_bitblt for both DGB=0 and DGB=1 Can not geting it faster with current c code Modified: trunk/reactos/subsys/win32k/dib/dib.c Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.c --- trunk/reactos/subsys/win32k/dib/dib.c 2005-06-07 23:11:35 UTC (rev 15839) +++ trunk/reactos/subsys/win32k/dib/dib.c 2005-06-08 16:28:41 UTC (rev 15840) @@ -35,57 +35,57 @@ { DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine, DIB_1BPP_BitBlt, DIB_1BPP_BitBltSrcCopy, DIB_1BPP_StretchBlt, - DIB_1BPP_TransparentBlt + DIB_1BPP_TransparentBlt, DIB_1BPP_ColorFill }, /* BMF_4BPP */ { DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine, DIB_4BPP_BitBlt, DIB_4BPP_BitBltSrcCopy, DIB_4BPP_StretchBlt, - DIB_4BPP_TransparentBlt + DIB_4BPP_TransparentBlt, DIB_4BPP_ColorFill }, /* BMF_8BPP */ { DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine, DIB_8BPP_BitBlt, DIB_8BPP_BitBltSrcCopy, DIB_8BPP_StretchBlt, - DIB_8BPP_TransparentBlt + DIB_8BPP_TransparentBlt, DIB_8BPP_ColorFill }, /* BMF_16BPP */ { DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine, DIB_16BPP_BitBlt, DIB_16BPP_BitBltSrcCopy, DIB_16BPP_StretchBlt, - DIB_16BPP_TransparentBlt + DIB_16BPP_TransparentBlt, DIB_16BPP_ColorFill }, /* BMF_24BPP */ { DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine, DIB_24BPP_BitBlt, DIB_24BPP_BitBltSrcCopy, DIB_24BPP_StretchBlt, - DIB_24BPP_TransparentBlt + DIB_24BPP_TransparentBlt, DIB_24BPP_ColorFill }, /* BMF_32BPP */ { DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine, DIB_32BPP_BitBlt, DIB_32BPP_BitBltSrcCopy, DIB_32BPP_StretchBlt, - DIB_32BPP_TransparentBlt + DIB_32BPP_TransparentBlt, DIB_32BPP_ColorFill }, /* BMF_4RLE */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill }, /* BMF_8RLE */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill }, /* BMF_JPEG */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill }, /* BMF_PNG */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill } }; @@ -230,4 +230,10 @@ return FALSE; } +BOOLEAN Dummy_ColorFill(SURFOBJ* Dest, RECTL* DestRect, ULONG Color) +{ + return FALSE; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-06-07 23:11:35 UTC (rev 15839) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-06-08 16:28:41 UTC (rev 15840) @@ -43,6 +43,7 @@ typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLI POBJ*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULO NG); +typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef struct { @@ -54,6 +55,7 @@ PFN_DIB_BitBlt DIB_BitBltSrcCopy; PFN_DIB_StretchBlt DIB_StretchBlt; PFN_DIB_TransparentBlt DIB_TransparentBlt; + PFN_DIB_ColorFill DIB_ColorFill; } DIB_FUNCTIONS; extern DIB_FUNCTIONS DibFunctionsForBitmapFormat[]; @@ -65,6 +67,7 @@ BOOLEAN Dummy_BitBlt(PBLTINFO); BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ* ,XLATEOBJ*,ULONG); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); VOID DIB_1BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_1BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -74,6 +77,7 @@ BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPO BJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG ); +BOOLEAN DIB_1BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); VOID DIB_4BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_4BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -83,6 +87,7 @@ BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPO BJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG ); +BOOLEAN DIB_4BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); VOID DIB_8BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_8BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -92,6 +97,7 @@ BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPO BJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG ); +BOOLEAN DIB_8BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); VOID DIB_16BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_16BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -101,6 +107,7 @@ BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); +BOOLEAN DIB_16BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); VOID DIB_24BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_24BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -110,6 +117,7 @@ BOOLEAN DIB_24BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); +BOOLEAN DIB_24BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); VOID DIB_32BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_32BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -119,17 +127,14 @@ BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO); 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_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO); -BOOLEAN FASTCALL DIB32_Srccopy(PBLTINFO); -BOOLEAN FASTCALL DIB32_ColorFill(PBLTINFO, ULONG); + BOOLEAN FASTCALL DIB32_SrcPaint(PBLTINFO); BOOLEAN FASTCALL DIB32_NotSrcErase(PBLTINFO); BOOLEAN FASTCALL DIB32_SrcErase(PBLTINFO); -BOOLEAN FASTCALL DIB_32PatCopy(PBLTINFO); - - extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; #define MASK1BPP(x) (1<<(7-((x)&7))) _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-07 23:11:35 UTC (rev 15839) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-08 16:28:41 UTC (rev 15840) @@ -42,6 +42,7 @@ { PDWORD addr = (PDWORD)((PWORD)(SurfObj->pvScan0 + y * SurfObj->lDelta) + x1); + #ifdef _M_IX86 /* This is about 10% faster than the generic C code below */ LONG Count = x2 - x1; @@ -65,7 +66,7 @@ " jz .L2\n" " stosw\n" ".L2:\n" - : /* no output */ + : // no output */ : "r"(c), "r"(Count), "D"(addr) : "%eax", "%ecx"); #else /* _M_IX86 */ @@ -88,6 +89,7 @@ #endif /* _M_IX86 */ } + VOID DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { @@ -423,7 +425,17 @@ return TRUE; } - +/* Optimze for bitBlt */ +BOOLEAN +DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_16BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); + } +return TRUE; +} /* ======================================= Stretching functions goes below _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-07 23:11:35 UTC (rev 15839) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-08 16:28:41 UTC (rev 15840) @@ -478,6 +478,20 @@ return TRUE; } +/* Optimze for bitBlt */ +BOOLEAN +DIB_1BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_1BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); + } + +return TRUE; +} + //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-07 23:11:35 UTC (rev 15839) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-08 16:28:41 UTC (rev 15840) @@ -302,6 +302,20 @@ return TRUE; } +/* BitBlt Optimze */ +BOOLEAN +DIB_24BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_24BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); + } + +return TRUE; +} + //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-07 23:11:35 UTC (rev 15839) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-08 16:28:41 UTC (rev 15840) @@ -45,54 +45,46 @@ VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - LONG cx = (x2 - x1) ; - if (cx>0) - { + LONG cx = (x2 - x1) ; PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PDWORD addr = (PDWORD)byteaddr + x1; memset4(addr, c, cx); - } - else if (cx<0) - { - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x2; - cx = (x1 - x2) ; - memset4(addr, c, cx); - } + + } #else VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - - - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x1; - LONG cx = x1; - while(cx < x2) - { - *addr = (DWORD)c; - ++addr; - ++cx; - } + PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x1; + LONG cx = x1; + while(cx < x2) + { + *addr = (DWORD)c; + ++addr; + ++cx; + } } #endif VOID DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { + + PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta; PDWORD addr = (PDWORD)byteaddr + x; - LONG lDelta = SurfObj->lDelta >> 2; /* >> 2 == / sizeof(DWORD) */ + LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD) byteaddr = (PBYTE)addr; while(y1++ < y2) { - *addr = (DWORD)c; - addr += lDelta; - } - + *addr = (DWORD)c; + addr += lDelta; + } + } BOOLEAN @@ -315,236 +307,241 @@ BOOLEAN DIB_32BPP_BitBlt(PBLTINFO BltInfo) { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - ULONG PatternY = 0; - ULONG Dest, Source = 0, Pattern = 0; - BOOL UsesSource; - BOOL UsesPattern; - PULONG DestBits; + ULONG DestX, DestY; + ULONG SourceX, SourceY; + ULONG PatternY = 0, PatternX = 0, orgPatternX = 0; + ULONG Source = 0, Pattern = 0; + BOOL UsesSource; + BOOL UsesPattern; + PULONG DestBits; + ULONG Delta; - switch (BltInfo->Rop4) - { + switch (BltInfo->Rop4) + { + case ROP4_DSTINVERT: + return DIB_32DstInvert(BltInfo); + break; - case ROP4_BLACKNESS: - //return(0x00000000); - return DIB32_ColorFill(BltInfo, 0x00000000); - break; + case ROP4_SRCPAINT: + return DIB32_SrcPaint(BltInfo); + break; - case ROP4_WHITENESS: - //return(0xFFFFFFFF); - return DIB32_ColorFill(BltInfo, 0xFFFFFFFF); - break; + case ROP4_NOTSRCERASE: + return DIB32_NotSrcErase(BltInfo); + break; - case ROP4_SRCCOPY: - // return(Source); - return DIB32_Srccopy(BltInfo); - break; - - case ROP4_DSTINVERT: - // return(~Dest); - return DIB_32DstInvert(BltInfo); - break; - - case ROP4_SRCPAINT: - // return(Dest | Source); - return DIB32_SrcPaint(BltInfo); - break; - - case ROP4_NOTSRCERASE: - return DIB32_NotSrcErase(BltInfo); - break; - case ROP4_SRCERASE: - return DIB32_SrcErase(BltInfo); - break; - - case ROP4_PATCOPY: - // return(Pattern); - return DIB_32PatCopy(BltInfo); - break; + case ROP4_SRCERASE: + return DIB32_SrcErase(BltInfo); + break; - default: - break; - } + default: + break; + } UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); SourceY = BltInfo->SourcePoint.y; - DestBits = (PULONG)( - BltInfo->DestSurface->pvScan0 + - (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - if (UsesPattern) + Delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2); + + if ((UsesSource) && (BltInfo->PatternSurface)) { - if (BltInfo->PatternSurface) + if (UsesPattern) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % - BltInfo->PatternSurface->sizlBitmap.cy; + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + BltInfo->PatternSurface->sizlBitmap.cy; } - else + + orgPatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx; + + + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { - Pattern = BltInfo->Brush->iSolidColor; - } - } + SourceX = BltInfo->SourcePoint.x; - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; + PatternX = orgPatternX; - for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) + { + + Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); + + Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest); + + *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, Source, Pattern); + + PatternX++; + PatternX %= BltInfo->PatternSurface->sizlBitmap.cx; + + } + + SourceY++; + + PatternY++; + PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; + + DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); + } + } + + else if ((UsesSource) && (!BltInfo->PatternSurface)) + { + if (UsesPattern) { - Dest = *DestBits; + Pattern = BltInfo->Brush->iSolidColor; + } - if (UsesSource) - { - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); - } + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; - if (BltInfo->PatternSurface) - { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) + { + Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); + + *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, Source, Pattern); } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + SourceY++; + DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); } + } - SourceY++; - if (BltInfo->PatternSurface) + else if ((!UsesSource) && (BltInfo->PatternSurface)) + { + if (UsesPattern) { - PatternY++; - PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + BltInfo->PatternSurface->sizlBitmap.cy; } - DestBits = (PULONG)( - (ULONG_PTR)DestBits - - ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) + - BltInfo->DestSurface->lDelta); - } - return TRUE; -} + orgPatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx; + + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) + { -/* optimze functions for bitblt */ + PatternX = orgPatternX; -BOOLEAN -FASTCALL -DIB_32PatCopy(PBLTINFO BltInfo) -{ - ULONG delta; - ULONG DestX, DestY, PatternY; - PULONG DestBits; + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++) + { + + Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest); + *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, 0, Pattern); - if (!BltInfo->PatternSurface) - { - return DIB32_ColorFill(BltInfo, XLATEOBJ_iXlate(BltInfo->XlatePatternToDest, BltInfo->Brush->iSolidColor)); - } + PatternX++; + PatternX %= BltInfo->PatternSurface->sizlBitmap.cx; + } + + PatternY++; + PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; + + DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); + } + } + else if ((!UsesSource) && (!BltInfo->PatternSurface)) + { + if (UsesPattern) + { + Pattern = BltInfo->Brush->iSolidColor; + } - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) + { - delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2); - - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++) + { + *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, 0, Pattern); + } - for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++) - { - *DestBits = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); } - - PatternY++; - PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - } - - return TRUE; } +/* optimze functions for bitblt */ + BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) { - ULONG DestX, DestY; - PULONG DestBits; + ULONG DestX, DestY; + PULONG DestBits; - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + 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); + 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++) - { - - *DestBits = ~*DestBits ; - } + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++) + { + *DestBits = ~*DestBits ; + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - } + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + } - /* Return TRUE */ - return TRUE; + /* Return TRUE */ + return TRUE; } BOOLEAN FASTCALL DIB32_SrcErase(PBLTINFO BltInfo) { - BOOLEAN status = FALSE; + BOOLEAN status = FALSE; - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + 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); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - SourceY = BltInfo->SourcePoint.y; + 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++) - { - *DestBits = ~(*DestBits & DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = ~(*DestBits & DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } - - } - status = TRUE; - break; + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } + } + status = TRUE; + break; - default: - break; - } + default: + break; + } return status; } @@ -553,51 +550,50 @@ FASTCALL DIB32_NotSrcErase(PBLTINFO BltInfo) { - BOOLEAN status = FALSE; + BOOLEAN status = FALSE; - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + 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) + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - SourceY = BltInfo->SourcePoint.y; + 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++) - { - *DestBits = ~(*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = ~(*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } - } - status = TRUE; - break; + } + status = TRUE; + break; + default: + break; + } - default: - break; - } - return status; } @@ -605,214 +601,107 @@ FASTCALL DIB32_SrcPaint(PBLTINFO BltInfo) { - BOOLEAN status = FALSE; + BOOLEAN status = FALSE; + + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; - // return(Source); - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - 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); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - SourceY = BltInfo->SourcePoint.y; + 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++) - { - - *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } - } - status = TRUE; - break; + } + status = TRUE; + break; - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; + case BMF_32BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + 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); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - SourceY = BltInfo->SourcePoint.y; + 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++) - { - *DestBits = (*DestBits | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); - } + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = (*DestBits | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); + } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } - } - status = TRUE; - break; + } + status = TRUE; + break; - default: - break; + default: + break; } return status; } BOOLEAN -FASTCALL -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: - { [truncated at 1000 lines; 237 more skipped]

19 years, 3 months

← Newer
1
...
49
50
51
52
53
54
55
...
65
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 June 2005