Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[fireball] 20553: Add kbdur.dll (Ukrainian keyboard layout) to the install-cd.

by fireball＠svn.reactos.org

Add kbdur.dll (Ukrainian keyboard layout) to the install-cd. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-03 21:17:28 UTC (rev 20552) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-03 21:29:39 UTC (rev 20553) @@ -113,6 +113,7 @@ lib\keyboard\kbdse\kbdse.dll 1 lib\keyboard\kbdsg\kbdsg.dll 1 lib\keyboard\kbduk\kbduk.dll 1 +lib\keyboard\kbdur\kbdur.dll 1 lib\keyboard\kbdus\kbdus.dll 1 lib\kernel32\kernel32.dll 1 lib\lsasrv\lsasrv.dll 1

18 years, 10 months

[gedmurphy] 20552: fix ugly tab formatting

by gedmurphy＠svn.reactos.org

fix ugly tab formatting Modified: trunk/reactos/lib/cpl/sysdm/resource.h _____ Modified: trunk/reactos/lib/cpl/sysdm/resource.h --- trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-03 21:00:06 UTC (rev 20551) +++ trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-03 21:17:28 UTC (rev 20552) @@ -13,17 +13,17 @@ #define RC_LICENSE 101 #define RTDATA 300 -#define IDI_CPLSYSTEM 100 +#define IDI_CPLSYSTEM 100 #define IDI_DEVMGR 101 -#define IDD_PROPPAGEGENERAL 100 -#define IDD_PROPPAGECOMPUTER 101 -#define IDD_PROPPAGEHARDWARE 102 -#define IDD_PROPPAGEUSERPROFILE 103 -#define IDD_PROPPAGEADVANCED 104 +#define IDD_PROPPAGEGENERAL 100 +#define IDD_PROPPAGECOMPUTER 101 +#define IDD_PROPPAGEHARDWARE 102 +#define IDD_PROPPAGEUSERPROFILE 103 +#define IDD_PROPPAGEADVANCED 104 -#define IDS_CPLSYSTEMNAME 1001 -#define IDS_CPLSYSTEMDESCRIPTION 2001 +#define IDS_CPLSYSTEMNAME 1001 +#define IDS_CPLSYSTEMDESCRIPTION 2001 /* controls */ #define IDC_LICENSEMEMO 101 @@ -32,19 +32,19 @@ #define IDC_PROCESSORSPEED 104 #define IDC_SYSTEMMEMORY 105 #define IDC_DEVMGR 106 -#define IDC_ENVVAR 107 -#define IDC_STAREC 108 -#define IDC_PERFOR 109 +#define IDC_ENVVAR 107 +#define IDC_STAREC 108 +#define IDC_PERFOR 109 #define IDC_ICON1 201 -#define IDC_COMPUTERNAME 202 -#define IDC_WORKGROUPDOMAIN_NAME 203 +#define IDC_COMPUTERNAME 202 +#define IDC_WORKGROUPDOMAIN_NAME 203 #define IDC_WORKGROUPDOMAIN 204 -#define IDC_NETWORK_ID 205 -#define IDC_NETWORK_PROPERTY 206 +#define IDC_NETWORK_ID 205 +#define IDC_NETWORK_PROPERTY 206 #define IDC_HARDWARE_WIZARD 207 -#define IDC_HARDWARE_PROFILE 210 -#define IDC_HARDWARE_DRIVER_SIGN 211 +#define IDC_HARDWARE_PROFILE 210 +#define IDC_HARDWARE_DRIVER_SIGN 211 #define IDC_HARDWARE_DEVICE_MANAGER 212 #define IDC_USERPROFILE_LIST 213

18 years, 10 months

[gedmurphy] 20551: Skeleton dialog box to control system page file size

by gedmurphy＠svn.reactos.org

