Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 36843: - Remove unfinished OS/2, SkyOS, VMS and web (php extension) support modules. If any of the FOSS OS/2, FreeVMS implementation teams, SkyOS team thinks those could be of use for them and community, and they want to develop them, then these modules could be easily resurrected.
by fireball＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: fireball Date: Mon Oct 20 09:08:13 2008 New Revision: 36843 URL: http://svn.reactos.org/svn/reactos?rev=36843&view=rev Log: - Remove unfinished OS/2, SkyOS, VMS and web (php extension) support modules. If any of the FOSS OS/2, FreeVMS implementation teams, SkyOS team thinks those could be of use for them and community, and they want to develop them, then these modules could be easily resurrected. Removed: branches/unmaintained/os2/ branches/unmaintained/rosky/ branches/unmaintained/vms/ branches/unmaintained/web/

1 0

[tkreuzer] 36842: display unexpected interrupts
by tkreuzer＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: tkreuzer Date: Mon Oct 20 07:22:41 2008 New Revision: 36842 URL: http://svn.reactos.org/svn/reactos?rev=36842&view=rev Log: display unexpected interrupts Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Mon Oct 20 07:22:41 2008 @@ -216,7 +216,6 @@ .global _KiUnexpectedInterrupt _KiUnexpectedInterrupt: -jmp $ movabs rcx, offset _MsgUnexpectedInterrupt movabs rax, offset _FrLdrDbgPrint call [rax]

1 0

[tkreuzer] 36841: - set the new idt in the pcr
by tkreuzer＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: tkreuzer Date: Mon Oct 20 07:21:07 2008 New Revision: 36841 URL: http://svn.reactos.org/svn/reactos?rev=36841&view=rev Log: - set the new idt in the pcr Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Mon Oct 20 07:21:07 2008 @@ -87,6 +87,7 @@ KiIdt[i].Reserved1 = 0; } + KeGetPcr()->IdtBase = KiIdt; __lidt(&KiIdtDescriptor.Limit); }

1 0

[tkreuzer] 36840: fix __rdtsc on amd64 build, "=A" doesn't work.
by tkreuzer＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: tkreuzer Date: Mon Oct 20 07:17:06 2008 New Revision: 36840 URL: http://svn.reactos.org/svn/reactos?rev=36840&view=rev Log: fix __rdtsc on amd64 build, "=A" doesn't work. Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Mon Oct 20 07:17:06 2008 @@ -1054,9 +1054,15 @@ static __inline__ __attribute__((always_inline)) unsigned long long __rdtsc(void) { +#ifdef _M_AMD64 + unsigned long long low, high; + __asm__ __volatile__("rdtsc" : "=a"(low), "=d"(high)); + return low | (high << 32); +#else unsigned long long retval; __asm__ __volatile__("rdtsc" : "=A"(retval)); return retval; +#endif } static __inline__ __attribute__((always_inline)) void __writeeflags(uintptr_t Value)

1 0

[fireball] 36839: - Move kernel32's baseaddress lower. Should fix problem with relocated kernel32 after linking in the ICU library.
by fireball＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: fireball Date: Mon Oct 20 03:17:04 2008 New Revision: 36839 URL: http://svn.reactos.org/svn/reactos?rev=36839&view=rev Log: - Move kernel32's baseaddress lower. Should fix problem with relocated kernel32 after linking in the ICU library. Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=368… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Mon Oct 20 03:17:04 2008 @@ -192,7 +192,7 @@ <property name="BASEADDRESS_MSVCRT40" value="0x78700000" /> <property name="BASEADDRESS_MSCOREE" value="0x79000000" /> <property name="BASEADDRESS_FUSION" value="0x79040000" /> - <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> + <property name="BASEADDRESS_KERNEL32" value="0x7c700000" /> <property name="BASEADDRESS_NTDLL" value="0x7c900000" /> <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> <property name="BASEADDRESS_SXS" value="0x7e690000" />

1 0

