Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 48558: [RTL] - Implement RtlFindLastBackwardRunClear (needs to be tested) - Rename a variable to better reflect it's purpose - Improve a check - Fix a bug in RtlFindNextForwardRunSet
by tkreuzer＠svn.reactos.org 16 Aug '10

16 Aug '10

Author: tkreuzer Date: Mon Aug 16 21:04:10 2010 New Revision: 48558 URL: http://svn.reactos.org/svn/reactos?rev=48558&view=rev Log: [RTL] - Implement RtlFindLastBackwardRunClear (needs to be tested) - Rename a variable to better reflect it's purpose - Improve a check - Fix a bug in RtlFindNextForwardRunSet Modified: branches/ros-amd64-bringup/reactos/lib/rtl/bitmap.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/bitmap.c [iso-8859-1] Mon Aug 16 21:04:10 2010 @@ -51,7 +51,7 @@ IN ULONG MaxLength) { ULONG Value, BitPos, Length; - PULONG Buffer, MaxBuffer; + PULONG Buffer, BufferEnd; /* Calculate positions */ Buffer = BitMapHeader->Buffer + StartingIndex / 32; @@ -59,22 +59,22 @@ /* Calculate the maximum length */ MaxLength = min(MaxLength, BitMapHeader->SizeOfBitMap - StartingIndex); - MaxBuffer = Buffer + (BitPos + MaxLength + 31) / 32; + BufferEnd = Buffer + (BitPos + MaxLength + 31) / 32; /* Clear the bits that don't belong to this run */ Value = *Buffer++ >> BitPos << BitPos; /* Skip all clear ULONGs */ - while (Value == 0 && Buffer < MaxBuffer) - { + while (Value == 0) + { + /* Did we reach the end? */ + if (Buffer == BufferEnd) + { + /* Return maximum length */ + return MaxLength; + } + Value = *Buffer++; - } - - /* Did we reach the end? */ - if (Value == 0) - { - /* Return maximum length */ - return MaxLength; } /* We hit a set bit, check how many clear bits are left */ @@ -100,7 +100,7 @@ IN ULONG MaxLength) { ULONG InvValue, BitPos, Length; - PULONG Buffer, MaxBuffer; + PULONG Buffer, BufferEnd; /* Calculate positions */ Buffer = BitMapHeader->Buffer + StartingIndex / 32; @@ -108,22 +108,22 @@ /* Calculate the maximum length */ MaxLength = min(MaxLength, BitMapHeader->SizeOfBitMap - StartingIndex); - MaxBuffer = Buffer + (BitPos + MaxLength + 31) / 32; + BufferEnd = Buffer + (BitPos + MaxLength + 31) / 32; /* Get the inversed value, clear bits that don't belong to the run */ InvValue = ~(*Buffer++) >> BitPos << BitPos; /* Skip all set ULONGs */ - while (InvValue == 0 && Buffer < MaxBuffer) - { + while (InvValue == 0) + { + /* Did we reach the end? */ + if (Buffer == BufferEnd) + { + /* Yes, return maximum */ + return MaxLength; + } + InvValue = ~(*Buffer++); - } - - /* Did we reach the end? */ - if (InvValue == 0) - { - /* Yes, return maximum */ - return MaxLength; } /* We hit a clear bit, check how many set bits are left */ @@ -603,7 +603,7 @@ *StartingRunIndex = FromIndex + Length; /* Now return the length of the run */ - return RtlpGetLengthOfRunSet(BitMapHeader, FromIndex, MAXULONG); + return RtlpGetLengthOfRunSet(BitMapHeader, FromIndex + Length, MAXULONG); } ULONG @@ -622,8 +622,62 @@ IN ULONG FromIndex, IN PULONG StartingRunIndex) { - UNIMPLEMENTED; - return 0; + ULONG Value, InvValue, BitPos; + PULONG Buffer; + + /* Make sure we don't go past the end */ + FromIndex = min(FromIndex, BitMapHeader->SizeOfBitMap - 1); + + /* Calculate positions */ + Buffer = BitMapHeader->Buffer + FromIndex / 32; + BitPos = 31 - (FromIndex & 31); + + /* Get the inversed value, clear bits that don't belong to the run */ + InvValue = ~(*Buffer--) << BitPos >> BitPos; + + /* Skip all set ULONGs */ + while (InvValue == 0) + { + /* Did we already reach past the first ULONG? */ + if (Buffer < BitMapHeader->Buffer) + { + /* Yes, nothing found */ + return 0; + } + + InvValue = ~(*Buffer--); + } + + /* We hit a clear bit, check how many set bits are left */ + BitScanReverse(&BitPos, InvValue); + + /* Calculate last bit position */ + FromIndex = (Buffer + 1 - BitMapHeader->Buffer) * 32 + BitPos; + + Value = ~InvValue << (31-BitPos) >> (31-BitPos); + + /* Skip all clear ULONGs */ + while (Value == 0 && Buffer >= BitMapHeader->Buffer) + { + Value = *Buffer--; + } + + if (Value != 0) + { + /* We hit a set bit, check how many clear bits are left */ + BitScanReverse(&BitPos, Value); + + /* Calculate Starting Index */ + *StartingRunIndex = (Buffer + 1 - BitMapHeader->Buffer) * 32 + BitPos + 1; + } + else + { + /* We reached the start of the bitmap */ + *StartingRunIndex = 0; + } + + /* Return length of the run */ + return FromIndex - *StartingRunIndex; }

1 0

[tkreuzer] 48557: [NTOSKRNL] - Fixed IoGetRequestorProcess, IoGetRequestorProcessId, IoGetRequestorSessionId - Pass user buffer in NtNotifyChangeDirectoryFile - Fixed magic value in IoGetPagingIoPriority Patch by Pierre Schweitzer
by tkreuzer＠svn.reactos.org 16 Aug '10

16 Aug '10