Skeleton dialog box to control system page file size Modified: trunk/reactos/lib/cpl/sysdm/advanced.c Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/cpl/sysdm/resource.h Modified: trunk/reactos/lib/cpl/sysdm/sysdm.h Modified: trunk/reactos/lib/cpl/sysdm/sysdm.xml Added: trunk/reactos/lib/cpl/sysdm/virtmem.c _____ Modified: trunk/reactos/lib/cpl/sysdm/advanced.c --- trunk/reactos/lib/cpl/sysdm/advanced.c 2006-01-03 18:49:10 UTC (rev 20550) +++ trunk/reactos/lib/cpl/sysdm/advanced.c 2006-01-03 21:00:06 UTC (rev 20551) @@ -48,6 +48,13 @@ case WM_COMMAND: switch(LOWORD(wParam)) { + case IDC_PERFOR: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_VIRTMEM), + hwndDlg, + VirtMemDlgProc); + break; + case IDC_ENVVAR: DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), @@ -60,4 +67,3 @@ } return FALSE; } - _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2006-01-03 18:49:10 UTC (rev 20550) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2006-01-03 21:00:06 UTC (rev 20551) @@ -93,6 +93,34 @@ PUSHBUTTON "&Startup and Recovery...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(1 9)+2,(18*PROPSHEETPADDING),14 END + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Virtual Memory" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + CONTROL "",IDC_PAGEFILELIST,"ListBox",0x50010141,10,16,204,52,0x00000200 + LTEXT "Drive [Volume Label]", -1, 12, 5, 96, 9 + LTEXT "Paging File Size (MB)", -1, 114, 5, 100, 9 + CONTROL "Paging file size for selected drive",IDC_DRIVEGROUP,"Button",0x50000007,10,70,204,104 + LTEXT "", IDC_DRIVE, 20, 84, 100, 9 + LTEXT "", IDC_SPACEAVAIL, 20, 94, 112, 8 + CONTROL "Custom size",IDC_CUSTOM,"Button",0x50010009,20,105,54,9 + CONTROL "",IDC_INITIALSIZE,"Edit",0x50010000,100,114,44,13,0x00000200 + CONTROL "",IDC_MAXSIZE,"Edit",0x50010000,100,129,44,13,0x00000200 + LTEXT "Initial size (MB):", -1 ,22,118,54,9 + LTEXT "Maximum size (MB):", -1 ,22,131,64,9 + CONTROL "System managed size",IDC_SYSMANSIZE,"Button",0x50010009,20,145,88,9 + CONTROL "No paging file",IDC_NOPAGEFILE,"Button",0x50010009,20,158,78,9 + PUSHBUTTON "Set",IDC_SET, 158, 155, 50, 13 + CONTROL "Total paging file size for all drives", IDC_TOTALGROUP, "Button", 0x50000007, 10, 179, 204, 46 + PUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Cancel", IDCANCEL, 168, 232, 48, 13 + LTEXT "", IDC_MINIMUM, 18, 200, 100, 9 + LTEXT "", IDC_RECOMMENDED, 18, 200, 100, 9 + LTEXT "", IDC_CURRENT, 18, 200, 100, 9 +END + IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Environment Variables" @@ -132,8 +160,13 @@ END -STRINGTABLE +STRINGTABLE DISCARDABLE BEGIN IDS_CPLSYSTEMNAME "System" IDS_CPLSYSTEMDESCRIPTION "See information about your computer and change various system and hardware settings." + IDS_DRIVE "Drive: %s" + IDS_SPACE "Space available %s" + IDS_MIN "Minimum allowed: %s" + IDS_REC "Recommended: %s" + IDS_CUR "Currently allocated: %s" END _____ Modified: trunk/reactos/lib/cpl/sysdm/resource.h --- trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-03 18:49:10 UTC (rev 20550) +++ trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-03 21:00:06 UTC (rev 20551) @@ -10,42 +10,42 @@ #define ICONSIZE 16 /* ids */ -#define RC_LICENSE 101 -#define RTDATA 300 +#define RC_LICENSE 101 +#define RTDATA 300 -#define IDI_CPLSYSTEM 100 -#define IDI_DEVMGR 101 +#define IDI_CPLSYSTEM 100 +#define IDI_DEVMGR 101 -#define IDD_PROPPAGEGENERAL 100 -#define IDD_PROPPAGECOMPUTER 101 -#define IDD_PROPPAGEHARDWARE 102 -#define IDD_PROPPAGEUSERPROFILE 103 -#define IDD_PROPPAGEADVANCED 104 +#define IDD_PROPPAGEGENERAL 100 +#define IDD_PROPPAGECOMPUTER 101 +#define IDD_PROPPAGEHARDWARE 102 +#define IDD_PROPPAGEUSERPROFILE 103 +#define IDD_PROPPAGEADVANCED 104 -#define IDS_CPLSYSTEMNAME 1001 -#define IDS_CPLSYSTEMDESCRIPTION 2001 +#define IDS_CPLSYSTEMNAME 1001 +#define IDS_CPLSYSTEMDESCRIPTION 2001 /* controls */ -#define IDC_LICENSEMEMO 101 +#define IDC_LICENSEMEMO 101 #define IDC_PROCESSORMANUFACTURER 102 -#define IDC_PROCESSOR 103 -#define IDC_PROCESSORSPEED 104 -#define IDC_SYSTEMMEMORY 105 -#define IDC_DEVMGR 106 -#define IDC_ENVVAR 107 -#define IDC_STAREC 108 -#define IDC_PERFOR 109 -#define IDC_ICON1 201 +#define IDC_PROCESSOR 103 +#define IDC_PROCESSORSPEED 104 +#define IDC_SYSTEMMEMORY 105 +#define IDC_DEVMGR 106 +#define IDC_ENVVAR 107 +#define IDC_STAREC 108 +#define IDC_PERFOR 109 +#define IDC_ICON1 201 -#define IDC_COMPUTERNAME 202 -#define IDC_WORKGROUPDOMAIN_NAME 203 -#define IDC_WORKGROUPDOMAIN 204 -#define IDC_NETWORK_ID 205 -#define IDC_NETWORK_PROPERTY 206 -#define IDC_HARDWARE_WIZARD 207 -#define IDC_HARDWARE_PROFILE 210 -#define IDC_HARDWARE_DRIVER_SIGN 211 -#define IDC_HARDWARE_DEVICE_MANAGER 212 +#define IDC_COMPUTERNAME 202 +#define IDC_WORKGROUPDOMAIN_NAME 203 +#define IDC_WORKGROUPDOMAIN 204 +#define IDC_NETWORK_ID 205 +#define IDC_NETWORK_PROPERTY 206 +#define IDC_HARDWARE_WIZARD 207 +#define IDC_HARDWARE_PROFILE 210 +#define IDC_HARDWARE_DRIVER_SIGN 211 +#define IDC_HARDWARE_DEVICE_MANAGER 212 #define IDC_USERPROFILE_LIST 213 #define IDC_USERPROFILE_DELETE 214 @@ -66,6 +66,32 @@ #define IDC_VARIABLE_NAME 230 #define IDC_VARIABLE_VALUE 231 +/* Virtual memory */ +#define IDD_VIRTMEM 107 +#define IDC_PAGEFILELIST 240 +#define IDC_DRIVEGROUP 241 +#define IDC_DRIVE 242 +#define IDC_SPACEAVAIL 243 +#define IDC_CUSTOM 244 +#define IDC_INITIALSIZE 245 +#define IDC_MAXSIZE 246 +#define IDC_SYSMANSIZE 247 +#define IDC_NOPAGEFILE 248 +#define IDC_SET 249 +#define IDC_TOTALGROUP 250 +#define IDC_MINIMUM 251 +#define IDC_RECOMMENDED 252 +#define IDC_CURRENT 253 + +#define IDS_DRIVE 1000 +#define IDS_SPACE 1001 +#define IDS_MIN 1002 +#define IDS_REC 1003 +#define IDS_CUR 1004 + + + + #endif /* __CPL_RESOURCE_H */ /* EOF */ _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.h --- trunk/reactos/lib/cpl/sysdm/sysdm.h 2006-01-03 18:49:10 UTC (rev 20550) +++ trunk/reactos/lib/cpl/sysdm/sysdm.h 2006-01-03 21:00:06 UTC (rev 20551) @@ -22,9 +22,12 @@ INT_PTR CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* environment.c */ -INT_PTR CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +/* virtmem.c */ +INT_PTR CALLBACK VirtMemDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + #endif /* __CPL_SYSDM_H */ /* EOF */ _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.xml --- trunk/reactos/lib/cpl/sysdm/sysdm.xml 2006-01-03 18:49:10 UTC (rev 20550) +++ trunk/reactos/lib/cpl/sysdm/sysdm.xml 2006-01-03 21:00:06 UTC (rev 20551) @@ -17,5 +17,6 @@ <file>hardware.c</file> <file>sysdm.c</file> <file>userprofile.c</file> + <file>virtmem.c</file> <file>sysdm.rc</file> </module> _____ Added: trunk/reactos/lib/cpl/sysdm/virtmem.c --- trunk/reactos/lib/cpl/sysdm/virtmem.c 2006-01-03 18:49:10 UTC (rev 20550) +++ trunk/reactos/lib/cpl/sysdm/virtmem.c 2006-01-03 21:00:06 UTC (rev 20551) @@ -0,0 +1,38 @@ +#include <windows.h> +#include <commctrl.h> +#include <stdlib.h> +#include <tchar.h> + +#include "resource.h" +#include "sysdm.h" + + +/* Environment dialog procedure */ +INT_PTR CALLBACK +VirtMemDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDCANCEL: + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + + case WM_NOTIFY: + break; + } + + return FALSE; +} + +/* EOF */

