Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 41251: - fixes the problem of unsetting the HWND_TOPMOST property (e.g. taskmgr) - review recommended, but i think it's sufficient to limit topmost property to desktop windows only (otherwise we can remove this part of condition)
by mkupfer＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mkupfer Date: Tue Jun 2 14:13:30 2009 New Revision: 41251 URL: http://svn.reactos.org/svn/reactos?rev=41251&view=rev Log: - fixes the problem of unsetting the HWND_TOPMOST property (e.g. taskmgr) - review recommended, but i think it's sufficient to limit topmost property to desktop windows only (otherwise we can remove this part of condition) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Jun 2 14:13:30 2009 @@ -1012,11 +1012,7 @@ if (InsertAfterWindow != NULL) UserDereferenceObject(InsertAfterWindow); if ((HWND_TOPMOST == WinPos.hwndInsertAfter) - || (0 != (Window->Wnd->ExStyle & WS_EX_TOPMOST) - && NULL != Window->PrevSibling - && 0 != (Window->PrevSibling->Wnd->ExStyle & WS_EX_TOPMOST)) - || (NULL != Window->NextSibling - && 0 != (Window->NextSibling->Wnd->ExStyle & WS_EX_TOPMOST))) + && (IntIsDesktopWindow(Window->Parent))) { Window->Wnd->ExStyle |= WS_EX_TOPMOST; }

1 0

[jimtabor] 41250: - Hax-implement NtGdiSetPixelFormat and add a support function UserGethWnd with some code cleanup.
by jimtabor＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: jimtabor Date: Tue Jun 2 10:50:36 2009 New Revision: 41250 URL: http://svn.reactos.org/svn/reactos?rev=41250&view=rev Log: - Hax-implement NtGdiSetPixelFormat and add a support function UserGethWnd with some code cleanup. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -56,5 +56,6 @@ void FASTCALL DceEmptyCache(void); VOID FASTCALL DceResetActiveDCEs(PWINDOW_OBJECT Window); void FASTCALL DceFreeClassDCE(HDC); +HWND FASTCALL UserGethWnd(HDC,PWNDOBJ*); #endif /* _WIN32K_DCE_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -1922,18 +1922,18 @@ ProbeForRead(lpRc, sizeof(RECTL), sizeof(ULONG)); RtlCopyMemory(&SafeRect, lpRc, sizeof(RECTL)); if (str != NULL) - { - SafeStr = ProbeForReadUnicodeString(str); - if (SafeStr.Length != 0) - { - ProbeForRead(SafeStr.Buffer, - SafeStr.Length, - sizeof(WCHAR)); - } - Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, &SafeStr, uFlags); - } - else - Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, NULL, uFlags); + { + SafeStr = ProbeForReadUnicodeString(str); + if (SafeStr.Length != 0) + { + ProbeForRead( SafeStr.Buffer, + SafeStr.Length, + sizeof(WCHAR)); + } + Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, &SafeStr, uFlags); + } + else + Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, NULL, uFlags); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -864,6 +864,36 @@ UserGetWindowDC(PWINDOW_OBJECT Wnd) { return UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); +} + +HWND FASTCALL +UserGethWnd( HDC hdc, PWNDOBJ *pwndo) +{ + PWNDGDI pWndgdi; + PWINDOW_OBJECT Wnd = NULL; + HWND hWnd; + BOOL Hit = FALSE; + PLIST_ENTRY Entry; + hWnd = IntWindowFromDC(hdc); + + if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + { + KeEnterCriticalRegion(); + Entry = Wnd->WndObjListHead.Flink; + while (Entry != &Wnd->WndObjListHead) + { + pWndgdi = (PWNDGDI)Entry; + if (pWndgdi->Hwnd == hWnd) + { + Hit = TRUE; + break; + } + Entry = Entry->Flink; + } + if (pwndo && Hit) *pwndo = (PWNDOBJ)pWndgdi; + KeLeaveCriticalRegion(); + } + return hWnd; } HDC APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -38,7 +38,6 @@ if (ppdev->DriverFunctions.DescribePixelFormat) { - Ret = ppdev->DriverFunctions.DescribePixelFormat( ppdev->hPDev, 1, @@ -94,7 +93,6 @@ if (ppdev->DriverFunctions.DescribePixelFormat) { - Ret = ppdev->DriverFunctions.DescribePixelFormat( ppdev->hPDev, PixelFormat, @@ -129,8 +127,77 @@ IN HDC hdc, IN INT ipfd) { - UNIMPLEMENTED; - return FALSE; + PDC pdc; + PPDEVOBJ ppdev; + HWND hWnd; + PWNDOBJ pWndObj; + SURFOBJ *pso = NULL; + BOOL Ret = FALSE; + + pdc = DC_LockDc(hdc); + if (!pdc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); + + if ( ipfd < 1 || + ipfd > pdc->ipfdDevMax ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + goto Exit; + } + + UserEnterExclusive(); + hWnd = UserGethWnd(hdc, &pWndObj); + UserLeave(); + + if (!hWnd) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_STYLE); + goto Exit; + } + + ppdev = pdc->ppdev; + + if (pWndObj) pso = pWndObj->psoOwner; + else + { + SetLastWin32Error(ERROR_INVALID_PIXEL_FORMAT); + goto Exit; + } + + if (!pso) + { + /* + Based on some rules! InfoDC to DC or, based on wiki information! + All pointers, it's a "must be!", (CONTAINING_RECORD +10h = SURFOBJ), the + pointer will start at SURFOBJ of the SURFACE structure. + */ + pso = (SURFOBJ *)pdc->dclevel.pSurface; + if (!pso) pso = pdc->pSurfInfo; + if (!pso) pso = ppdev->pSurface; + } + + if (ppdev->flFlags & PDEV_META_DEVICE) + { + UNIMPLEMENTED; + goto Exit; + } + + if (ppdev->DriverFunctions.SetPixelFormat) + { + Ret = ppdev->DriverFunctions.SetPixelFormat( + pso, + ipfd, + hWnd); + } + +Exit: + DC_UnlockDc(pdc); + return Ret; } BOOL