Author: tkreuzer Date: Mon Aug 16 20:18:25 2010 New Revision: 48557 URL: http://svn.reactos.org/svn/reactos?rev=48557&view=rev Log: [NTOSKRNL] - Fixed IoGetRequestorProcess, IoGetRequestorProcessId, IoGetRequestorSessionId - Pass user buffer in NtNotifyChangeDirectoryFile - Fixed magic value in IoGetPagingIoPriority Patch by Pierre Schweitzer Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4855… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Aug 16 20:18:25 2010 @@ -5456,6 +5456,8 @@ #define IRP_DEFER_IO_COMPLETION 0x00000800 #define IRP_OB_QUERY_NAME 0x00001000 #define IRP_HOLD_DEVICE_QUEUE 0x00002000 +#define IRP_RETRY_IO_COMPLETION 0x00004000 +#define IRP_CLASS_CACHE_OPERATION 0x00008000 #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Mon Aug 16 20:18:25 2010 @@ -1793,6 +1793,9 @@ #define IRP_DEFER_IO_COMPLETION 0x00000800 #define IRP_OB_QUERY_NAME 0x00001000 #define IRP_HOLD_DEVICE_QUEUE 0x00002000 +/* The following 2 are missing in latest WDK */ +#define IRP_RETRY_IO_COMPLETION 0x00004000 +#define IRP_CLASS_CACHE_OPERATION 0x00008000 #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Mon Aug 16 20:18:25 2010 @@ -1175,6 +1175,7 @@ Irp->RequestorMode = PreviousMode; Irp->UserIosb = IoStatusBlock; Irp->UserEvent = Event; + Irp->UserBuffer = Buffer; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Aug 16 20:18:25 2010 @@ -1415,7 +1415,6 @@ else { /* The IRP just got canceled... does a thread still own it? */ - Thread = Irp->Tail.Overlay.Thread; if (Thread) { /* Yes! There is still hope! Initialize the APC */ @@ -1576,7 +1575,7 @@ Flags = Irp->Flags; /* Check what priority it has */ - if (Flags & 0x8000) // FIXME: Undocumented flag + if (Flags & IRP_CLASS_CACHE_OPERATION) { /* High priority */ Priority = IoPagingPriorityHigh; @@ -1604,7 +1603,12 @@ IoGetRequestorProcess(IN PIRP Irp) { /* Return the requestor process */ - return Irp->Tail.Overlay.Thread->ThreadsProcess; + if (Irp->Tail.Overlay.Thread) + { + return Irp->Tail.Overlay.Thread->ThreadsProcess; + } + + return NULL; } /* @@ -1614,8 +1618,15 @@ NTAPI IoGetRequestorProcessId(IN PIRP Irp) { + PEPROCESS Process; + /* Return the requestor process' id */ - return PtrToUlong(IoGetRequestorProcess(Irp)->UniqueProcessId); + if ((Process = IoGetRequestorProcess(Irp))) + { + return PtrToUlong(Process->UniqueProcessId); + } + + return 0; } /* @@ -1626,9 +1637,17 @@ IoGetRequestorSessionId(IN PIRP Irp, OUT PULONG pSessionId) { + PEPROCESS Process; + /* Return the session */ - *pSessionId = IoGetRequestorProcess(Irp)->Session; - return STATUS_SUCCESS; + if ((Process = IoGetRequestorProcess(Irp))) + { + *pSessionId = Process->Session; + return STATUS_SUCCESS; + } + + *pSessionId = (ULONG)-1; + return STATUS_UNSUCCESSFUL; } /*

1 0

[tkreuzer] 48556: [NTDLL] LdrPerformRelocations: Delta is a LONG_PTR rather than ULONG_PTR See issue #5577 for more details.
by tkreuzer＠svn.reactos.org 16 Aug '10

16 Aug '10

Author: tkreuzer Date: Mon Aug 16 01:57:09 2010 New Revision: 48556 URL: http://svn.reactos.org/svn/reactos?rev=48556&view=rev Log: [NTDLL] LdrPerformRelocations: Delta is a LONG_PTR rather than ULONG_PTR See issue #5577 for more details. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Mon Aug 16 01:57:09 2010 @@ -1388,7 +1388,7 @@ ULONG Count, ProtectSize, OldProtect, OldProtect2; PVOID Page, ProtectPage, ProtectPage2; PUSHORT TypeOffset; - ULONG_PTR Delta; + LONG_PTR Delta; NTSTATUS Status; if (NTHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)

1 0

[tkreuzer] 48555: [WIN32K] - Remove IntEngExtEscape stub. This function is completely useless. If the driver doesn't provide a DrvEscape, the function should simply fail and must return 0, not -1. - If a NULL surface is passed, pass on NULL pso to the driver function See issue #4563 for more details.
by tkreuzer＠svn.reactos.org 16 Aug '10

16 Aug '10

Author: tkreuzer Date: Mon Aug 16 01:29:13 2010 New Revision: 48555 URL: http://svn.reactos.org/svn/reactos?rev=48555&view=rev Log: [WIN32K] - Remove IntEngExtEscape stub. This function is completely useless. If the driver doesn't provide a DrvEscape, the function should simply fail and must return 0, not -1. - If a NULL surface is passed, pass on NULL pso to the driver function See issue #4563 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Mon Aug 16 01:29:13 2010 @@ -89,23 +89,6 @@ INT APIENTRY -IntEngExtEscape( - SURFOBJ *Surface, - INT Escape, - INT InSize, - LPVOID InData, - INT OutSize, - LPVOID OutData) -{ - if (Escape == QUERYESCSUPPORT) - return FALSE; - - DPRINT1("IntEngExtEscape is unimplemented. - Keep going and have a nice day\n"); - return -1; -} - -INT -APIENTRY IntGdiExtEscape( PDC dc, INT Escape, @@ -117,22 +100,14 @@ SURFACE *psurf = dc->dclevel.pSurface; INT Result; - /* FIXME - Handle psurf == NULL !!!!!! */ - - if ( NULL == dc->ppdev->DriverFunctions.Escape ) - { - Result = IntEngExtEscape( - &psurf->SurfObj, - Escape, - InSize, - (PVOID)((ULONG_PTR)InData), - OutSize, - (PVOID)OutData); + if (!dc->ppdev->DriverFunctions.Escape) + { + Result = 0; } else { Result = dc->ppdev->DriverFunctions.Escape( - &psurf->SurfObj, + psurf ? &psurf->SurfObj : NULL, Escape, InSize, (PVOID)InData,

1 0

[tkreuzer] 48554: [user32_winetest] Skip 2 tests that hang on reactos. Patch by Giannis Adamopoulos
by tkreuzer＠svn.reactos.org 16 Aug '10

16 Aug '10

Author: tkreuzer Date: Mon Aug 16 00:06:55 2010 New Revision: 48554 URL: http://svn.reactos.org/svn/reactos?rev=48554&view=rev Log: [user32_winetest] Skip 2 tests that hang on reactos. Patch by Giannis Adamopoulos Modified: trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Mon Aug 16 00:06:55 2010 @@ -12572,7 +12572,8 @@ test_paint_messages(); test_interthread_messages(); test_message_conversion(); - test_accelerators(); + skip("skipping test_accelerators, that hangs on reactos\n"); + //test_accelerators(); test_timers(); test_timers_no_wnd(); if (hCBT_hook) test_set_hook(); @@ -12593,7 +12594,8 @@ test_dialog_messages(); test_nullCallback(); test_dbcs_wm_char(); - test_menu_messages(); + skip("skipping test_menu_messages, that hangs on reactos\n"); + //test_menu_messages(); test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Mon Aug 16 00:06:55 2010 @@ -6058,7 +6058,9 @@ test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); - test_capture_4(); + + skip("skipping test_capture_4, that hangs on reactos\n"); + //test_capture_4(); test_CreateWindow(); test_parent_owner();

1 0

[jgardou] 48553: Revert parts of r48547 which have nothing to do with the sync
by jgardou＠svn.reactos.org 15 Aug '10

15 Aug '10