18 years, 10 months

[greatlrd] 20550: Commit a patch for hide and show mouse. (forget it)

by greatlrd＠svn.reactos.org

Commit a patch for hide and show mouse. (forget it) Modified: trunk/reactos/subsys/win32k/eng/mouse.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2006-01-03 17:59:56 UTC (rev 20549) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2006-01-03 18:49:10 UTC (rev 20550) @@ -156,7 +156,19 @@ pgp->Enabled = FALSE; + + /* + * The mouse is hide from ShowCours and it is frist ?? + */ + if (pgp->ShowPointer < 0) + { + return ; + } + + /* + * Hide the cours + */ pt.x = pgp->Pos.x - pgp->HotSpot.x; pt.y = pgp->Pos.y - pgp->HotSpot.y; @@ -213,6 +225,14 @@ pgp->Enabled = TRUE; + /* + * Do not blt the mouse if it in hide + */ + if (pgp->ShowPointer < 0) + { + return ; + } + pt.x = pgp->Pos.x - pgp->HotSpot.x; pt.y = pgp->Pos.y - pgp->HotSpot.y; @@ -244,7 +264,8 @@ EngUnlockSurface(SaveSurface); } - /* + + /* * Blit the cursor on the screen. */ @@ -266,6 +287,7 @@ SrcPoint.x = max(-pt.x, 0); SrcPoint.y = max(-pt.y, 0); + if (pgp->MaskSurface) MaskSurf = EngLockSurface(pgp->MaskSurface); @@ -275,27 +297,21 @@ { if((ColorSurf = EngLockSurface(pgp->ColorSurface))) { - if (pgp->ShowPointer >= 0) - { IntEngBitBltEx(DestSurface, ColorSurf, MaskSurf, NULL, pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, R4_MASK, FALSE); EngUnlockSurface(ColorSurf); - } } } else - { - if (pgp->ShowPointer >= 0) - { + { IntEngBitBltEx(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCAND), FALSE); SrcPoint.y += pgp->Size.cy; IntEngBitBltEx(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), FALSE); - } + ROP3_TO_ROP4(SRCINVERT), FALSE); } EngUnlockSurface(MaskSurf); }