[jimtabor] 36838: - Update local DC structure and defines.
by jimtabor＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: jimtabor Date: Mon Oct 20 02:36:21 2008 New Revision: 36838 URL: http://svn.reactos.org/svn/reactos?rev=36838&view=rev Log: - Update local DC structure and defines. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Mon Oct 20 02:36:21 2008 @@ -171,9 +171,12 @@ /* DC_ATTR LCD Flags */ #define LDC_LDC 0x00000001 // (init) local DC other than a normal DC #define LDC_EMFLDC 0x00000002 // Enhance Meta File local DC +#define LDC_SAPCALLBACK 0x00000020 #define LDC_INIT_DOCUMENT 0x00000040 #define LDC_INIT_PAGE 0x00000080 +#define LDC_CLOCKWISE 0x00002000 #define LDC_KILL_DOCUMENT 0x00010000 +#define LDC_DEVCAPS 0x02000000 /* DC_ATTR Xform Flags */ #define METAFILE_TO_WORLD_IDENTITY 0x00000001 @@ -244,10 +247,13 @@ ULONG Flags; INT iType; PVOID pvEmfDC; /* Pointer to ENHMETAFILE structure */ + LPWSTR pwszPort; ABORTPROC pAbortProc; /* AbortProc for Printing */ + DWORD CallBackTick; HANDLE hPrinter; /* Local or Remote Printer driver */ - INT iInitPage; /* Start/Stop */ - INT iInitDocument; + DEVCAPS DevCaps; + HBRUSH BrushColor; + HPEN PenColor; } LDC, *PLDC; typedef struct _DC_ATTR

1 0