1 0

[cgutman] 41249: - Fix a potential crash in IoGetLowerDeviceObject if nothing is attached to us
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 05:34:12 2009 New Revision: 41249 URL: http://svn.reactos.org/svn/reactos?rev=41249&view=rev Log: - Fix a potential crash in IoGetLowerDeviceObject if nothing is attached to us Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Jun 2 05:34:12 2009 @@ -1186,8 +1186,12 @@ /* Get the Lower Device Object */ LowerDeviceObject = DeviceExtension->AttachedTo; - /* Reference it */ - ObReferenceObject(LowerDeviceObject); + /* Check that we got a valid device object */ + if (LowerDeviceObject) + { + /* We did so let's reference it */ + ObReferenceObject(LowerDeviceObject); + } } /* Return it */

1 0

[cgutman] 41248: - Use MmFreeContiguousMemorySpecifyCache to free memory allocated by MmAllocateContiguousMemorySpecifyCache in HalAllocateCommonBuffer
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 05:30:52 2009 New Revision: 41248 URL: http://svn.reactos.org/svn/reactos?rev=41248&view=rev Log: - Use MmFreeContiguousMemorySpecifyCache to free memory allocated by MmAllocateContiguousMemorySpecifyCache in HalAllocateCommonBuffer Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Tue Jun 2 05:30:52 2009 @@ -903,7 +903,9 @@ PVOID VirtualAddress, BOOLEAN CacheEnabled) { - MmFreeContiguousMemory(VirtualAddress); + MmFreeContiguousMemorySpecifyCache(VirtualAddress, + Length, + CacheEnabled ? MmCached : MmNonCached); } /**

1 0

[cgutman] 41247: - Forgot to free DmaContext
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 04:43:21 2009 New Revision: 41247 URL: http://svn.reactos.org/svn/reactos?rev=41247&view=rev Log: - Forgot to free DmaContext Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Jun 2 04:43:21 2009 @@ -357,6 +357,8 @@ Packet, Status); } + + ExFreePool(DmaContext); } NDIS_STATUS

1 0