18 years, 10 months

[greatlrd] 20549: forget remove some test code.

by greatlrd＠svn.reactos.org

forget remove some test code. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 17:21:11 UTC (rev 20548) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 17:59:56 UTC (rev 20549) @@ -603,45 +603,7 @@ return TRUE; } -/* check clib region */ -BOOLEAN CheckClipRegion(CLIPOBJ *ClipRegion, RECTL* DestRect, int DesX, int DesY) -{ - BOOLEAN status = FALSE; - PSPAN ClipSpans; - UINT ClipSpansCount; - UINT SpanIndex = 0; - if (! ClipobjToSpans(&ClipSpans, &ClipSpansCount, ClipRegion, DestRect)) - { - return FALSE; - } - - if (0 == ClipSpansCount) - { - /* No clip spans == empty clipping region, everything clipped away */ - ASSERT(NULL == ClipSpans); - return FALSE; - } - - for (SpanIndex=0; SpanIndex<ClipSpansCount;SpanIndex++) - { - if (ClipSpans[SpanIndex].Y < DesY) - status = FALSE; - - if (ClipSpans[SpanIndex].Y+ClipSpans[SpanIndex].Height > DesY) - status = FALSE; - - if (ClipSpans[SpanIndex].X > DesX) - status = FALSE; - - if (ClipSpans[SpanIndex].X+ClipSpans[SpanIndex].Width > DesX) - status = FALSE; - } - - return status; -} - - //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect,