[jimtabor] 36837: - Cleanup IntGdiGetDeviceCaps, add more defines.
by jimtabor＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: jimtabor Date: Mon Oct 20 00:07:46 2008 New Revision: 36837 URL: http://svn.reactos.org/svn/reactos?rev=36837&view=rev Log: - Cleanup IntGdiGetDeviceCaps, add more defines. Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Mon Oct 20 00:07:46 2008 @@ -868,6 +868,8 @@ #define TCI_SRCCODEPAGE 2 #define TCI_SRCFONTSIG 3 #if (_WIN32_WINNT >= 0x0500) +#define SHADEBLENDCAPS 120 +#define COLORMGMTCAPS 121 /* SHADEBLENDCAPS */ #define SB_NONE 0x00000000 #define SB_CONST_ALPHA 0x00000001 Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon Oct 20 00:07:46 2008 @@ -190,6 +190,7 @@ #define GCABCW_INDICES 0x0002 /* CAPS1 support */ +#define CAPS1 94 //#define C1_TRANSPARENT 0x0001 #define TC_TT_ABLE 0x0002 #define C1_TT_CR_ANY 0x0004 @@ -203,6 +204,7 @@ #define C1_COLORCURSOR 0x0800 #define C1_CMYK_ABLE 0x1000 #define C1_SLOW_CARD 0x2000 +#define C1_MIRRORING 0X4000 // NtGdiGetRandomRgn iCodes #define CLIPRGN 1 // GetClipRgn Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Mon Oct 20 00:07:46 2008 @@ -143,6 +143,7 @@ nDc_Attr->dwLayout = oDc_Attr->dwLayout; if (oDc_Attr->dwLayout & LAYOUT_ORIENTATIONMASK) Layout = oDc_Attr->dwLayout; NewDC->DcLevel.flPath = OrigDC->DcLevel.flPath; + nDc_Attr->ulDirty_ = oDc_Attr->ulDirty_; DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); @@ -826,6 +827,8 @@ if(pUMdhpdev) pUMdhpdev = NewDC->PDev; // set DHPDEV for device. NewDC->pPDev = (PVOID)&PrimarySurface; NewDC->w.hBitmap = (HBITMAP)PrimarySurface.pSurface; + // ATM we only have one display. + nDc_Attr->ulDirty_ |= DC_PRIMARY_DISPLAY; NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; @@ -1555,223 +1558,6 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); } -INT FASTCALL -IntGdiGetDeviceCaps(PDC dc, INT Index) -{ - INT ret = 0; - POINT pt; - - /* Retrieve capability */ - switch (Index) - { - case DRIVERVERSION: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVersion; - break; - - case TECHNOLOGY: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulTechnology; - break; - - case HORZSIZE: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize; - break; - - case VERTSIZE: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize; - break; - - case HORZRES: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - break; - - case VERTRES: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - - case LOGPIXELSX: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulLogPixelsX; - break; - - case LOGPIXELSY: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulLogPixelsY; - break; - - case BITSPIXEL: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.cBitsPixel; - break; - - case PLANES: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.cPlanes; - break; - - case NUMBRUSHES: - UNIMPLEMENTED; /* FIXME */ - break; - - case NUMPENS: - UNIMPLEMENTED; /* FIXME */ - break; - - case NUMFONTS: - UNIMPLEMENTED; /* FIXME */ - break; - - case NUMCOLORS: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulNumColors; - break; - - case ASPECTX: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulAspectX; - break; - - case ASPECTY: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulAspectY; - break; - - case ASPECTXY: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulAspectXY; - break; - - case PDEVICESIZE: - UNIMPLEMENTED; /* FIXME */ - break; - - case CLIPCAPS: - UNIMPLEMENTED; /* FIXME */ - break; - - case SIZEPALETTE: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulNumPalReg; /* FIXME not sure */ - break; - - case NUMRESERVED: - ret = 0; - break; - - case COLORRES: - UNIMPLEMENTED; /* FIXME */ - break; - - case PHYSICALWIDTH: - if(IntGdiEscape(dc, GETPHYSPAGESIZE, 0, NULL, (LPVOID)&pt) > 0) - { - ret = pt.x; - } - else - { - ret = 0; - } - break; - - case PHYSICALHEIGHT: - if(IntGdiEscape(dc, GETPHYSPAGESIZE, 0, NULL, (LPVOID)&pt) > 0) - { - ret = pt.y; - } - else - { - ret = 0; - } - break; - - case PHYSICALOFFSETX: - if(IntGdiEscape(dc, GETPRINTINGOFFSET, 0, NULL, (LPVOID)&pt) > 0) - { - ret = pt.x; - } - else - { - ret = 0; - } - break; - - case PHYSICALOFFSETY: - if(IntGdiEscape(dc, GETPRINTINGOFFSET, 0, NULL, (LPVOID)&pt) > 0) - { - ret = pt.y; - } - else - { - ret = 0; - } - break; - - case VREFRESH: - UNIMPLEMENTED; /* FIXME */ - break; - - case SCALINGFACTORX: - if(IntGdiEscape(dc, GETSCALINGFACTOR, 0, NULL, (LPVOID)&pt) > 0) - { - ret = pt.x; - } - else - { - ret = 0; - } - break; - - case SCALINGFACTORY: - if(IntGdiEscape(dc, GETSCALINGFACTOR, 0, NULL, (LPVOID)&pt) > 0) - { - ret = pt.y; - } - else - { - ret = 0; - } - break; - - case RASTERCAPS: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.flRaster; - break; - - case CURVECAPS: - UNIMPLEMENTED; /* FIXME */ - break; - - case LINECAPS: - UNIMPLEMENTED; /* FIXME */ - break; - - case POLYGONALCAPS: - UNIMPLEMENTED; /* FIXME */ - break; - - case TEXTCAPS: - ret = ((PGDIDEVICE)dc->pPDev)->GDIInfo.flTextCaps; - break; - - default: - ret = 0; - break; - } - - return ret; -} - -INT STDCALL -NtGdiGetDeviceCaps(HDC hDC, - INT Index) -{ - PDC dc; - INT ret; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - ret = IntGdiGetDeviceCaps(dc, Index); - - DPRINT("(%04x,%d): returning %d\n", hDC, Index, ret); - - DC_UnlockDc( dc ); - return ret; -} - INT FASTCALL IntcFonts(PGDIDEVICE pDevObj) @@ -1807,6 +1593,206 @@ ret |= CM_CMYK_COLOR; if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_ICM) ret |= CM_DEVICE_ICM; + return ret; +} + +INT FASTCALL +IntGdiGetDeviceCaps(PDC dc, INT Index) +{ + INT ret = 0; + PGDIDEVICE pPDev = dc->pPDev; + /* Retrieve capability */ + switch (Index) + { + case DRIVERVERSION: + ret = pPDev->GDIInfo.ulVersion; + break; + + case TECHNOLOGY: + ret = pPDev->GDIInfo.ulTechnology; + break; + + case HORZSIZE: + ret = pPDev->GDIInfo.ulHorzSize; + break; + + case VERTSIZE: + ret = pPDev->GDIInfo.ulVertSize; + break; + + case HORZRES: + ret = pPDev->GDIInfo.ulHorzRes; + break; + + case VERTRES: + ret = pPDev->GDIInfo.ulVertRes; + break; + + case LOGPIXELSX: + ret = pPDev->GDIInfo.ulLogPixelsX; + break; + + case LOGPIXELSY: + ret = pPDev->GDIInfo.ulLogPixelsY; + break; + + case CAPS1: + if ( pPDev->pGraphicsDev && + (((PGRAPHICS_DEVICE)pPDev->pGraphicsDev)->StateFlags & + DISPLAY_DEVICE_MIRRORING_DRIVER)) + ret = C1_MIRRORING; + break; + + case BITSPIXEL: + ret = pPDev->GDIInfo.cBitsPixel; + break; + + case PLANES: + ret = pPDev->GDIInfo.cPlanes; + break; + + case NUMBRUSHES: + ret = -1; + break; + + case NUMPENS: + ret = pPDev->GDIInfo.ulNumColors; + if ( ret != -1 ) ret *= 5; + break; + + case NUMFONTS: + ret = IntcFonts(pPDev); + break; + + case NUMCOLORS: + ret = pPDev->GDIInfo.ulNumColors; + break; + + case ASPECTX: + ret = pPDev->GDIInfo.ulAspectX; + break; + + case ASPECTY: + ret = pPDev->GDIInfo.ulAspectY; + break; + + case ASPECTXY: + ret = pPDev->GDIInfo.ulAspectXY; + break; + + case CLIPCAPS: + ret = CP_RECTANGLE; + break; + + case SIZEPALETTE: + ret = pPDev->GDIInfo.ulNumPalReg; + break; + + case NUMRESERVED: + ret = 20; + break; + + case COLORRES: + ret = pPDev->GDIInfo.ulDACRed + + pPDev->GDIInfo.ulDACGreen + + pPDev->GDIInfo.ulDACBlue; + break; + + case DESKTOPVERTRES: + ret = pPDev->GDIInfo.ulVertRes; + break; + + case DESKTOPHORZRES: + ret = pPDev->GDIInfo.ulHorzRes; + break; + + case BLTALIGNMENT: + ret = pPDev->GDIInfo.ulBltAlignment; + break; + + case SHADEBLENDCAPS: + ret = pPDev->GDIInfo.flShadeBlend; + break; + + case COLORMGMTCAPS: + ret = IntGetColorManagementCaps(pPDev); + break; + + case PHYSICALWIDTH: + ret = pPDev->GDIInfo.szlPhysSize.cx; + break; + + case PHYSICALHEIGHT: + ret = pPDev->GDIInfo.szlPhysSize.cy; + break; + + case PHYSICALOFFSETX: + ret = pPDev->GDIInfo.ptlPhysOffset.x; + break; + + case PHYSICALOFFSETY: + ret = pPDev->GDIInfo.ptlPhysOffset.y; + break; + + case VREFRESH: + ret = pPDev->GDIInfo.ulVRefresh; + break; + + case RASTERCAPS: + ret = pPDev->GDIInfo.flRaster; + break; + + case CURVECAPS: + ret = (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | + CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); + break; + + case LINECAPS: + ret = (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | + LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); + break; + + case POLYGONALCAPS: + ret = (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | + PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); + break; + + case TEXTCAPS: + ret = pPDev->GDIInfo.flTextCaps; + if (pPDev->GDIInfo.ulTechnology) ret |= TC_VA_ABLE; + ret |= (TC_SO_ABLE|TC_UA_ABLE); + break; + + case PDEVICESIZE: + case SCALINGFACTORX: + case SCALINGFACTORY: + default: + ret = 0; + break; + } + + return ret; +} + +INT STDCALL +NtGdiGetDeviceCaps(HDC hDC, + INT Index) +{ + PDC dc; + INT ret; + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + ret = IntGdiGetDeviceCaps(dc, Index); + + DPRINT("(%04x,%d): returning %d\n", hDC, Index, ret); + + DC_UnlockDc( dc ); return ret; } @@ -1856,6 +1842,10 @@ pDevCaps->ulPhysicalHeight = pGdiInfo->szlPhysSize.cy; pDevCaps->ulPhysicalOffsetX = pGdiInfo->ptlPhysOffset.x; pDevCaps->ulPhysicalOffsetY = pGdiInfo->ptlPhysOffset.y; + pDevCaps->ulPanningHorzRes = pGdiInfo->ulPanningHorzRes; + pDevCaps->ulPanningVertRes = pGdiInfo->ulPanningVertRes; + pDevCaps->xPanningAlignment = pGdiInfo->xPanningAlignment; + pDevCaps->yPanningAlignment = pGdiInfo->yPanningAlignment; Tmp = 0; Tmp = pGdiInfo->flTextCaps | (TC_SO_ABLE|TC_UA_ABLE|TC_CP_STROKE|TC_OP_STROKE|TC_OP_CHARACTER); @@ -1884,13 +1874,13 @@ NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc(hDC); - if (dc == NULL) + if (!dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - pSafeDevCaps = ExAllocatePoolWithTag(PagedPool, sizeof(DEVCAPS), TAG_DC); + pSafeDevCaps = ExAllocatePoolWithTag(PagedPool, sizeof(DEVCAPS), TAG_TEMP); if (!pSafeDevCaps) { @@ -1913,16 +1903,14 @@ } _SEH_END; - if(!NT_SUCCESS(Status)) + ExFreePoolWithTag(pSafeDevCaps, TAG_TEMP); + DC_UnlockDc(dc); + + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePoolWithTag(pSafeDevCaps, TAG_DC); - DC_UnlockDc(dc); return FALSE; } - - ExFreePoolWithTag(pSafeDevCaps, TAG_DC); - DC_UnlockDc( dc ); return TRUE; }