[cgutman] 41246: - Finish our NDIS S/G DMA implementation - Totally untested due to lack of HAL S/G support
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 04:37:23 2009 New Revision: 41246 URL: http://svn.reactos.org/svn/reactos?rev=41246&view=rev Log: - Finish our NDIS S/G DMA implementation - Totally untested due to lack of HAL S/G support Modified: trunk/reactos/drivers/network/ndis/include/protocol.h trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/include/protocol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/protocol.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/protocol.h [iso-8859-1] Tue Jun 2 04:37:23 2009 @@ -67,6 +67,9 @@ IN PDEVICE_OBJECT DeviceObject, PIRP Irp); +NDIS_STATUS +proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet); + #endif /* __PROTOCOL_H */ /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Tue Jun 2 04:37:23 2009 @@ -944,12 +944,6 @@ if (!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) return NDIS_STATUS_NOT_SUPPORTED; - if (Adapter->NdisMiniportBlock.SystemAdapterObject) - { - NDIS_DbgPrint(MIN_TRACE,("Using existing DMA adapter\n")); - return NDIS_STATUS_SUCCESS; - } - RtlZeroMemory(&DeviceDesc, sizeof(DEVICE_DESCRIPTION)); DeviceDesc.Version = DEVICE_DESCRIPTION_VERSION; @@ -967,6 +961,9 @@ if (!Adapter->NdisMiniportBlock.SystemAdapterObject) return NDIS_STATUS_RESOURCES; + /* FIXME: Right now we just use this as a place holder */ + Adapter->NdisMiniportBlock.ScatterGatherListSize = 1; + return NDIS_STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Jun 2 04:37:23 2009 @@ -430,18 +430,40 @@ * Status = Status of send operation */ { + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; + PSCATTER_GATHER_LIST SGList; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Should we free this before or after calling SendComplete? */ + if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) + { + NDIS_DbgPrint(MAX_TRACE, ("Freeing Scatter/Gather list\n")); + + SGList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, + ScatterGatherListPacketInfo); + + Adapter->NdisMiniportBlock.SystemAdapterObject-> + DmaOperations->PutScatterGatherList( + Adapter->NdisMiniportBlock.SystemAdapterObject, + SGList, + TRUE); + + NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, + ScatterGatherListPacketInfo) = NULL; + } + (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeLowerIrql(OldIrql); } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Jun 2 04:37:23 2009 @@ -21,6 +21,11 @@ KSPIN_LOCK ProtocolListLock; #define WORKER_TEST 0 + +typedef struct _DMA_CONTEXT { + PLOGICAL_ADAPTER Adapter; + PNDIS_PACKET Packet; +} DMA_CONTEXT, *PDMA_CONTEXT; PNET_PNP_EVENT ProSetupPnPEvent( @@ -325,6 +330,33 @@ UNIMPLEMENTED return NDIS_STATUS_FAILURE; +} + +VOID NTAPI +ScatterGatherSendPacket( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PSCATTER_GATHER_LIST ScatterGather, + IN PVOID Context) +{ + PDMA_CONTEXT DmaContext = Context; + PLOGICAL_ADAPTER Adapter = DmaContext->Adapter; + PNDIS_PACKET Packet = DmaContext->Packet; + NDIS_STATUS Status; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, + ScatterGatherListPacketInfo) = ScatterGather; + + Status = proSendPacketToMiniport(Adapter, Packet); + + if (Status != NDIS_STATUS_PENDING) { + NDIS_DbgPrint(MAX_TRACE, ("Completing packet.\n")); + MiniSendComplete(Adapter, + Packet, + Status); + } } NDIS_STATUS @@ -412,6 +444,11 @@ { PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; + PNDIS_BUFFER NdisBuffer; + PDMA_CONTEXT Context; + NDIS_STATUS NdisStatus; + UINT PacketLength; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -447,6 +484,48 @@ return ProIndicatePacket(Adapter, Packet); #endif } else { + if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) + { + NDIS_DbgPrint(MAX_TRACE, ("Using Scatter/Gather DMA\n")); + + NdisQueryPacket(Packet, + NULL, + NULL, + &NdisBuffer, + &PacketLength); + + Context = ExAllocatePool(NonPagedPool, sizeof(DMA_CONTEXT)); + if (!Context) + return NDIS_STATUS_RESOURCES; + + Context->Adapter = Adapter; + Context->Packet = Packet; + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeFlushIoBuffers(NdisBuffer, FALSE, TRUE); + + NdisStatus = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->GetScatterGatherList( + Adapter->NdisMiniportBlock.SystemAdapterObject, + Adapter->NdisMiniportBlock.PhysicalDeviceObject, + NdisBuffer, + MmGetMdlVirtualAddress(NdisBuffer), + PacketLength, + ScatterGatherSendPacket, + Context, + TRUE); + + KeLowerIrql(OldIrql); + + if (!NT_SUCCESS(NdisStatus)) { + NDIS_DbgPrint(MIN_TRACE, ("GetScatterGatherList failed!\n")); + return NdisStatus; + } + + return NDIS_STATUS_PENDING; + } + + return proSendPacketToMiniport(Adapter, Packet); } }