18 years, 10 months

[greatlrd] 20548: forget remove a calc value in the for loop it can do outside the loop.

by greatlrd＠svn.reactos.org

forget remove a calc value in the for loop it can do outside the loop. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 17:05:39 UTC (rev 20547) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 17:21:11 UTC (rev 20548) @@ -649,16 +649,17 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - int SrcSizeY; - int SrcSizeX; - int DesSizeY; - int DesSizeX; - int sx; - int sy; - int DesX; - int DesY; - int color; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; PULONG DestBits; + LONG DifflDelta; DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", @@ -680,7 +681,9 @@ DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); - + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + for (DesY=0; DesY<DesSizeY; DesY++) { sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; @@ -701,7 +704,7 @@ DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } } - DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); } break; @@ -711,7 +714,9 @@ DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); - + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + for (DesY=0; DesY<DesSizeY; DesY++) { sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; @@ -725,7 +730,7 @@ *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); } break; @@ -735,6 +740,8 @@ DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); for (DesY=0; DesY<DesSizeY; DesY++) { @@ -749,7 +756,7 @@ *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); } break; @@ -760,7 +767,9 @@ DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); - + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + for (DesY=0; DesY<DesSizeY; DesY++) { sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; @@ -774,8 +783,9 @@ *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); - } break; + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ @@ -783,7 +793,9 @@ DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); - + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + for (DesY=0; DesY<DesSizeY; DesY++) { sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; @@ -797,7 +809,7 @@ *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); } break;

18 years, 10 months

[greatlrd] 20547: Remove putpixel from strechblt and add code to write direcly to the memory. it incress the speed for strechblt.

by greatlrd＠svn.reactos.org

Remove putpixel from strechblt and add code to write direcly to the memory. it incress the speed for strechblt. this is ony for 16bit graphice mode. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 16:22:09 UTC (rev 20546) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 17:05:39 UTC (rev 20547) @@ -641,6 +641,7 @@ return status; } + //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, @@ -657,6 +658,8 @@ int DesX; int DesY; int color; + PULONG DestBits; + DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -674,70 +677,79 @@ case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + + DestRect->top * DestSurf->lDelta); - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++) + { + + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - { - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, 0); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } else - { - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, 1); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } } + DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); } break; case BMF_4BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + + DestRect->top * DestSurf->lDelta); - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++) + { + + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } + DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); } break; case BMF_8BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + + DestRect->top * DestSurf->lDelta); - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - BOOL UsesSource = ROP4_USES_SOURCE(mode); - BOOL UsesPattern = ROP4_USES_PATTERN(mode); - ULONG Dest; - - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++) { - - - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - Dest = DIB_16BPP_GetPixel(SourceSurf, DesX, DesY); - color = DIB_DoRop(Mode, Dest, color, 0); - - //DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } + DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); } break; @@ -746,33 +758,46 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + + DestRect->top * DestSurf->lDelta); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++) + { + + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - } - break; + DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); + } break; case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + + DestRect->top * DestSurf->lDelta); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++) + { + + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } + DestBits = (PULONG)((ULONG_PTR)DestBits - (DesSizeX << 1) + DestSurf->lDelta); } break;

18 years, 10 months

[greatlrd] 20546: addding new streach code for dib8, left to add it is dib1, dib4, dib24, dib32

by greatlrd＠svn.reactos.org

addding new streach code for dib8, left to add it is dib1, dib4, dib24, dib32 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 2006-01-03 14:56:47 UTC (rev 20545) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-03 16:22:09 UTC (rev 20546) @@ -603,6 +603,44 @@ return TRUE; } +/* check clib region */ +BOOLEAN CheckClipRegion(CLIPOBJ *ClipRegion, RECTL* DestRect, int DesX, int DesY) +{ + BOOLEAN status = FALSE; + PSPAN ClipSpans; + UINT ClipSpansCount; + UINT SpanIndex = 0; + + if (! ClipobjToSpans(&ClipSpans, &ClipSpansCount, ClipRegion, DestRect)) + { + return FALSE; + } + + if (0 == ClipSpansCount) + { + /* No clip spans == empty clipping region, everything clipped away */ + ASSERT(NULL == ClipSpans); + return FALSE; + } + + for (SpanIndex=0; SpanIndex<ClipSpansCount;SpanIndex++) + { + if (ClipSpans[SpanIndex].Y < DesY) + status = FALSE; + + if (ClipSpans[SpanIndex].Y+ClipSpans[SpanIndex].Height > DesY) + status = FALSE; + + if (ClipSpans[SpanIndex].X > DesX) + status = FALSE; + + if (ClipSpans[SpanIndex].X+ClipSpans[SpanIndex].Width > DesX) + status = FALSE; + } + + return status; +} + //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, @@ -677,19 +715,32 @@ case BMF_8BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { + { + BOOL UsesSource = ROP4_USES_SOURCE(mode); + BOOL UsesPattern = ROP4_USES_PATTERN(mode); + ULONG Dest; + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + { + + + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + Dest = DIB_16BPP_GetPixel(SourceSurf, DesX, DesY); + color = DIB_DoRop(Mode, Dest, color, 0); + + //DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; + case BMF_24BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-03 14:56:47 UTC (rev 20545) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-03 16:22:09 UTC (rev 20546) @@ -469,676 +469,119 @@ int DesX; int DesY; int color; - int zoomX; - int zoomY; - int count; - int saveX; - int saveY; - BOOLEAN DesIsBiggerY=FALSE; DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom ; - DesSizeX = DestRect->right; - - - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; - - if (DesSizeY>SrcSizeY) - DesIsBiggerY = TRUE; - switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + else + { + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } - saveY = DesY+zoomY; + break; - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - } - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, 1); - - - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, 1); - - } - } - } - } - break; - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_8BPP: return ScaleRectAvg8(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; case BMF_16BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ + case BMF_32BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - case BMF_32BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_8BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_8BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - default: DPRINT1("DIB_8BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE;

18 years, 10 months

[hbirr] 20545: Copy the correct value if the value is stored directly in the data pointer (in CmiExportValue).

by hbirr＠svn.reactos.org

Copy the correct value if the value is stored directly in the data pointer (in CmiExportValue). Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2006-01-03 13:44:35 UTC (rev 20544) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2006-01-03 14:56:47 UTC (rev 20545) @@ -1079,7 +1079,7 @@ ValueCell->DataSize = DataSize | REG_DATA_IN_OFFSET; ValueCell->DataType = DataType; memcpy (&ValueCell->DataOffset, - Data, + &Data, DataSize); } else

18 years, 10 months

[hbirr] 20544: Fixed the the conversion of the vendor identifier string. Sometimes, the wrong conversion has resulted in a invalid opcode exception.

by hbirr＠svn.reactos.org

Fixed the the conversion of the vendor identifier string. Sometimes, the wrong conversion has resulted in a invalid opcode exception. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2006-01-03 11:49:59 UTC (rev 20543) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2006-01-03 13:44:35 UTC (rev 20544) @@ -155,7 +155,7 @@ *Ptr = edx; Ptr++; *Ptr = ecx; - swprintf(VendorIdentifier, L"%s", tmpVendorIdentifier); + swprintf(VendorIdentifier, L"%S", tmpVendorIdentifier); /* Get Identifier */ GetCpuid(1, &eax, &ebx, &ecx, &edx); @@ -308,7 +308,7 @@ *Ptr = edx; Ptr++; *Ptr = ecx; - swprintf(VendorIdentifier, L"%s", tmpVendorIdentifier); + swprintf(VendorIdentifier, L"%S", tmpVendorIdentifier); /* Get 'Identifier' */ swprintf(Identifier,

18 years, 10 months

← Newer
1
...
51
52
53
54
55
56
57
58
59
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 January 2006