Author: jgardou Date: Sun Aug 15 14:51:39 2010 New Revision: 48553 URL: http://svn.reactos.org/svn/reactos?rev=48553&view=rev Log: Revert parts of r48547 which have nothing to do with the sync Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Aug 15 14:51:39 2010 @@ -435,11 +435,11 @@ clippingType = ClipRegion->iDComplexity; } - /*if (R4_MASK == rop4) + if (R4_MASK == rop4) { BltRectFunc = BltMask; } - else */if (ROP3_TO_ROP4(PATCOPY) == rop4) + else if (ROP3_TO_ROP4(PATCOPY) == rop4) { if (pbo && pbo->iSolidColor == 0xFFFFFFFF) BltRectFunc = CallDibBitBlt; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Sun Aug 15 14:51:39 2010 @@ -48,6 +48,4 @@ VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0, ULONG Color1); VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo); -extern XLATEOBJ* gpxloTrivial; - //#define XLATEOBJ_iXlate(pxo, Color) ((EXLATEOBJ*)pxo)->pfnXlate(pxo, Color) Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Aug 15 14:51:39 2010 @@ -38,7 +38,7 @@ #include <win32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static PAGED_LOOKASIDE_LIST gProcessLookasideList; @@ -1217,92 +1217,71 @@ HBRUSH hbrFlickerFreeDraw, UINT diFlags) { - PSURFACE psurfColor = NULL, psurfMask, psurfDst = NULL; - HGDIOBJ hObjs[3]; - PGDIOBJ pObjs[3]; + BOOL Ret = FALSE; + HBITMAP hbmMask, hbmColor; + BITMAP bmpColor, bm; BOOL DoFlickerFree; - PDC pdc; - HSURF hsurfDst = NULL; - RECTL rcSrc, rcDst; - CLIPOBJ clo, *pclo; - EXLATEOBJ exlo; - BOOL bAlpha = FALSE, Ret = FALSE, bStretch; + INT iOldBkColor = 0, iOldTxtColor = 0; + + HDC hMemDC, hDestDC = hDc; + HGDIOBJ hOldOffBrush = 0; + HGDIOBJ hOldOffBmp = 0; + HBITMAP hTmpBmp = 0, hOffBmp = 0; + BOOL bAlpha = FALSE; + INT x=xLeft, y=yTop; + + hbmMask = pIcon->IconInfo.hbmMask; + hbmColor = pIcon->IconInfo.hbmColor; if (istepIfAniCur) DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - DPRINT("Flags : 0x%08x\n", diFlags); - - hObjs[0] = pIcon->IconInfo.hbmMask; - hObjs[1] = pIcon->IconInfo.hbmColor; - hObjs[2] = hDc; - GDIOBJ_LockMultipleObjs(3, hObjs, pObjs); - psurfMask = pObjs[0]; - psurfColor = pObjs[1]; - pdc = pObjs[2]; - - if (!pIcon->IconInfo.hbmMask - || !psurfMask) - { - DPRINT1("No hbmMask?!\n"); - if(pdc) DC_UnlockDc(pdc); - if(psurfColor) SURFACE_UnlockSurface(psurfColor); + if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bm)) + { return FALSE; } - if (pIcon->IconInfo.hbmColor - && !psurfColor) - { - DPRINT1("Unable to lock the color Bitmap?!\n"); - SURFACE_UnlockSurface(psurfMask); - if(pdc) DC_UnlockDc(pdc); + if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), (PVOID)&bmpColor)) + { return FALSE; } - if(!psurfColor) - { - DPRINT("Monochrome Icon\n"); - psurfColor = psurfMask; - RECTL_vSetRect(&rcSrc, 0, pIcon->Size.cy, pIcon->Size.cx, 2*pIcon->Size.cy); - } - else - { - DPRINT("Color Icon\n"); - RECTL_vSetRect(&rcSrc, 0, 0, pIcon->Size.cx, pIcon->Size.cy); - } - - if(!pdc) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - SURFACE_UnlockSurface(psurfMask); - if(psurfColor != psurfMask) SURFACE_UnlockSurface(psurfColor); - DPRINT1("Invalid DC!\n"); + if(!(hMemDC = NtGdiCreateCompatibleDC(hDc))) + { + DPRINT1("NtGdiCreateCompatibleDC failed!\n"); return FALSE; } /* Check for alpha */ - if ((BitsPerFormat(psurfColor->SurfObj.iBitmapFormat) == 32) + if (hbmColor + && (bmpColor.bmBitsPixel == 32) && (diFlags & DI_IMAGE)) { + SURFACE *psurfOff = NULL; PFN_DIB_GetPixel fnSource_GetPixel = NULL; INT i, j; /* In order to correctly display 32 bit icons Windows first scans the image, because information about transparency is not stored in any image's headers */ - fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfColor->SurfObj.iBitmapFormat].DIB_GetPixel; - if (fnSource_GetPixel) - { - for (i = 0; i < psurfColor->SurfObj.sizlBitmap.cx; i++) + psurfOff = SURFACE_LockSurface(hbmColor); + if (psurfOff) + { + fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; + if (fnSource_GetPixel) { - for (j = 0; j < psurfColor->SurfObj.sizlBitmap.cy; j++) + for (i = 0; i < psurfOff->SurfObj.sizlBitmap.cx; i++) { - bAlpha = ((BYTE)(fnSource_GetPixel(&psurfColor->SurfObj, i, j) >> 24) & 0xff); + for (j = 0; j < psurfOff->SurfObj.sizlBitmap.cy; j++) + { + bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, i, j) >> 24) & 0xff); + if (bAlpha) + break; + } if (bAlpha) break; } - if (bAlpha) - break; } + SURFACE_UnlockSurface(psurfOff); } } @@ -1314,90 +1293,45 @@ cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : pIcon->Size.cy); - /* Check stretching */ - bStretch = (pIcon->Size.cx != cxWidth) || (pIcon->Size.cy != cyHeight); - DoFlickerFree = (hbrFlickerFreeDraw && (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH)); if (DoFlickerFree) { - EBRUSHOBJ ebo; - PBRUSH pBrush ; - POINTL ptBrushOrig; - - pBrush = BRUSH_LockBrush(hbrFlickerFreeDraw); - if(!pBrush) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - DPRINT1("Invalid brush!\n"); - goto cleanup; - } - - hsurfDst = IntCreateCompatibleBitmap(pdc, cxWidth, cyHeight); - if(!hsurfDst) - { - DPRINT1("Error : Failed to allocate the offscreen surface\n"); - goto cleanup; - } - psurfDst = SURFACE_LockSurface(hsurfDst); - if(!psurfDst) - { - DPRINT1("Error : Failed to lock the offScreen bitmap\n"); - goto cleanup; - } - RECTL_vSetRect(&rcDst, 0, 0, cxWidth, cyHeight); - - ptBrushOrig.x = pBrush->ptOrigin.x; - ptBrushOrig.y = pBrush->ptOrigin.y; - - EBRUSHOBJ_vInit(&ebo, pBrush, pdc); - - clo.iDComplexity = DC_TRIVIAL; - pclo = &clo; - - IntEngBitBlt(&psurfDst->SurfObj, NULL, NULL, pclo, NULL, &rcDst, NULL, - NULL, &ebo.BrushObject, &ptBrushOrig, ROP3_TO_ROP4(PATCOPY)); - - EBRUSHOBJ_vCleanup(&ebo); - BRUSH_UnlockBrush(pBrush); - } - else - { - RECT rcBmp; - RECTL_vSetRect(&rcDst, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); - IntLPtoDP(pdc, (LPPOINT)&rcDst, 2); - RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - - DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcDst ); - - if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(pdc); - - psurfDst = pdc->dclevel.pSurface; - pclo = pdc->rosdc.CombinedClip; - RECTL_vSetRect(&rcBmp, 0, 0, psurfDst->SurfObj.sizlBitmap.cx, psurfDst->SurfObj.sizlBitmap.cy); - if(!RECTL_bIntersectRect(&rcDst, &rcDst, &rcBmp)) - { + hDestDC = NtGdiCreateCompatibleDC(hDc); + if(!hDestDC) + { + DPRINT1("NtGdiCreateCompatibleDC failed!\n"); Ret = FALSE; - goto done; - } - } - - /* Optimization : use directly the palette of the DC, - * so we XLATE only once, and then we directly copy bits */ - EXLATEOBJ_vInitialize(&exlo, psurfColor->ppal, pdc->dclevel.pSurface->ppal, 0, 0, 0xFFFFFFFF); + goto Cleanup ; + } + hOffBmp = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); + if(!hOffBmp) + { + DPRINT1("NtGdiCreateCompatibleBitmap failed!\n"); + goto Cleanup ; + } + hOldOffBmp = NtGdiSelectBitmap(hDestDC, hOffBmp); + hOldOffBrush = NtGdiSelectBrush(hDestDC, hbrFlickerFreeDraw); + NtGdiPatBlt(hDestDC, 0, 0, cxWidth, cyHeight, PATCOPY); + NtGdiSelectBrush(hDestDC, hOldOffBrush); + x=y=0; + } + + /* Set Background/foreground colors */ + iOldTxtColor = IntGdiSetTextColor(hDc, 0); //black + iOldBkColor = IntGdiSetBkColor(hDc, 0x00FFFFFF); //white if(bAlpha && (diFlags & DI_IMAGE)) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; BYTE Alpha; INT i, j; - PSURFACE psurf = NULL; + PSURFACE psurf; PBYTE ptr ; HBITMAP hMemBmp = NULL; - hMemBmp = BITMAP_CopyBitmap(pIcon->IconInfo.hbmColor); + hMemBmp = BITMAP_CopyBitmap(hbmColor); if(!hMemBmp) { DPRINT1("BITMAP_CopyBitmap failed!"); @@ -1426,116 +1360,109 @@ } } - DPRINT("Performing alpha blending\n"); - Ret = IntEngAlphaBlend(&psurfDst->SurfObj, - &psurf->SurfObj, - pclo, - &exlo.xlo, - &rcDst, - &rcSrc, - (BLENDOBJ*)&pixelblend); - + SURFACE_UnlockSurface(psurf); + + hTmpBmp = NtGdiSelectBitmap(hMemDC, hMemBmp); + + Ret = NtGdiAlphaBlend(hDestDC, + x, + y, + cxWidth, + cyHeight, + hMemDC, + 0, + 0, + pIcon->Size.cx, + pIcon->Size.cy, + pixelblend, + NULL); + NtGdiSelectBitmap(hMemDC, hTmpBmp); CleanupAlpha: - if(psurf) SURFACE_UnlockSurface(psurf); if(hMemBmp) NtGdiDeleteObjectApp(hMemBmp); if(Ret) goto done; - else DPRINT1("IntEngAlphaBlend failed!\n"); - } - - if (diFlags & DI_IMAGE) - { - POINTL ptMaskOrig = {0,0}; - if(bStretch) - { - DPRINT("Stretching\n"); - Ret = IntEngStretchBlt(&psurfDst->SurfObj, - &psurfColor->SurfObj, - (diFlags & DI_MASK) ? &psurfMask->SurfObj : NULL, - pclo, - &exlo.xlo, - &rcDst, - &rcSrc, - (diFlags & DI_MASK) ? &ptMaskOrig : NULL, - NULL, - NULL, - (diFlags & DI_MASK) ? R4_MASK : ROP3_TO_ROP4(SRCCOPY)); - if(!Ret) DPRINT1("IntEngStretchBlt Failed\n"); + } + + if (diFlags & DI_MASK) + { + hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmMask); + NtGdiStretchBlt(hDestDC, + x, + y, + cxWidth, + cyHeight, + hMemDC, + 0, + 0, + pIcon->Size.cx, + pIcon->Size.cy, + SRCAND, + 0); + NtGdiSelectBitmap(hMemDC, hTmpBmp); + } + + if(diFlags & DI_IMAGE) + { + if (hbmColor) + { + DWORD rop = (diFlags & DI_MASK) ? SRCINVERT : SRCCOPY ; + hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmColor); + NtGdiStretchBlt(hDestDC, + x, + y, + cxWidth, + cyHeight, + hMemDC, + 0, + 0, + pIcon->Size.cx, + pIcon->Size.cy, + rop, + 0); + NtGdiSelectBitmap(hMemDC, hTmpBmp); } else { - DPRINT("Blting\n"); - Ret = IntEngBitBlt(&psurfDst->SurfObj, - &psurfColor->SurfObj, - (diFlags & DI_MASK) ? &psurfMask->SurfObj : NULL, - pclo, - &exlo.xlo, - &rcDst, - (PPOINTL)&rcSrc, - (diFlags & DI_MASK) ? &ptMaskOrig : NULL, - NULL, - NULL, - (diFlags & DI_MASK) ? R4_MASK : ROP3_TO_ROP4(SRCCOPY)); - if(!Ret) DPRINT1("IntEngBitBlt Failed\n"); - } - } - else - { - DPRINT1("Uh? Calling DrawIcon without anything to draw? diFlags %d\n", diFlags); + /* Mask bitmap holds the information in its second half */ + DWORD rop = (diFlags & DI_MASK) ? SRCINVERT : SRCCOPY ; + hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmMask); + NtGdiStretchBlt(hDestDC, + x, + y, + cxWidth, + cyHeight, + hMemDC, + 0, + pIcon->Size.cy, + pIcon->Size.cx, + pIcon->Size.cy, + rop, + 0); + NtGdiSelectBitmap(hMemDC, hTmpBmp); + } } done: - if(DoFlickerFree && Ret) - { - POINTL ptSrc = {0,0}; - RECTL rcBmp; - - RECTL_vSetRect(&rcDst, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); - - IntLPtoDP(pdc, (LPPOINT)&rcDst, 2); - - RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcDst ); - - if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(pdc); - - RECTL_vSetRect(&rcBmp, 0, 0, - pdc->dclevel.pSurface->SurfObj.sizlBitmap.cx, - pdc->dclevel.pSurface->SurfObj.sizlBitmap.cy); - - if(RECTL_bIntersectRect(&rcDst, &rcDst, &rcBmp)) - { - /* Copy everything */ - DPRINT("Copying bits from offscreen buffer\n"); - Ret = IntEngCopyBits(&pdc->dclevel.pSurface->SurfObj, - &psurfDst->SurfObj, - pdc->rosdc.CombinedClip, - gpxloTrivial, - &rcDst, - &ptSrc); - if(!Ret) DPRINT1("IntEngCopyBits Failed\n"); - } - - DC_vFinishBlit(pdc, NULL); - } - - if(!DoFlickerFree) DC_vFinishBlit(pdc, NULL); - EXLATEOBJ_vCleanup(&exlo); - -cleanup: - if(psurfColor != psurfMask) - SURFACE_UnlockSurface(psurfColor); - SURFACE_UnlockSurface(psurfMask); - if(hsurfDst) - { - if(psurfDst) SURFACE_UnlockSurface(psurfDst); - GreDeleteObject(hsurfDst); - } - DC_UnlockDc(pdc); - - DPRINT("return %s\n", Ret ? "TRUE" : "FALSE") ; - - return Ret ; + if(hDestDC != hDc) + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, cyHeight, hDestDC, 0, 0, SRCCOPY, 0, 0); + } + + /* Restore foreground and background colors */ + IntGdiSetBkColor(hDc, iOldBkColor); + IntGdiSetTextColor(hDc, iOldTxtColor); + + Ret = TRUE ; + +Cleanup: + NtGdiDeleteObjectApp(hMemDC); + if(hDestDC != hDc) + { + if(hOldOffBmp) NtGdiSelectBitmap(hDestDC, hOldOffBmp); + NtGdiDeleteObjectApp(hDestDC); + if(hOffBmp) NtGdiDeleteObjectApp(hOffBmp); + } + + return Ret; } /* Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Aug 15 14:51:39 2010 @@ -953,8 +953,6 @@ if (resBitmap) { IntSetBitmapBits(resBitmap, Bitmap->SurfObj.cjBits, Bitmap->SurfObj.pvBits); - resBitmap->ppal = Bitmap->ppal; - GDIOBJ_IncrementShareCount((POBJ)Bitmap->ppal); SURFACE_UnlockSurface(resBitmap); } else

1 0

[dreimer] 48552: Preparations for GCC 4.5.1 mingw-w64 and RosBE Version 1.6. Not working yet.
by dreimer＠svn.reactos.org 15 Aug '10

15 Aug '10

Author: dreimer Date: Sun Aug 15 12:14:41 2010 New Revision: 48552 URL: http://svn.reactos.org/svn/reactos?rev=48552&view=rev Log: Preparations for GCC 4.5.1 mingw-w64 and RosBE Version 1.6. Not working yet. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/Tools/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -53,7 +53,7 @@ $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_PREFIX = $null -$global:_ROSBE_VERSION = "1.5.1" +$global:_ROSBE_VERSION = "1.6" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 @@ -205,7 +205,7 @@ clear-host "*******************************************************************************" "* *" -"* ReactOS Build Environment $_ROSBE_VERSION *" +"* ReactOS Build Environment $_ROSBE_VERSION *" "* *" "*******************************************************************************" "" Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -1,3 +1,19 @@ +*** Aug XXth, 2010 - RosBE 1.6 Released + +- Updated Binutils to 2.20.51-20100801 (snapshot) (Daniel Reimer) +- Updated GCC to 4.5.1 (Daniel Reimer) + * gmp 5.0.1 + * mpfr 3.0.0 + * mpc 0.8.2 + * MinGW-w64 Runtime 20100730 +- Updated NASM to 2.08.02 (Daniel Reimer) +- Updated YASM to 1.0.1 (Daniel Reimer) +- Updated SVN to 1.6.12 (Daniel Reimer) +- Bug 5426 resolved (Adam Kachwalla) +- Cleanup the options tool (Christoph von Wittich) +- Add Support for the cmake bringup branch. Just install cmake and type make inside the branch (Daniel Reimer) +- Renamed make back to mingw32-make to make cmake happy (Daniel Reimer) + *** May 19th, 2010 - RosBE 1.5.1.1 Released - fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. (Crocodile) Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.5.1.1 +ReactOS Build Environment v1.6 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -30,7 +30,7 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% -set _ROSBE_VERSION=1.5.1 +set _ROSBE_VERSION=1.6 set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 @@ -91,7 +91,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.5.1.1" +!define PRODUCT_VERSION "1.6" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.1" +VIAddVersionKey /LANG=1033 "FileVersion" "1.6.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.5.1.1" +VIProductVersion "1.6.0.0" CRCCheck force SetDatablockOptimize on @@ -144,7 +144,7 @@ File /r Components\Tools\getincludes.exe File /r Components\Tools\rquote.exe File /r Components\Tools\tee.exe - File /r Components\Tools\make.exe + File /r Components\Tools\mingw32-make.exe File /r Components\Tools\libintl3.dll File /r Components\Tools\libiconv2.dll File /r Components\Tools\regex2.dll Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" -!define PRODUCT_VERSION "1.4" +!define PRODUCT_VERSION "1.4.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.4.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.4.1.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.4.0.0" +VIProductVersion "1.4.1.0" CRCCheck force SetDatablockOptimize on Modified: trunk/tools/RosBE/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/makefile?rev=485… ============================================================================== --- trunk/tools/RosBE/Tools/makefile [iso-8859-1] (original) +++ trunk/tools/RosBE/Tools/makefile [iso-8859-1] Sun Aug 15 12:14:41 2010 @@ -11,11 +11,16 @@ RM := del /f SUFFIX := .exe else - # Unix host - RM := rm -f - SUFFIX := + ifeq ($(word 1,$(shell gcc -dumpmachine)),i686-w64-mingw32) + # Windows host + RM := del /f + SUFFIX := .exe + else + # Unix host + RM := rm -f + SUFFIX := + endif endif - all: cpucount scut getincludes