1 0

[cfinck] 427: - Detect multiple summary lines and combine their information for one test. Fixes i.e. advapi32:security only showing 18 out of 1381 tests. - Fix the test name being stored with a trailing line break character inside the database.
by cfinck＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cfinck Date: Tue Jun 2 04:10:01 2009 New Revision: 427 URL: http://svn.reactos.org/svn/reactos?rev=427&view=rev Log: - Detect multiple summary lines and combine their information for one test. Fixes i.e. advapi32:security only showing 18 out of 1381 tests. - Fix the test name being stored with a trailing line break character inside the database. Modified: branches/danny-web/www/www.reactos.org/testman/webservice/buildbot_aggregat… branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… Modified: branches/danny-web/www/www.reactos.org/testman/webservice/buildbot_aggregat… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/buildbot_aggregat… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/buildbot_aggregat… [iso-8859-1] Tue Jun 2 04:10:01 2009 @@ -70,7 +70,7 @@ break; // Parse the test line - if(!preg_match("#Running Wine Test, Module: (.+), Test: (.+)#", $line, $matches)) + if(!preg_match("#Running Wine Test, Module: (.+), Test: ([\S]+)#", $line, $matches)) die("Wine Test line is invalid!"); // Get a Suite ID for this combination @@ -83,7 +83,7 @@ // Now get the real log $log = ""; - do + for(;;) { $line = fgets($fp); @@ -101,8 +101,11 @@ $log .= "[TESTMAN] Maximum memory for log exceeded, aborting!"; break; } + + // Sysreg might also have noticed a system crash or we even reached the end of the log. Break then. + if(substr($line, 0, 9) == "[SYSREG] " || feof($fp)) + break; } - while(strpos($line, " tests executed (") === false && substr($line, 0, 9) != "[SYSREG] " && !feof($fp)); // Did we already get a Test ID for this run? if(!$test_id) Modified: branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] Tue Jun 2 04:10:01 2009 @@ -70,16 +70,33 @@ if(!$stmt->fetchColumn()) return "No such test or no permissions!"; - // Parse the log - $line = strrchr($log, ":"); + // Get the test name + $stmt = $dbh->prepare("SELECT test FROM " . DB_TESTMAN . ".winetest_suites WHERE id = :id"); + $stmt->bindParam(":id", $suite_id); + $stmt->execute() or die("Submit(): SQL failed #2"); + $test = $stmt->fetchColumn(); - if(!$line || sscanf($line, ": %u tests executed (%u marked as todo, %u %s%u skipped.", $count, $todo, $failures, $ignore, $skipped) != 5) + // Get all summary lines belonging to this test in the whole log (a test may have multiple summary lines) + $result = preg_match_all("#^{$test}: ([0-9]+) tests executed $[0-9]+ marked as todo, ([0-9]+) failure[s]?$, ([0-9]+) skipped.#m", $log, $matches, PREG_PATTERN_ORDER); + + if($result === FALSE) + { + return "preg_match_all failed!"; + } + else if($result == 0) { // We found no summary line, so the test probably crashed // Indicate this by setting count to -1 and set the rest to zero. $count = -1; $failures = 0; $skipped = 0; + } + else + { + // Sum up the values of each summary line + $count = array_sum($matches[1]); + $failures = array_sum($matches[2]); + $skipped = array_sum($matches[3]); } // Add the information into the DB @@ -89,12 +106,12 @@ $stmt->bindParam(":count", $count); $stmt->bindParam(":failures", $failures); $stmt->bindParam(":skipped", $skipped); - $stmt->execute() or die("Submit(): SQL failed #2"); + $stmt->execute() or die("Submit(): SQL failed #3"); $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_logs (id, log) VALUES (:id, :log)"); $stmt->bindValue(":id", (int)$dbh->lastInsertId()); $stmt->bindParam(":log", $log); - $stmt->execute() or die("Submit(): SQL failed #3"); + $stmt->execute() or die("Submit(): SQL failed #4"); return "OK"; }

1 0

[jimtabor] 41245: - Implement NtGdiDescribePixelFormat, needs testing.
by jimtabor＠svn.reactos.org 01 Jun '09

01 Jun '09

Author: jimtabor Date: Tue Jun 2 03:24:20 2009 New Revision: 41245 URL: http://svn.reactos.org/svn/reactos?rev=41245&view=rev Log: - Implement NtGdiDescribePixelFormat, needs testing. Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] Tue Jun 2 03:24:20 2009 @@ -23,13 +23,32 @@ #define NDEBUG #include <debug.h> +static INT -APIENTRY -NtGdiChoosePixelFormat(HDC hDC, - CONST PPIXELFORMATDESCRIPTOR pfd) +FASTCALL +IntGetipfdDevMax(PDC pdc) { - UNIMPLEMENTED; - return 0; + INT Ret = 0; + PPDEVOBJ ppdev = pdc->ppdev; + + if (ppdev->flFlags & PDEV_META_DEVICE) + { + return 0; + } + + if (ppdev->DriverFunctions.DescribePixelFormat) + { + + Ret = ppdev->DriverFunctions.DescribePixelFormat( + ppdev->hPDev, + 1, + 0, + NULL); + } + + if (Ret) pdc->ipfdDevMax = Ret; + + return Ret; } @@ -40,8 +59,67 @@ UINT BufSize, LPPIXELFORMATDESCRIPTOR pfd) { - UNIMPLEMENTED; - return 0; + PDC pdc; + PPDEVOBJ ppdev; + INT Ret = 0; + PIXELFORMATDESCRIPTOR pfdSafe; + NTSTATUS Status = STATUS_SUCCESS; + + if (!BufSize) return 0; + + pdc = DC_LockDc(hDC); + if (!pdc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); + + if ( BufSize < sizeof(PIXELFORMATDESCRIPTOR) || + PixelFormat < 1 || + PixelFormat > pdc->ipfdDevMax ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + goto Exit; + } + + ppdev = pdc->ppdev; + + if (ppdev->flFlags & PDEV_META_DEVICE) + { + UNIMPLEMENTED; + goto Exit; + } + + if (ppdev->DriverFunctions.DescribePixelFormat) + { + + Ret = ppdev->DriverFunctions.DescribePixelFormat( + ppdev->hPDev, + PixelFormat, + sizeof(PIXELFORMATDESCRIPTOR), + &pfdSafe); + } + + _SEH2_TRY + { + ProbeForWrite( pfd, + sizeof(PIXELFORMATDESCRIPTOR), + 1); + RtlCopyMemory(&pfdSafe, pfd, sizeof(PIXELFORMATDESCRIPTOR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) SetLastNtError(Status); + +Exit: + DC_UnlockDc(pdc); + return Ret; }

1 0

[jimtabor] 41244: - Add note for WNDOBJ.
by jimtabor＠svn.reactos.org 01 Jun '09

01 Jun '09

Author: jimtabor Date: Tue Jun 2 02:51:48 2009 New Revision: 41244 URL: http://svn.reactos.org/svn/reactos?rev=41244&view=rev Log: - Add note for WNDOBJ. Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Tue Jun 2 02:51:48 2009 @@ -27,7 +27,10 @@ * 16/11/2004: Created */ -/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. */ +/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. + + Simple! Use Prop's! + */ #include <w32k.h>

1 0

[tkreuzer] 41243: Add missing exports to videoprt
by tkreuzer＠svn.reactos.org 01 Jun '09

01 Jun '09

Author: tkreuzer Date: Tue Jun 2 02:16:54 2009 New Revision: 41243 URL: http://svn.reactos.org/svn/reactos?rev=41243&view=rev Log: Add missing exports to videoprt Added: trunk/reactos/drivers/video/videoprt/stubs.c (with props) Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild trunk/reactos/drivers/video/videoprt/videoprt.spec Added: trunk/reactos/drivers/video/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/stu… ============================================================================== --- trunk/reactos/drivers/video/videoprt/stubs.c (added) +++ trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] Tue Jun 2 02:16:54 2009 @@ -1,0 +1,117 @@ +/* + * VideoPort driver + * + * Copyright (C) 2002-2004, 2007 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + + +#include "videoprt.h" +#include <wdmguid.h> + +VIDEOPORT_API +VP_STATUS +DDKAPI +VideoPortFlushRegistry( + PVOID HwDeviceExtension) +{ + UNIMPLEMENTED; + return 0; +} + +VIDEOPORT_API +ULONG +DDKAPI +VideoPortGetAssociatedDeviceID( + IN PVOID DeviceObject) +{ + UNIMPLEMENTED; + return 0; +} + + +VIDEOPORT_API +ULONG +DDKAPI +VideoPortGetBytesUsed( + IN PVOID HwDeviceExtension, + IN PDMA pDma) +{ + UNIMPLEMENTED; + return 0; +} + +VIDEOPORT_API +PVOID +DDKAPI +VideoPortGetMdl( + IN PVOID HwDeviceExtension, + IN PDMA pDma) +{ + UNIMPLEMENTED; + return 0; +} + +VIDEOPORT_API +BOOLEAN +DDKAPI +VideoPortLockPages( + IN PVOID HwDeviceExtension, + IN OUT PVIDEO_REQUEST_PACKET pVrp, + IN PEVENT pUEvent, + IN PEVENT pDisplayEvent, + IN DMA_FLAGS DmaFlags) +{ + UNIMPLEMENTED; + return 0; +} + +VIDEOPORT_API +LONG +DDKAPI +VideoPortReadStateEvent( + IN PVOID HwDeviceExtension, + IN PEVENT pEvent) +{ + UNIMPLEMENTED; + return 0; +} + +VIDEOPORT_API +VOID +DDKAPI +VideoPortSetBytesUsed( + IN PVOID HwDeviceExtension, + IN OUT PDMA pDma, + IN ULONG BytesUsed) +{ + UNIMPLEMENTED; +} + +VIDEOPORT_API +BOOLEAN +DDKAPI +VideoPortUnlockPages( + IN PVOID hwDeviceExtension, + IN PDMA pDma) +{ + UNIMPLEMENTED; + return 0; +} + + Propchange: trunk/reactos/drivers/video/videoprt/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] Tue Jun 2 02:16:54 2009 @@ -19,6 +19,7 @@ <file>resource.c</file> <file>services.c</file> <file>spinlock.c</file> + <file>stubs.c</file> <file>timer.c</file> <file>videoprt.c</file> <file>videoprt.rc</file> Modified: trunk/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Tue Jun 2 02:16:54 2009 @@ -5,11 +5,11 @@ @ stdcall VideoPortAllocateCommonBuffer(ptr ptr long ptr long ptr) @ stdcall VideoPortAllocateContiguousMemory(ptr long long long) @ stdcall VideoPortAllocatePool(ptr long long long) -;VideoPortAssociateEventsWithDmaHandle +@ stdcall VideoPortAssociateEventsWithDmaHandle(ptr ptr ptr ptr) @ stdcall VideoPortCheckForDeviceExistence(ptr long long long long long long) @ stdcall VideoPortClearEvent(ptr ptr) @ stdcall VideoPortCompareMemory(ptr ptr long) NTOSKRNL.RtlCompareMemory -;VideoPortCompleteDma +@ stdcall VideoPortCompleteDma(ptr ptr ptr long) @ stdcall VideoPortCreateEvent(ptr long ptr ptr) @ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) @ stdcall VideoPortCreateSpinLock(ptr ptr) @@ -18,26 +18,26 @@ @ stdcall VideoPortDeleteEvent(ptr ptr) @ stdcall VideoPortDeleteSpinLock(ptr ptr) @ stdcall VideoPortDisableInterrupt(ptr) -;VideoPortDoDma +@ stdcall VideoPortDoDma(ptr ptr long) @ stdcall VideoPortEnableInterrupt(ptr) @ stdcall VideoPortEnumerateChildren(ptr ptr) -;VideoPortFlushRegistry +@ stdcall VideoPortFlushRegistry(ptr) @ stdcall VideoPortFreeCommonBuffer(ptr long ptr long long long) @ stdcall VideoPortFreeDeviceBase(ptr ptr) @ stdcall VideoPortFreePool(ptr ptr) @ stdcall VideoPortGetAccessRanges(ptr long ptr long ptr ptr ptr ptr) @ stdcall VideoPortGetAgpServices(ptr ptr) @ stdcall VideoPortGetAssociatedDeviceExtension(ptr) -;VideoPortGetAssociatedDeviceID +@ stdcall VideoPortGetAssociatedDeviceID(ptr) @ stdcall VideoPortGetBusData(ptr long long ptr long long) -;VideoPortGetBytesUsed -;VideoPortGetCommonBuffer +@ stdcall VideoPortGetBytesUsed(ptr ptr) +@ stdcall VideoPortGetCommonBuffer(ptr long long ptr ptr long) @ stdcall VideoPortGetCurrentIrql() @ stdcall VideoPortGetDeviceBase(ptr long long long long) @ stdcall VideoPortGetDeviceData(ptr long ptr ptr) @ stdcall VideoPortGetDmaAdapter(ptr ptr) -;VideoPortGetDmaContext -;VideoPortGetMdl +@ stdcall VideoPortGetDmaContext(ptr ptr) +@ stdcall VideoPortGetMdl(ptr ptr) @ stdcall VideoPortGetRegistryParameters(ptr wstr long ptr ptr) @ stdcall VideoPortGetRomImage(ptr ptr long long) @ stdcall VideoPortGetVersion(ptr ptr) @@ -48,10 +48,10 @@ @ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange @ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement @ stdcall VideoPortLockBuffer(ptr ptr long long) -;VideoPortLockPages +@ stdcall VideoPortLockPages(ptr ptr ptr ptr long) @ stdcall VideoPortLogError(ptr ptr long long) @ stdcall VideoPortMapBankedMemory(ptr long long ptr ptr ptr long long ptr ptr) -;VideoPortMapDmaMemory +@ stdcall VideoPortMapDmaMemory(ptr ptr double ptr ptr ptr ptr ptr) @ stdcall VideoPortMapMemory(ptr long long ptr ptr ptr) @ stdcall VideoPortMoveMemory(ptr ptr long) NTOSKRNL.RtlMoveMemory @ stdcall VideoPortPutDmaAdapter(ptr ptr) @@ -71,7 +71,7 @@ @ stdcall VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR @ stdcall VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT @ stdcall VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG -;VideoPortReadStateEvent +@ stdcall VideoPortReadStateEvent(ptr ptr) @ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) @ stdcall VideoPortReleaseBuffer(ptr ptr) @ stdcall VideoPortReleaseCommonBuffer(ptr ptr long long long ptr long) @@ -80,20 +80,20 @@ @ stdcall VideoPortReleaseSpinLockFromDpcLevel(ptr ptr) @ stdcall VideoPortScanRom(ptr ptr long ptr) @ stdcall VideoPortSetBusData(ptr long long ptr long long) -;VideoPortSetBytesUsed -;VideoPortSetDmaContext +@ stdcall VideoPortSetBytesUsed(ptr ptr long) +@ stdcall VideoPortSetDmaContext(ptr ptr ptr) @ stdcall VideoPortSetEvent(ptr ptr) @ stdcall VideoPortSetRegistryParameters(ptr wstr ptr long) @ stdcall VideoPortSetTrappedEmulatorPorts(ptr long ptr) -;VideoPortSignalDmaComplete +@ stdcall VideoPortSignalDmaComplete(ptr ptr) @ stdcall VideoPortStallExecution(ptr) HAL.KeStallExecutionProcessor -;VideoPortStartDma +@ stdcall VideoPortStartDma(ptr ptr ptr long ptr ptr ptr long) @ stdcall VideoPortStartTimer(ptr) @ stdcall VideoPortStopTimer(ptr) @ stdcall VideoPortSynchronizeExecution(ptr long ptr ptr) @ stdcall VideoPortUnlockBuffer(ptr ptr) -;VideoPortUnlockPages -;VideoPortUnmapDmaMemory +@ stdcall VideoPortUnlockPages(ptr ptr) +@ stdcall VideoPortUnmapDmaMemory(ptr ptr ptr ptr) @ stdcall VideoPortUnmapMemory(ptr ptr ptr) @ stdcall VideoPortVerifyAccessRanges(ptr long ptr) @ stdcall VideoPortWaitForSingleObject(ptr ptr ptr)

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