1 0

[jimtabor] 36836: - Set GetBkColor for callers.
by jimtabor＠svn.reactos.org 20 Oct '08

20 Oct '08

Author: jimtabor Date: Sun Oct 19 23:07:42 2008 New Revision: 36836 URL: http://svn.reactos.org/svn/reactos?rev=36836&view=rev Log: - Set GetBkColor for callers. Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c [iso-8859-1] Sun Oct 19 23:07:42 2008 @@ -740,7 +740,7 @@ xMask, yMask, dwRop, - 0); + GetBkColor(hdcSrc)); } @@ -771,5 +771,5 @@ hbmMask, xMask, yMask, - 0); -} + GetBkColor(hdcSrc)); +}

1 0

[arty] 36835: Sorry, wound up reversing my change. Misread the diff.
by arty＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: arty Date: Sun Oct 19 15:11:52 2008 New Revision: 36835 URL: http://svn.reactos.org/svn/reactos?rev=36835&view=rev Log: Sorry, wound up reversing my change. Misread the diff. Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sun Oct 19 15:11:52 2008 @@ -76,14 +76,23 @@ { LARGE_INTEGER FileOffset; IO_STATUS_BLOCK IoStatus; + CC_FILE_SIZES FileSizes; if (ReadOffset + Length > Fcb->Entry.DataLengthL) Length = Fcb->Entry.DataLengthL - ReadOffset; if (FileObject->PrivateCacheMap == NULL) { + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; + + DPRINT("Attach FCB to File: Size %08x%08x\n", + Fcb->RFCB.ValidDataLength.HighPart, + Fcb->RFCB.ValidDataLength.LowPart); + CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + &FileSizes, FALSE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb); @@ -103,25 +112,65 @@ if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) { - return STATUS_INVALID_PARAMETER; - } - - if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) - Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - - Status = CdfsReadSectors(DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), - Length / BLOCKSIZE, - Buffer, - FALSE); - if (NT_SUCCESS(Status)) - { - *LengthRead = Length; - if (Length + ReadOffset > Fcb->Entry.DataLengthL) - { - memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, - 0, - Length + ReadOffset - Fcb->Entry.DataLengthL); + /* Then we need to do a partial or misaligned read ... */ + PVOID PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); + PCHAR ReadInPage = (PCHAR)PageBuf + (ReadOffset & (BLOCKSIZE - 1)); + PCHAR TargetRead = (PCHAR)Buffer; + ULONG ActualReadOffset, EndOfExtent, ReadLen; + + if (!PageBuf) + { + return STATUS_NO_MEMORY; + } + + ActualReadOffset = ReadOffset & ~(BLOCKSIZE - 1); + EndOfExtent = ReadOffset + Length; + + while (ActualReadOffset < EndOfExtent) + { + Status = CdfsReadSectors + (DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), + 1, + PageBuf, + FALSE); + + if (!NT_SUCCESS(Status)) + break; + + ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1)); + if (ReadLen > EndOfExtent - ActualReadOffset) + { + ReadLen = EndOfExtent - ActualReadOffset; + } + + RtlCopyMemory(TargetRead, ReadInPage, ReadLen); + + ActualReadOffset += ReadLen; + TargetRead += ReadLen; + } + + ExFreePool(PageBuf); + } + else + { + if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) + Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; + + Status = CdfsReadSectors(DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), + Length / BLOCKSIZE, + Buffer, + FALSE); + if (NT_SUCCESS(Status)) + { + *LengthRead = Length; + if (Length + ReadOffset > Fcb->Entry.DataLengthL) + { + memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, + 0, + Length + ReadOffset - Fcb->Entry.DataLengthL); + } } }