1 0

[fireball] 48551: [NTOSKRNL] - Revert 48546. The code was correct, and there is more of same code in other places which firstly cancels the IRP and then moves to the next entry. The actual bug is somewhere else. See issue #5550 for more details.
by fireball＠svn.reactos.org 15 Aug '10

15 Aug '10

Author: fireball Date: Sun Aug 15 08:48:03 2010 New Revision: 48551 URL: http://svn.reactos.org/svn/reactos?rev=48551&view=rev Log: [NTOSKRNL] - Revert 48546. The code was correct, and there is more of same code in other places which firstly cancels the IRP and then moves to the next entry. The actual bug is somewhere else. See issue #5550 for more details. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Aug 15 08:48:03 2010 @@ -1047,12 +1047,14 @@ NextEntry = ListHead->Flink; while (ListHead != NextEntry) { - /* Get the IRP and move to the next entry */ + /* Get the IRP */ Irp = CONTAINING_RECORD(NextEntry, IRP, ThreadListEntry); - NextEntry = NextEntry->Flink; /* Cancel it */ IoCancelIrp(Irp); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; } /* Wait 100 milliseconds */

1 0

[evb] 48550: - IRP_MN_QUERY_RESOURCE_REQUIREMENTS half support now, PciQueryRequirements, PciAllocateIoRequrementsList, full implement, but PciBuildRequirementsList return 0 always for now - Debug helpers: PciDebugPrintIoResReqList, PciDebugPrintIoResource, PciDebugCmResourceTypeToText Now hit assert Assertion '(DeviceNode->Flags & DNF_ADDED)' failed at ntoskrnl/io/pnpmgr/pnpmgr.c line 201, too night to debug, maybe tomorow
by evb＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: evb Date: Sat Aug 14 18:06:19 2010 New Revision: 48550 URL: http://svn.reactos.org/svn/reactos?rev=48550&view=rev Log: - IRP_MN_QUERY_RESOURCE_REQUIREMENTS half support now, PciQueryRequirements, PciAllocateIoRequrementsList, full implement, but PciBuildRequirementsList return 0 always for now - Debug helpers: PciDebugPrintIoResReqList, PciDebugPrintIoResource, PciDebugCmResourceTypeToText Now hit assert Assertion '(DeviceNode->Flags & DNF_ADDED)' failed at ntoskrnl/io/pnpmgr/pnpmgr.c line 201, too night to debug, maybe tomorow Modified: trunk/reactos/drivers/bus/pcix/debug.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/pci.h Modified: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Sat Aug 14 18:06:19 2010 @@ -246,9 +246,99 @@ /* Dump and convert the power state mappings */ for (i = PowerSystemWorking; i < PowerSystemMaximum; i++) DbgPrint(" %s", DevicePowerStates[DeviceCaps->DeviceState[i]]); - + /* Finish the dump */ DbgPrint(" ]\n"); } +PCHAR +NTAPI +PciDebugCmResourceTypeToText(IN UCHAR Type) +{ + /* What kind of resource it this? */ + switch (Type) + { + /* Pick the correct identifier string based on the type */ + case CmResourceTypeDeviceSpecific: return "CmResourceTypeDeviceSpecific"; + case CmResourceTypePort: return "CmResourceTypePort"; + case CmResourceTypeInterrupt: return "CmResourceTypeInterrupt"; + case CmResourceTypeMemory: return "CmResourceTypeMemory"; + case CmResourceTypeDma: return "CmResourceTypeDma"; + case CmResourceTypeBusNumber: return "CmResourceTypeBusNumber"; + case CmResourceTypeConfigData: return "CmResourceTypeConfigData"; + case CmResourceTypeDevicePrivate: return "CmResourceTypeDevicePrivate"; + case CmResourceTypePcCardConfig: return "CmResourceTypePcCardConfig"; + default: return "*** INVALID RESOURCE TYPE ***"; + } +} + +VOID +NTAPI +PciDebugPrintIoResource(IN PIO_RESOURCE_DESCRIPTOR Descriptor) +{ + ULONG i; + PULONG Data; + + /* Print out the header */ + DPRINT1(" IoResource Descriptor dump: Descriptor @0x%x\n", Descriptor); + DPRINT1(" Option = 0x%x\n", Descriptor->Option); + DPRINT1(" Type = %d (%s)\n", Descriptor->Type, PciDebugCmResourceTypeToText(Descriptor->Type)); + DPRINT1(" ShareDisposition = %d\n", Descriptor->ShareDisposition); + DPRINT1(" Flags = 0x%04X\n", Descriptor->Flags); + + /* Loop private data */ + Data = (PULONG)&Descriptor->u.DevicePrivate; + for (i = 0; i < 6; i += 3) + { + /* Dump it in 32-bit triplets */ + DPRINT1(" Data[%d] = %08x %08x %08x\n", i, Data[0], Data[1], Data[2]); + } +} + +VOID +NTAPI +PciDebugPrintIoResReqList(IN PIO_RESOURCE_REQUIREMENTS_LIST Requirements) +{ + ULONG AlternativeLists; + PIO_RESOURCE_LIST List; + ULONG Count; + PIO_RESOURCE_DESCRIPTOR Descriptor; + + /* Make sure there's a list */ + if (!Requirements) return; + + /* Grab the main list and the alternates as well */ + AlternativeLists = Requirements->AlternativeLists; + List = Requirements->List; + + /* Print out the initial header*/ + DPRINT1(" IO_RESOURCE_REQUIREMENTS_LIST (PCI Bus Driver)\n"); + DPRINT1(" InterfaceType %d\n", Requirements->InterfaceType); + DPRINT1(" BusNumber 0x%x\n", Requirements->BusNumber); + DPRINT1(" SlotNumber %d (0x%x), (d/f = 0x%x/0x%x)\n", + Requirements->SlotNumber, + Requirements->SlotNumber, + ((PCI_SLOT_NUMBER*)&Requirements->SlotNumber)->u.bits.DeviceNumber, + ((PCI_SLOT_NUMBER*)&Requirements->SlotNumber)->u.bits.FunctionNumber); + DPRINT1(" AlternativeLists %d\n", AlternativeLists); + + /* Scan alternative lists */ + while (AlternativeLists--) + { + /* Get the descriptor array, and the count of descriptors */ + Descriptor = List->Descriptors; + Count = List->Count; + + /* Print out each descriptor */ + DPRINT1("\n List[%d].Count = %d\n", AlternativeLists, Count); + while (Count--) PciDebugPrintIoResource(Descriptor++); + + /* Should've reached a new list now */ + List = (PIO_RESOURCE_LIST)Descriptor; + } + + /* Terminate the dump */ + DPRINT1("\n"); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Sat Aug 14 18:06:19 2010 @@ -48,6 +48,39 @@ }; /* FUNCTIONS ******************************************************************/ + +PIO_RESOURCE_REQUIREMENTS_LIST +NTAPI +PciAllocateIoRequirementsList(IN ULONG Count, + IN ULONG BusNumber, + IN ULONG SlotNumber) +{ + SIZE_T Size; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + + /* Calculate the final size of the list, including each descriptor */ + Size = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); + if (Count > 1) Size = sizeof(IO_RESOURCE_DESCRIPTOR) * (Count - 1) + + sizeof(IO_RESOURCE_REQUIREMENTS_LIST); + + /* Allocate the list */ + RequirementsList = ExAllocatePoolWithTag(PagedPool, Size, 'BicP'); + if (!RequirementsList) return NULL; + + /* Initialize it */ + RtlZeroMemory(RequirementsList, Size); + RequirementsList->AlternativeLists = 1; + RequirementsList->BusNumber = BusNumber; + RequirementsList->SlotNumber = SlotNumber; + RequirementsList->InterfaceType = PCIBus; + RequirementsList->ListSize = Size; + RequirementsList->List[0].Count = Count; + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + + /* Return it */ + return RequirementsList; +} PCM_RESOURCE_LIST NTAPI @@ -275,12 +308,83 @@ NTSTATUS NTAPI +PciBuildRequirementsList(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData, + OUT PIO_RESOURCE_REQUIREMENTS_LIST* Buffer) +{ + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + { + /* There aren't, so use the zero descriptor */ + RequirementsList = PciZeroIoResourceRequirements; + + /* Does it actually exist yet? */ + if (!PciZeroIoResourceRequirements) + { + /* Allocate it, and use it for future use */ + RequirementsList = PciAllocateIoRequirementsList(0, 0, 0); + PciZeroIoResourceRequirements = RequirementsList; + if (!PciZeroIoResourceRequirements) return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return the zero requirements list to the caller */ + *Buffer = RequirementsList; + DPRINT1("PCI - build resource reqs - early out, 0 resources\n"); + return STATUS_SUCCESS; + } + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI PciQueryRequirements(IN PPCI_PDO_EXTENSION PdoExtension, IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *RequirementsList) { - /* Not yet implemented */ - UNIMPLEMENTED; - while (TRUE); + NTSTATUS Status; + PCI_COMMON_HEADER PciHeader; + PAGED_CODE(); + + /* Check if the PDO has any resources, or at least an interrupt pin */ + if ((PdoExtension->Resources) || (PdoExtension->InterruptPin)) + { + /* Read the current PCI header */ + PciReadDeviceConfig(PdoExtension, &PciHeader, 0, PCI_COMMON_HDR_LENGTH); + + /* Use it to build a list of requirements */ + Status = PciBuildRequirementsList(PdoExtension, &PciHeader, RequirementsList); + if (!NT_SUCCESS(Status)) return Status; + + /* Is this a Compaq PCI Hotplug Controller (r17) on a PAE system ? */ + if ((PciHeader.VendorID == 0xE11) && + (PciHeader.DeviceID == 0xA0F7) && + (PciHeader.RevisionID == 17) && + (ExIsProcessorFeaturePresent(PF_PAE_ENABLED))) + { + /* Have not tested this on eVb's machine yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Check if the requirements are actually the zero list */ + if (*RequirementsList == PciZeroIoResourceRequirements) + { + /* A simple NULL will sufficie for the PnP Manager */ + *RequirementsList = NULL; + DPRINT1("Returning NULL requirements list\n"); + } + else + { + /* Otherwise, print out the requirements list */ + PciDebugPrintIoResReqList(*RequirementsList); + } + } + else + { + /* There aren't any resources, so simply return NULL */ + DPRINT1("PciQueryRequirements returning NULL requirements list\n"); + *RequirementsList = NULL; + } + + /* This call always succeeds (but maybe with no requirements) */ return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Sat Aug 14 18:06:19 2010 @@ -1255,6 +1255,12 @@ IN PDEVICE_CAPABILITIES DeviceCaps ); +VOID +NTAPI +PciDebugPrintIoResReqList( + IN PIO_RESOURCE_REQUIREMENTS_LIST Requirements +); + // // Interface Support //

1 0

[evb] 48549: - IRP_MN_QUERY_RESOURCES support for PDO (PciQueryResources, PciAllocateCmResourceList), now remain IRP_MN_QUERY_RESOURCE_REQUIREMENTS to last device stack interogration from PNPMGR
by evb＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: evb Date: Sat Aug 14 17:33:10 2010 New Revision: 48549 URL: http://svn.reactos.org/svn/reactos?rev=48549&view=rev Log: - IRP_MN_QUERY_RESOURCES support for PDO (PciQueryResources, PciAllocateCmResourceList), now remain IRP_MN_QUERY_RESOURCE_REQUIREMENTS to last device stack interogration from PNPMGR Modified: trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Sat Aug 14 17:33:10 2010 @@ -49,14 +49,190 @@ /* FUNCTIONS ******************************************************************/ +PCM_RESOURCE_LIST +NTAPI +PciAllocateCmResourceList(IN ULONG Count, + IN ULONG BusNumber) +{ + SIZE_T Size; + PCM_RESOURCE_LIST ResourceList; + + /* Calculate the final size of the list, including each descriptor */ + Size = sizeof(CM_RESOURCE_LIST); + if (Count > 1) Size = sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (Count - 1) + + sizeof(CM_RESOURCE_LIST); + + /* Allocate the list */ + ResourceList = ExAllocatePoolWithTag(PagedPool, Size, 'BicP'); + if (!ResourceList) return NULL; + + /* Initialize it */ + RtlZeroMemory(ResourceList, Size); + ResourceList->Count = 1; + ResourceList->List[0].BusNumber = BusNumber; + ResourceList->List[0].InterfaceType = PCIBus; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = Count; + + /* Return it */ + return ResourceList; +} + NTSTATUS NTAPI PciQueryResources(IN PPCI_PDO_EXTENSION PdoExtension, OUT PCM_RESOURCE_LIST *Buffer) { - /* Not yet implemented */ - UNIMPLEMENTED; - while (TRUE); + PPCI_FUNCTION_RESOURCES PciResources; + BOOLEAN HaveVga, HaveMemSpace, HaveIoSpace; + USHORT BridgeControl, PciCommand; + ULONG Count, i; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Partial, Resource, LastResource; + PCM_RESOURCE_LIST ResourceList; + UCHAR InterruptLine; + PAGED_CODE(); + + /* Assume failure */ + Count = 0; + HaveVga = FALSE; + *Buffer = NULL; + + /* Make sure there's some resources to query */ + PciResources = PdoExtension->Resources; + if (!PciResources) return STATUS_SUCCESS; + + /* Read the decodes */ + PciReadDeviceConfig(PdoExtension, + &PciCommand, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Check which ones are turned on */ + HaveIoSpace = PciCommand & PCI_ENABLE_IO_SPACE; + HaveMemSpace = PciCommand & PCI_ENABLE_MEMORY_SPACE; + + /* Loop maximum possible descriptors */ + for (i = 0; i < 7; i++) + { + /* Check if the decode for this descriptor is actually turned on */ + Partial = &PciResources->Current[i]; + if (((HaveMemSpace) && (Partial->Type == CmResourceTypeMemory)) || + ((HaveIoSpace) && (Partial->Type == CmResourceTypePort))) + { + /* One more fully active descriptor */ + Count++; + } + } + + /* If there's an interrupt pin associated, check at least one decode is on */ + if ((PdoExtension->InterruptPin) && ((HaveMemSpace) || (HaveIoSpace))) + { + /* Read the interrupt line for the pin, add a descriptor if it's valid */ + InterruptLine = PdoExtension->AdjustedInterruptLine; + if ((InterruptLine) && (InterruptLine != -1)) Count++; + } + + /* Check for PCI bridge */ + if (PdoExtension->HeaderType == PCI_BRIDGE_TYPE) + { + /* Read bridge settings, check if VGA is present */ + PciReadDeviceConfig(PdoExtension, + &BridgeControl, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type1.BridgeControl), + sizeof(USHORT)); + if (BridgeControl & PCI_ENABLE_BRIDGE_VGA) + { + /* Remember for later */ + HaveVga = TRUE; + + /* One memory descriptor for 0xA0000, plus the two I/O port ranges */ + if (HaveMemSpace) Count++; + if (HaveIoSpace) Count += 2; + } + } + + /* If there's no descriptors in use, there's no resources, so return */ + if (!Count) return STATUS_SUCCESS; + + /* Allocate a resource list to hold the resources */ + ResourceList = PciAllocateCmResourceList(Count, + PdoExtension->ParentFdoExtension->BaseBus); + if (!ResourceList) return STATUS_INSUFFICIENT_RESOURCES; + + /* This is where the descriptors will be copied into */ + Resource = ResourceList->List[0].PartialResourceList.PartialDescriptors; + LastResource = Resource + Count + 1; + + /* Loop maximum possible descriptors */ + for (i = 0; i < 7; i++) + { + /* Check if the decode for this descriptor is actually turned on */ + Partial = &PciResources->Current[i]; + if (((HaveMemSpace) && (Partial->Type == CmResourceTypeMemory)) || + ((HaveIoSpace) && (Partial->Type == CmResourceTypePort))) + { + /* Copy the descriptor into the resource list */ + *Resource++ = *Partial; + } + } + + /* Check if earlier the code detected this was a PCI bridge with VGA on it */ + if (HaveVga) + { + /* Are the memory decodes enabled? */ + if (HaveMemSpace) + { + /* Build a memory descriptor for a 128KB framebuffer at 0xA0000 */ + Resource->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Resource->u.Generic.Start.HighPart = 0; + Resource->Type = CmResourceTypeMemory; + Resource->u.Generic.Start.LowPart = 0xA0000; + Resource->u.Generic.Length = 0x20000; + Resource++; + } + + /* Are the I/O decodes enabled? */ + if (HaveIoSpace) + { + /* Build an I/O descriptor for the graphic ports at 0x3B0 */ + Resource->Type = CmResourceTypePort; + Resource->Flags = CM_RESOURCE_PORT_POSITIVE_DECODE | CM_RESOURCE_PORT_10_BIT_DECODE; + Resource->u.Port.Start.QuadPart = 0x3B0u; + Resource->u.Port.Length = 0xC; + Resource++; + + /* Build an I/O descriptor for the graphic ports at 0x3C0 */ + Resource->Type = CmResourceTypePort; + Resource->Flags = CM_RESOURCE_PORT_POSITIVE_DECODE | CM_RESOURCE_PORT_10_BIT_DECODE; + Resource->u.Port.Start.QuadPart = 0x3C0u; + Resource->u.Port.Length = 0x20; + Resource++; + } + } + + /* If there's an interrupt pin associated, check at least one decode is on */ + if ((PdoExtension->InterruptPin) && ((HaveMemSpace) || (HaveIoSpace))) + { + /* Read the interrupt line for the pin, check if it's valid */ + InterruptLine = PdoExtension->AdjustedInterruptLine; + if ((InterruptLine) && (InterruptLine != -1)) + { + /* Make sure there's still space */ + ASSERT(Resource < LastResource); + + /* Add the interrupt descriptor */ + Resource->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; + Resource->Type = CmResourceTypeInterrupt; + Resource->ShareDisposition = CmResourceShareShared; + Resource->u.Interrupt.Affinity = -1; + Resource->u.Interrupt.Level = InterruptLine; + Resource->u.Interrupt.Vector = InterruptLine; + } + } + + /* Return the resouce list */ + *Buffer = ResourceList; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Sat Aug 14 17:33:10 2010 @@ -1355,7 +1355,7 @@ SlotInfo->BusNumber, SlotInfo->DeviceNumber, SlotInfo->SlotNumber); - + /* Check if this slot information matches the PDO being queried */ if ((ParentExtension->BaseBus == SlotInfo->BusNumber) && (PdoExtension->Slot.u.bits.DeviceNumber == SlotInfo->DeviceNumber >> 3) && @@ -1365,7 +1365,7 @@ *SlotNumber = SlotInfo->SlotNumber; return STATUS_SUCCESS; } - + /* Try the next slot */ SlotInfo++; } @@ -1475,7 +1475,7 @@ DEVICE_CAPABILITIES AttachedCaps; DEVICE_POWER_STATE NewPowerState, DevicePowerState, DeviceWakeLevel, DeviceWakeState; SYSTEM_POWER_STATE SystemWakeState, DeepestWakeState, CurrentState; - + /* Nothing is known at first */ DeviceWakeState = PowerDeviceUnspecified; SystemWakeState = DeepestWakeState = PowerSystemUnspecified; @@ -1523,7 +1523,7 @@ sizeof(DeviceCapability->DeviceState)); return STATUS_SUCCESS; } - + /* The PCI Device has power capabilities, so read which ones are supported */ DeviceCapability->DeviceD1 = PdoExtension->PowerCapabilities.Support.D1; DeviceCapability->DeviceD2 = PdoExtension->PowerCapabilities.Support.D2; @@ -1560,7 +1560,7 @@ /* Read the current mapping from the attached device */ DevicePowerState = AttachedCaps.DeviceState[CurrentState]; NewPowerState = DevicePowerState; - + /* The attachee suports D1, but this PDO does not */ if ((NewPowerState == PowerDeviceD1) && !(PdoExtension->PowerCapabilities.Support.D1)) @@ -1568,7 +1568,7 @@ /* Fall back to D2 */ NewPowerState = PowerDeviceD2; } - + /* The attachee supports D2, but this PDO does not */ if ((NewPowerState == PowerDeviceD2) && !(PdoExtension->PowerCapabilities.Support.D2)) @@ -1576,10 +1576,10 @@ /* Fall back to D3 */ NewPowerState = PowerDeviceD3; } - + /* Set the mapping based on the best state supported */ DeviceCapability->DeviceState[CurrentState] = NewPowerState; - + /* Check if sleep states are being processed, and a mapping was found */ if ((CurrentState < PowerSystemHibernate) && (NewPowerState != PowerDeviceUnspecified)) @@ -1587,8 +1587,8 @@ /* Save this state as being the deepest one found until now */ DeepestWakeState = CurrentState; } - - /* + + /* * Finally, check if the computed sleep state is within the states that * this device can wake the system from, and if it's higher or equal to * the sleep state mapping that came from the attachee, assuming that it @@ -1618,10 +1618,10 @@ DeviceWakeState = NewPowerState; } } - + /* Read the current wake level */ DeviceWakeLevel = PdoExtension->PowerState.DeviceWakeLevel; - + /* Check if the attachee's wake levels are valid, and the PDO's is higher */ if ((AttachedCaps.SystemWake != PowerSystemUnspecified) && (AttachedCaps.DeviceWake != PowerDeviceUnspecified) && @@ -1639,7 +1639,7 @@ /* Bump to D1 */ DeviceCapability->DeviceWake = PowerDeviceD1; } - + /* Now check if the wake level is D1, but the PDO doesn't support it */ if ((DeviceCapability->DeviceWake == PowerDeviceD1) && !(DeviceCapability->WakeFromD1)) @@ -1647,7 +1647,7 @@ /* Bump to D2 */ DeviceCapability->DeviceWake = PowerDeviceD2; } - + /* Now check if the wake level is D2, but the PDO doesn't support it */ if ((DeviceCapability->DeviceWake == PowerDeviceD2) && !(DeviceCapability->WakeFromD2)) @@ -1655,7 +1655,7 @@ /* Bump it to D3 */ DeviceCapability->DeviceWake = PowerDeviceD3; } - + /* Now check if the wake level is D3, but the PDO doesn't support it */ if ((DeviceCapability->DeviceWake == PowerDeviceD3) && !(DeviceCapability->WakeFromD3)) @@ -1676,12 +1676,12 @@ /* Use the wake state that had been computed earlier */ DeviceCapability->DeviceWake = DeviceWakeState; DeviceCapability->SystemWake = SystemWakeState; - + /* If that state was D3, then the device supports Hot/Cold D3 */ if (DeviceWakeState == PowerDeviceD3) DeviceCapability->WakeFromD3 = TRUE; } } - + /* * Finally, check for off states (lower than S3, such as hibernate) and * make sure that the device both supports waking from D3 as well as @@ -1694,12 +1694,12 @@ /* It doesn't, so pick the computed lowest wake state from earlier */ DeviceCapability->SystemWake = DeepestWakeState; } - + /* Set the PCI Specification mandated maximum latencies for transitions */ DeviceCapability->D1Latency = 0; DeviceCapability->D2Latency = 2; DeviceCapability->D3Latency = 100; - + /* Sanity check */ ASSERT(DeviceCapability->DeviceState[PowerSystemWorking] == PowerDeviceD0); } @@ -1710,7 +1710,7 @@ DeviceCapability->D2Latency = 0; DeviceCapability->D3Latency = 0; } - + /* This function always succeeds, even without power management support */ return STATUS_SUCCESS; }

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