1 0

[arty] 36834: Commit up some stuff from cdfs. Misc merged from trunk and my overhaul of noncached read.
by arty＠svn.reactos.org 19 Oct '08

19 Oct '08

Author: arty Date: Sun Oct 19 14:18:04 2008 New Revision: 36834 URL: http://svn.reactos.org/svn/reactos?rev=36834&view=rev Log: Commit up some stuff from cdfs. Misc merged from trunk and my overhaul of noncached read. Added: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.xml - copied unchanged from r21065, trunk/reactos/drivers/fs/cdfs/cdfs.xml Modified: branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c branches/arty-newcc/drivers/filesystems/cdfs/rw.c Modified: branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun Oct 19 14:18:04 2008 @@ -331,8 +331,7 @@ Status = IoCreateDevice(CdfsGlobalData->DriverObject, sizeof(DEVICE_EXTENSION), NULL, - FILE_DEVICE_FILE_SYSTEM, -// FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, 0, FALSE, &NewDeviceObject); Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sun Oct 19 14:18:04 2008 @@ -76,23 +76,14 @@ { LARGE_INTEGER FileOffset; IO_STATUS_BLOCK IoStatus; - CC_FILE_SIZES FileSizes; if (ReadOffset + Length > Fcb->Entry.DataLengthL) Length = Fcb->Entry.DataLengthL - ReadOffset; if (FileObject->PrivateCacheMap == NULL) { - FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; - FileSizes.FileSize = Fcb->RFCB.FileSize; - FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; - - DPRINT("Attach FCB to File: Size %08x%08x\n", - Fcb->RFCB.ValidDataLength.HighPart, - Fcb->RFCB.ValidDataLength.LowPart); - CcInitializeCacheMap(FileObject, - &FileSizes, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb); @@ -112,65 +103,25 @@ if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) { - /* Then we need to do a partial or misaligned read ... */ - PVOID PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); - PCHAR ReadInPage = (PCHAR)PageBuf + (ReadOffset & (BLOCKSIZE - 1)); - PCHAR TargetRead = (PCHAR)Buffer; - ULONG ActualReadOffset, EndOfExtent, ReadLen; + return STATUS_INVALID_PARAMETER; + } - if (!PageBuf) - { - return STATUS_NO_MEMORY; - } + if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) + Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - ActualReadOffset = ReadOffset & ~(BLOCKSIZE - 1); - EndOfExtent = ReadOffset + Length; - - while (ActualReadOffset < EndOfExtent) - { - Status = CdfsReadSectors - (DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), - 1, - PageBuf, - FALSE); - - if (!NT_SUCCESS(Status)) - break; - - ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1)); - if (ReadLen > EndOfExtent - ActualReadOffset) - { - ReadLen = EndOfExtent - ActualReadOffset; - } - - RtlCopyMemory(TargetRead, ReadInPage, ReadLen); - - ActualReadOffset += ReadLen; - TargetRead += ReadLen; - } - - ExFreePool(PageBuf); - } - else + Status = CdfsReadSectors(DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), + Length / BLOCKSIZE, + Buffer, + FALSE); + if (NT_SUCCESS(Status)) { - if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) - Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - - Status = CdfsReadSectors(DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), - Length / BLOCKSIZE, - Buffer, - FALSE); - if (NT_SUCCESS(Status)) - { - *LengthRead = Length; - if (Length + ReadOffset > Fcb->Entry.DataLengthL) - { - memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, - 0, - Length + ReadOffset - Fcb->Entry.DataLengthL); - } + *LengthRead = Length; + if (Length + ReadOffset > Fcb->Entry.DataLengthL) + { + memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, + 0, + Length + ReadOffset - Fcb->Entry.DataLengthL); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs