Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cgutman] 40341: - More leak fixes - Free items in the datagram list and pending connections list - Free ConnectionCallInfo and ConnectionReturnInfo - Free the FCB context

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Apr 3 09:29:49 2009 New Revision: 40341 URL: http://svn.reactos.org/svn/reactos?rev=40341&view=rev Log: - More leak fixes - Free items in the datagram list and pending connections list - Free ConnectionCallInfo and ConnectionReturnInfo - Free the FCB context Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Fri Apr 3 09:29:49 2009 @@ -198,6 +198,8 @@ if( ReturnEarly ) return; + if( FCB->Context ) + ExFreePool(FCB->Context); if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); if( FCB->Send.Window )

15 years, 9 months

[jimtabor] 40340: - Replaced fix pi and enabled test for window processes with the proper signing. Yes regedit works.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Apr 3 09:26:53 2009 New Revision: 40340 URL: http://svn.reactos.org/svn/reactos?rev=40340&view=rev Log: - Replaced fix pi and enabled test for window processes with the proper signing. Yes regedit works. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Fri Apr 3 09:26:53 2009 @@ -48,6 +48,7 @@ LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC); +extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO g_psi; Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Fri Apr 3 09:26:53 2009 @@ -8,6 +8,7 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; +PPROCESSINFO g_ppi = NULL; PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; PSERVERINFO g_psi = NULL; @@ -234,6 +235,7 @@ &UserCon, sizeof(USERCONNECT)); + g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! g_ulSharedDelta = UserCon.siClient.ulSharedDelta; g_psi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); @@ -333,12 +335,13 @@ if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - if (g_psi) return; + if (g_psi && g_ppi) return; NtUserProcessConnect( NtCurrentProcess(), &UserCon, sizeof(USERCONNECT)); + g_ppi = GetWin32ClientInfo()->ppi; g_ulSharedDelta = UserCon.siClient.ulSharedDelta; g_psi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Fri Apr 3 09:26:53 2009 @@ -431,7 +431,7 @@ ValidateCallProc(HANDLE hCallProc) { PCALLPROC CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); - if (CallProc != NULL && CallProc->pi == GetWin32ClientInfo()->ppi) + if (CallProc != NULL && CallProc->pi == g_ppi) return CallProc; return NULL; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Fri Apr 3 09:26:53 2009 @@ -1126,8 +1126,7 @@ _SEH2_TRY { -// if (TestWindowProcess( Wnd)) - if (Wnd->pi != GetWin32ClientInfo()->ppi) + if (!TestWindowProcess( Wnd)) { if (nMaxCount > 0) { @@ -1217,8 +1216,7 @@ _SEH2_TRY { -// if (TestWindowProcess( Wnd)) - if (Wnd->pi != GetWin32ClientInfo()->ppi) + if (!TestWindowProcess( Wnd)) { if (nMaxCount > 0) {

15 years, 9 months

[cgutman] 40339: - Cancel all the IRPs in the pending IRP queue when the FCB is being destroyed - Fixes IRP, MDL, and buffer leaks - ping and dwnl don't leak at all now

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Apr 3 05:45:32 2009 New Revision: 40339 URL: http://svn.reactos.org/svn/reactos?rev=40339&view=rev Log: - Cancel all the IRPs in the pending IRP queue when the FCB is being destroyed - Fixes IRP, MDL, and buffer leaks - ping and dwnl don't leak at all now Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Apr 3 05:45:32 2009 @@ -96,8 +96,15 @@ FCB->ConnectIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + /* Cleanup our IRP queue because the FCB is being destroyed */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_CONNECT] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_CONNECT]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } SocketStateUnlock( FCB ); return STATUS_FILE_CLOSED; } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Apr 3 05:45:32 2009 @@ -95,6 +95,8 @@ NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; + PLIST_ENTRY NextIrpEntry; + PIRP NextIrp; if( !SocketAcquireStateLock( FCB ) ) { Irp->IoStatus.Status = STATUS_FILE_CLOSED; @@ -105,8 +107,15 @@ FCB->ListenIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + /* Cleanup our IRP queue because the FCB is being destroyed */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_PREACCEPT]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } SocketStateUnlock( FCB ); return STATUS_FILE_CLOSED; } Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Fri Apr 3 05:45:32 2009 @@ -225,16 +225,17 @@ PIRP Irp, PVOID Context ) { PAFD_FCB FCB = (PAFD_FCB)Context; + PLIST_ENTRY NextIrpEntry; + PIRP NextIrp; + PAFD_RECV_INFO RecvReq; + PIO_STACK_LOCATION NextIrpSp; AFD_DbgPrint(MID_TRACE,("Called\n")); ASSERT_IRQL(APC_LEVEL); - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->ReceiveIrp.InFlightRequest = NULL; @@ -242,11 +243,21 @@ FCB->Recv.BytesUsed = 0; if( FCB->State == SOCKET_STATE_CLOSED ) { - AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + AFD_DbgPrint(MIN_TRACE,("!!! CLOSING SOCK GOT A RECEIVE COMPLETE !!!\n")); + /* Cleanup our IRP queue because the FCB is being destroyed */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation(NextIrp); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; @@ -449,6 +460,7 @@ PAFD_RECV_INFO RecvReq; PAFD_STORED_DATAGRAM DatagramRecv; UINT DGSize = Irp->IoStatus.Information + sizeof( AFD_STORED_DATAGRAM ); + PLIST_ENTRY NextIrpEntry; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -461,10 +473,20 @@ FCB->ReceiveIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + /* Cleanup our IRP queue because the FCB is being destroyed */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } DatagramRecv = ExAllocatePool( NonPagedPool, DGSize ); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Fri Apr 3 05:45:32 2009 @@ -48,8 +48,18 @@ /* Request is not in flight any longer */ if( FCB->State == SOCKET_STATE_CLOSED ) { - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + /* Cleanup our IRP queue because the FCB is being destroyed */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } if( !NT_SUCCESS(Status) ) { @@ -162,6 +172,8 @@ PIRP Irp, PVOID Context ) { PAFD_FCB FCB = (PAFD_FCB)Context; + PLIST_ENTRY NextIrpEntry; + PIRP NextIrp; AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", Irp->IoStatus.Status, @@ -178,8 +190,17 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); if( FCB->State == SOCKET_STATE_CLOSED ) { - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + /* Cleanup our IRP queue because the FCB is being destroyed */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } SocketStateUnlock( FCB );

15 years, 9 months

[dgoette] 40338: * replace absolute paths in css files * merge footer.php header.php and structure.php into HTML.class.php * remove unneeded view variable * remove some stuff from the left menu (quick links, last change, login/register links) * convert first page to use HTML class like in roscms

by dgoette＠svn.reactos.org

Author: dgoette Date: Fri Apr 3 02:33:34 2009 New Revision: 40338 URL: http://svn.reactos.org/svn/reactos?rev=40338&view=rev Log: * replace absolute paths in css files * merge footer.php header.php and structure.php into HTML.class.php * remove unneeded view variable * remove some stuff from the left menu (quick links, last change, login/register links) * convert first page to use HTML class like in roscms Added: branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php (contents, props changed) - copied, changed from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/header.php branches/danny-web/reactos.org/htdocs/compat/lib/view/ branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php (contents, props changed) - copied, changed from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/about.php Removed: branches/danny-web/reactos.org/htdocs/compat/inc/about.php branches/danny-web/reactos.org/htdocs/compat/inc/footer.php branches/danny-web/reactos.org/htdocs/compat/inc/header.php branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php branches/danny-web/reactos.org/htdocs/compat/inc/structure.php Modified: branches/danny-web/reactos.org/htdocs/compat/css/style.css branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php branches/danny-web/reactos.org/htdocs/compat/index.php branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php Modified: branches/danny-web/reactos.org/htdocs/compat/css/style.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/css/style.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/css/style.css [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -3,7 +3,7 @@ font-size: 12px; margin: 0 0 1em 0; padding: 0; /* Only affects Opera */ - background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left; + background: #FFFFFF url('../images/topbar.jpg') repeat-x scroll top left; } hr { @@ -100,7 +100,7 @@ /* set by the generator */ a.extern { - background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right; + background: url('../../wiki/stylesheets/monobook/external.png') no-repeat center right; padding-right: 14px; } @@ -111,12 +111,12 @@ } #content li { - list-style-image: url('http://localhost/reactos.org/images/bullet.png') + list-style-image: url('../images/bullet.png') } #top { margin: 0; - background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; + background: url('../images/logo_rsdb.jpg') no-repeat scroll 35px 0; padding: 103px 0 26px 0; color: #FFFFFF; text-align: right; Removed: branches/danny-web/reactos.org/htdocs/compat/inc/about.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/about.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/about.php (removed) @@ -1,43 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > <?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h1> -<h2><?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h2> -<p><?php echo $RSDB_langres['CONTENT_about_rsdb']; ?></p> -<p><?php echo $RSDB_langres['CONTENT_about_webteam']; ?></p> -<p> </p> -<h3><?php echo $RSDB_langres['TEXT_credits']; ?></h3> -<p><b>Klemens Friedl:</b> <?php echo $RSDB_langres['CONTENT_about_credits_frik85']; ?></p> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/footer.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/footer.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/footer.php (removed) @@ -1,62 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> - - - </td> - </tr> -</table> - - -<hr size="1" /> -<address> - <p align="center"><a href="http://www.reactos.org" onmousedown="return clk(this.href,'res','')">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br /> - Languages: <a href="#">EN</a> | <a href="#">DE</a> | <a href="#">FR</a>     Ajax: <a href="<?php echo $RSDB_intern_link_ajax; ?>true"><?php if ($RSDB_ENV_ajax == "true") { echo "<b>"; } echo "enabled"; if ($RSDB_ENV_ajax == "true") { echo "</b>"; } ?></a> | <a href="<?php echo $RSDB_intern_link_ajax; ?>false"><?php if ($RSDB_ENV_ajax != "true") { echo "<b>"; } echo "disabled"; if ($RSDB_ENV_ajax != "true") { echo "</b>"; } ?></a>    <?php - - // This page was generated in ... - $roscms_gentime = microtime(); - $roscms_gentime = explode(' ',$roscms_gentime); - $roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; - $roscms_pg_end = $roscms_gentime; - $roscms_totaltime = ($roscms_pg_end - $roscms_pg_start); - $roscms_showtime = number_format($roscms_totaltime, 4, '.', ''); - echo $roscms_showtime . " seconds"; - -?>    Copyright © Klemens Friedl 2005-<?php echo date("Y");?>, All rights reserved.</p> -</address> - -</body> -</html> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/header.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/header.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/header.php (removed) @@ -1,125 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - - // This page was generated in ... - $roscms_gentime = microtime(); - $roscms_gentime = explode(' ',$roscms_gentime); - $roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; - $roscms_pg_start = $roscms_gentime; - -function create_head($page_title, $logo, $RSDB_langres) -{ - include('rsdb_setting.php'); - -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html lang="<?php echo $RSDB_langres['lang_code']; ?>"> -<head> - <title>ReactOS <?php echo $page_title ; ?></title> - <base href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>" /> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $RSDB_langres['charset']; ?>" /> - <meta http-equiv="Pragma" content="no-cache" /> - <meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." /> - <meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" /> - <meta name="Copyright" content="ReactOS Foundation" /> - <meta name="Generator" content="RSDB" /> - <meta name="Content-language" content="<?php echo $RSDB_langres['lang_code']; ?>" /> - <meta name="Robots" content="index,follow" /> - <link rel="SHORTCUT ICON" href="../favicon.ico" /> - <link href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>css/style.css" type="text/css" rel="stylesheet" /> - <script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/smoothscroll.js" language="javascript"></script> - <script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/search.js" language="javascript"></script> - - - <script> -  - </script> -</head> -<body> -<div id="top"> - <div id="topMenu"> -  - <p align="center"> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=index"><?php echo $RSDB_langres['Home']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=about"><?php echo $RSDB_langres['Info']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=community"><?php echo $RSDB_langres['Community']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=dev"><?php echo $RSDB_langres['Dev']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user"><?php echo $RSDB_langres['myReactOS']; ?></a> </p> - </div> -</div> - - -<?php /*<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html><head><title>ReactOS Package Manager - Online</title> - -<link rel="stylesheet" type="text/css" href="reactos.basic.css"> -<META content="ReactOS Package Manager - CMS System" name=GENERATOR> -<META content="Klemens Friedl" name=AUTHOR> -</head> -<body>*/ - - -//require("./inc/inc_account_check.php"); - -?> - - - -<?php -} // End of function create_head -?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php (removed) @@ -1,61 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - if($RSDB_intern_user_id != 0) { - -?><div class="navTitle"><?php echo $RSDB_langres['Account']; ?></div> - <ol> - <li> -  Nick: <?php echo substr($RSDB_USER_name, 0, 9); - - - - ?> <img src="images/info_15x15.gif" alt="<?php echo "Username: ".$RSDB_USER_name; ?>" width="15" height="15"> - </li> - <li><a href="<?php echo $RSDB_intern_link_roscms_page; ?>logout"><?php echo $RSDB_langres['Logout']; ?></a></li> - </ol> -</div> -<p></p><?php - } - else { - ?><form action="?page=login" method="post"><div class="navTitle">Login</div> - <ol> - <li><a href="<?php echo $RSDB_intern_link_roscms_page; ?>login"><?php echo $RSDB_langres['Global_Login_System']; ?></a></li> - <li><a href="<?php echo $RSDB_intern_link_roscms_page; ?>register"><?php echo $RSDB_langres['Register_Account']; ?></a></li> - </ol></div></form> - <p></p><?php - } -?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/structure.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/structure.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/structure.php (removed) @@ -1,199 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - -function create_structure($page ) -{ - include('rsdb_setting.php'); - include('rsdb_config.php'); - - global $RSDB_SET_view; - global $RSDB_SET_page; - - global $roscms_intern_account_level; - global $roscms_intern_login_check; - global $roscms_intern_login_check_username; - global $roscms_intern_account_group; - global $roscms_intern_usrgrp_sadmin; - global $roscms_intern_usrgrp_admin; - global $roscms_intern_usrgrp_dev; - global $roscms_intern_usrgrp_team; - global $roscms_intern_usrgrp_trans; - global $roscms_intern_usrgrp_user; - global $RSDB_langres; - - global $RSDB_langres; -?> - - -<table border="0" width="100%" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td width="147" id="leftNav"> <div class="navTitle"><?php echo $RSDB_langres['Navigation']; ?></div> - <ol> - - <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=index"><?php echo $RSDB_langres['Home']; ?></a></li> - <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=about"><?php echo $RSDB_langres['Info']; ?></a></li> - <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=community"><?php echo $RSDB_langres['Community']; ?></a></li> - <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=dev"><?php echo $RSDB_langres['Dev']; ?></a></li> - <li><a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user"><?php echo $RSDB_langres['myReactOS']; ?></a></li> - </ol></div> - <p></p> -<?php - if ($RSDB_SET_view == "comp") { - ?> - <div class="navTitle"><?php - echo "Compatibility"; - ?></div> - <ol> - <li><a href="<?php echo $RSDB_intern_link_view_EX."home".$RSDB_URI_slash; ?>">Overview</a></li> - <li><a href="<?php echo $RSDB_intern_link_category_EX."0".$RSDB_URI_slash; ?>">Browse Database</a></li> - <?php - if ( $RSDB_SET_sec == "category" || $RSDB_SET_sec == "name" || $RSDB_SET_sec == "vendor" || $RSDB_SET_sec == "rank") { - ?> - <li><a href="<?php echo $RSDB_intern_link_category_EX."0".$RSDB_URI_slash; ?>"> - By Category</a></li> - <li><a href="<?php echo $RSDB_intern_link_name_letter_EX."all".$RSDB_URI_slash; ?>"> - By Name</a></li> - <?php - if ($RSDB_SET_view == "comp") { - ?> - <li><a href="<?php echo $RSDB_intern_link_vendor_letter_EX."all".$RSDB_URI_slash; ?>"> - By Vendor</a></li> - <?php - } - if ($RSDB_SET_view == "comp") { - ?> - <li><a href="<?php echo $RSDB_intern_link_rank_EX."rank".$RSDB_URI_slash; ?>"> - By Rank</a></li> - <?php - } - } - ?> - <li id="noscriptsearchbar" style="display: block"><a href="<?php echo $RSDB_intern_link_view_EX."search".$RSDB_URI_slash; ?>">Search</a></li> - <li><a href="<?php echo $RSDB_intern_link_view_EX."submit".$RSDB_URI_slash; ?>">Submit Application</a></li> - <li><a href="<?php echo $RSDB_intern_link_view_EX."stats".$RSDB_URI_slash; ?>">Database Statistics</a></li> - <li><a href="<?php echo $RSDB_intern_link_view_EX."help".$RSDB_URI_slash; ?>">Help & FAQ</a></li> - </ol> - </div> - <p></p> -<?php - } -?> - <div class="navTitle">Search</div> - <ol> - <li> - <div id="ajaxsearchbar" align="center" style="display: none"> - <div align="center"><label for="searchbar" accesskey="s"></label><input name="searchbar" type="text" id="searchbar" tabindex="0" onkeyup="loadItemList(this.value,'bar','comp','ajaxloadbar','sresultbar')" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> </div> - <div id="sresultbar" style="display: none" align="left"></div> - </div> - <div align="center"><img id="ajaxloadbar" src="images/ajax_loading.gif" style="display: none"></div> - </li> - </ol> - <p></p> - - <div class="navTitle">Quick Links</div> - <ol> - <li><a href="<?php echo $RSDB_intern_path_server; ?>forum/">Support Forum</a></li> - <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=community_irc">Chat Channels</a></li> - <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=community_mailinglists">Mailing Lists</a></li> - <li><a href="<?php echo $RSDB_intern_path_server; ?>wiki/">ReactOS Wiki</a></li> - </ol></div> - <p></p> - - - <script type="text/javascript" language="javascript"> -  - </script> -<?php - //include("inc/comp/sub/search_bar.php"); - include("inc/member_bar.php"); -?> -<div class="navTitle">Language</div> - <ol> - <li> - <div align="center"> - <?php - $rpm_page=""; - $rpm_lang=""; - if (array_key_exists("page", $_GET)) $rpm_page=htmlspecialchars($_GET["page"]); - if (array_key_exists("lang", $_GET)) $rpm_lang=htmlspecialchars($_GET["lang"]); -// echo $rpm_lang; - if ($rpm_lang == '' && isset($_COOKIE['roscms_usrset_lang'])) { - $rpm_lang = $_COOKIE['roscms_usrset_lang']; - if (substr($rpm_lang, -1) == '/') { - $rpm_lang = substr($rpm_lang, strlen($rpm_lang) - 1); - } - $rpm_lang = CLanguage::validate($rpm_lang); - } -// echo $rpm_lang; - ?> - <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="window.open(this.options[this.selectedIndex].value,'_main')"> - <optgroup label="current language"> - <?php - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_languages WHERE lang_id = :lang_id"); - $stmt->bindParam('lang_id',$rpm_lang,PDO::PARAM_STR); - $stmt->execute(); - $result_roscms_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); - - echo '<option value="#">'.$result_roscms_lang[1].'</option>'; - ?> - </optgroup> - <optgroup label="most popular"> - <option value="<?php echo $RSDB_intern_link_language; ?>en">English</option> - <option value="<?php echo $RSDB_intern_link_language; ?>de">Deutsch (German)</option> - <option value="<?php echo $RSDB_intern_link_language; ?>fr">Français (French)</option> - <option value="<?php echo $RSDB_intern_link_language; ?>ru">Russian (Russian)</option> - </optgroup> - </select> - </div> - </li> - </ol> - <p></p> - <div class="navTitle">Latest Update</div> - <ol> - <li> - <div align="center"><?php echo date("Y-m-d"); $zeit = localtime(time() , 1); echo " " . sprintf("%02d",$zeit['tm_hour']).":".sprintf("%02d",$zeit['tm_min']); ?></div> - </li> - </ol></div> - <p></p> - </td> - - - - <td id="content"> - -<?php -} // End of function create_structure -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -59,11 +59,7 @@ } else { if ($RSDB_SET_item != "") { - $result_count_group['item_comp']=0; - - if ($RSDB_SET_view == "comp") { $result_count_group['item_comp']=1; - } $RSDB_compare_string = 'item'; } elseif ($RSDB_SET_group != "") { Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -74,18 +74,7 @@ <td width="10%" title="Version"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Ver.</strong></font></div></td> <td width="20%"> - <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong><?php - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - echo "Compatibility"; - break; - default: - echo "Rating"; - break; - } - - ?> Ø </strong></font></div></td> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Compatibility Ø </strong></font></div></td> <td width="8%" title="Status"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Stat.</strong></font></div></td> </tr> <?php Modified: branches/danny-web/reactos.org/htdocs/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -118,7 +118,6 @@ // Global Vars: $RSDB_SET_page=""; // Page: Home or DB $RSDB_SET_sec=""; // Browse by: Category, Name, Company, Rank, etc. - $RSDB_SET_view=""; // Compatibility, Packages, Dev Network, Media $RSDB_SET_cat="0"; // Category ID $RSDB_SET_cat2="flat"; // Category Style: Flat or Tree $RSDB_SET_letter=""; // Browse by Name: Letter: All, A, B, C, ..., X, Y, Z @@ -168,7 +167,6 @@ if (array_key_exists("page", $_GET)) $RSDB_SET_page=htmlspecialchars($_GET["page"]); if (array_key_exists("sec", $_GET)) $RSDB_SET_sec=htmlspecialchars($_GET["sec"]); - if (array_key_exists("view", $_GET)) $RSDB_SET_view=htmlspecialchars($_GET["view"]); if (array_key_exists("cat", $_GET)) $RSDB_SET_cat=htmlspecialchars($_GET["cat"]); if (array_key_exists("cat2", $_GET)) $RSDB_SET_cat2=htmlspecialchars($_GET["cat2"]); if (array_key_exists("letter", $_GET)) $RSDB_SET_letter=htmlspecialchars($_GET["letter"]); @@ -249,7 +247,7 @@ require_once("inc/tools/plugins.php"); -// echo "<hr />db: ".$RSDB_SET_page.", view: ".$RSDB_SET_view.", sec: ".$RSDB_SET_sec."<hr />"; +// echo "<hr />db: ".$RSDB_SET_page.", sec: ".$RSDB_SET_sec."<hr />"; switch ($RSDB_SET_page) { case "home": // Frontpage @@ -263,14 +261,7 @@ include("inc/footer.php"); // Body break; case "about": // RSDB About Page - //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - $rpm_page_title="Support Database - About"; - include("inc/header.php"); // Head - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); // Layout-Structure - create_structure($rpm_page); - include("inc/about.php"); // Content - include("inc/footer.php"); // Body + new About(); break; case "conditions": // RSDB Submit Conditions Page $rpm_page_title="Support Database - Submit Conditions"; @@ -284,7 +275,6 @@ default: case "db": // developer interface //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - $RSDB_SET_view = "comp"; $rpm_page_title="Support Database - Compatibility"; $RSDB_intern_section_script = "inc/comp.php"; Copied: branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php (from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/header.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/header.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -2,6 +2,7 @@ /* RSDB - ReactOS Support Database Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> + 2009 Danny Götte <dangerground(a)web.de> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,108 +19,321 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 +/** + * class HTML + * + * @package html */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - - // This page was generated in ... - $roscms_gentime = microtime(); - $roscms_gentime = explode(' ',$roscms_gentime); - $roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; - $roscms_pg_start = $roscms_gentime; - -function create_head($page_title, $logo, $RSDB_langres) +abstract class HTML { - include('rsdb_setting.php'); - + + protected $title; + protected $css_files=array(); + protected $js_files=array(); + + + + /** + * set page title, start generation time counter and get page output + * + * @access public + */ + public function __construct( $page_title = '' ) + { + // get page title and register css files + $this->title = $page_title; + $this->register_css('style.css'); + $this->register_js('smoothscroll.js'); + $this->register_js('search.js'); + + // get output + $this->build(); + } // end of constructor + + + + /** + * output of the whole site + * + * @access private + */ + private function build( ) + { + $this->header(); + $this->navigation(); + $this->body(); + $this->footer(); + } // end of member function build + + + + /** + * includes the page itself without header + footer + * + * @access protected + */ + abstract protected function body( ); + + + + /** + * output site header + * + * @access protected + */ + protected function header( ) + { + global $RSDB_langres; + global $RSDB_intern_path_server; + global $RSDB_intern_path; + global $RSDB_intern_user_id; + + echo ' + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html lang="'.$RSDB_langres['lang_code'].'"> + <head> + <title>ReactOS '.$this->title.'</title> + <base href="'.$RSDB_intern_path_server.$RSDB_intern_path.'" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Pragma" content="no-cache" /> + <meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." /> + <meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" /> + <meta name="Copyright" content="ReactOS Foundation" /> + <meta name="Generator" content="CompatDB" /> + <meta name="Content-language" content="'.$RSDB_langres['lang_code'].'" /> + <meta name="Robots" content="index,follow" /> + <link rel="SHORTCUT ICON" href="../favicon.ico" />'; + + // link css files (use register_css method) + foreach($this->css_files as $file) { + if ($file['condition'] === false) { + echo '<link href="'.$RSDB_intern_path_server.$RSDB_intern_path.'css/'.$file['name'].'" type="text/css" rel="stylesheet" />'; + } + else { + echo ''; + } + } + + // link js files (use register_js method) + foreach($this->js_files as $file) { + echo '<script src="'.$RSDB_intern_path_server.$RSDB_intern_path.'js/'.$file.'" type="text/javascript"></script>'; + } + + echo ' + <script> +  + </script> + </head> + <body> + <div id="top"> + <div id="topMenu"> + <a href="<?php echo $RSDB_intern_path_server; ?>?page=index">'.$RSDB_langres['Home'].'</a> | + <a href="<?php echo $RSDB_intern_path_server; ?>?page=about">'.$RSDB_langres['Info'].'</a> | + <a href="<?php echo $RSDB_intern_path_server; ?>?page=community">'.$RSDB_langres['Community'].'</a> | + <a href="<?php echo $RSDB_intern_path_server; ?>?page=dev">'.$RSDB_langres['Dev'].'</a> | + <a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user">'.$RSDB_langres['myReactOS'].'</a> + </div> + </div>'; + } // end of member function header + + + + /** + * output site navigation + * + * @access protected + */ + protected function navigation( ) + { + include('rsdb_setting.php'); + include('rsdb_config.php'); + + global $RSDB_SET_page; + + global $roscms_intern_account_level; + global $roscms_intern_login_check; + global $roscms_intern_login_check_username; + global $roscms_intern_account_group; + global $roscms_intern_usrgrp_sadmin; + global $roscms_intern_usrgrp_admin; + global $roscms_intern_usrgrp_dev; + global $roscms_intern_usrgrp_team; + global $roscms_intern_usrgrp_trans; + global $roscms_intern_usrgrp_user; + global $RSDB_langres; + + echo ' + <table style="border: none; width:100%;" cellpadding="0" cellspacing="0"> + <tr style="vertical-align:top;"> + <td style="width:147px" id="leftNav"> + <div class="navTitle">'.$RSDB_langres['Navigation'].'</div> + <ol> + <li><a href="'.$RSDB_intern_path_server.'?page=index">'.$RSDB_langres['Home'].'</a></li> + <li><a href="'.$RSDB_intern_path_server.'?page=about">'.$RSDB_langres['Info'].'</a></li> + <li><a href="'.$RSDB_intern_path_server.'?page=community">'.$RSDB_langres['Community'].'</a></li> + <li><a href="'.$RSDB_intern_path_server.'?page=dev">'.$RSDB_langres['Dev'].'</a></li> + <li><a href="'.$RSDB_intern_path_server.'roscms/?page=user">'.$RSDB_langres['myReactOS'].'</a></li> + </ol> + <br /> + + <div class="navTitle">Compatibility</div> + <ol> + <li><a href="'.$RSDB_intern_link_view_EX.'home'.$RSDB_URI_slash.'">Overview</a></li> + <li><a href="'.$RSDB_intern_link_category_EX.'0'.$RSDB_URI_slash.'">Browse Database</a></li>'; + + if ( $RSDB_SET_sec == 'category' || $RSDB_SET_sec == 'name' || $RSDB_SET_sec == 'vendor' || $RSDB_SET_sec == 'rank') { + echo ' + <li><a href="'.$RSDB_intern_link_category_EX.'0'.$RSDB_URI_slash.'"> - By Category</a></li> + <li><a href="'.$RSDB_intern_link_name_letter_EX.'all'.$RSDB_URI_slash.'"> - By Name</a></li> + <li><a href="'.$RSDB_intern_link_vendor_letter_EX.'all'.$RSDB_URI_slash.'"> - By Vendor</a></li> + <li><a href="'.$RSDB_intern_link_rank_EX.'rank'.$RSDB_URI_slash.'"> - By Rank</a></li>'; + } + + echo ' + <li id="noscriptsearchbar" style="display: block"><a href="'.$RSDB_intern_link_view_EX.'search'.$RSDB_URI_slash.'">Search</a></li> + <li><a href="'.$RSDB_intern_link_view_EX.'submit'.$RSDB_URI_slash.'">Submit Application</a></li> + <li><a href="'.$RSDB_intern_link_view_EX.'stats'.$RSDB_URI_slash.'">Database Statistics</a></li> + <li><a href="'.$RSDB_intern_link_view_EX.'help'.$RSDB_URI_slash.'">Help & FAQ</a></li> + </ol> + <br /> + + <div class="navTitle">Search</div> + <ol> + <li> + <div id="ajaxsearchbar" align="center" style="display: none"> + <div align="center"> + <label for="searchbar" accesskey="s"></label> + <input name="searchbar" type="text" id="searchbar" tabindex="0" onkeyup="'."loadItemList(this.value,'bar','comp','ajaxloadbar','sresultbar');".'" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> + </div> + <div id="sresultbar" style="display: none" align="left"></div> + <div style="text-align: center;"> + <img id="ajaxloadbar" src="images/ajax_loading.gif" style="display: none" /> + </div> + </li> + </ol> + <br /> + + <script type="text/javascript"> +  + </script> + + <div class="navTitle">Language</div> + <ol> + <li> + <div align="center">'; + + // get selected language + if (empty($_GET['lang']) && isset($_COOKIE['roscms_usrset_lang'])) { + $lang = $_COOKIE['roscms_usrset_lang']; + if (substr($lang, -1) == '/') { + $lang = substr($lang, -1); + } + } + + // check if language exists, use fallback if needed + $lang = CLanguage::validate($lang); + + // get name of currently used language + $stmt=CDBConnection::getInstance()->prepare("SELECT lang_name FROM rsdb_languages WHERE lang_id = :lang_id"); + $stmt->bindParam('lang_id',$lang,PDO::PARAM_STR); + $stmt->execute(); + $language_name = $stmt->fetchColumn(); + + echo ' + <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.open(this.options[this.selectedIndex].value,'_main');".'"> + <optgroup label="current language"> + <option value="#">'.$language_name.'</option> + </optgroup> + <optgroup label="most popular">'; + $stmt=CDBConnection::getInstance()->prepare("SELECT lang_id, lang_name FROM rsdb_languages WHERE lang_id != :lang_id"); + $stmt->bindParam('lang_id',$lang,PDO::PARAM_STR); + $stmt->execute(); + while ($language=$stmt->fetch(PDO::FETCH_ASSOC)) { + echo ' + <option value="'.$RSDB_intern_link_language.$language['lang_id'].'">'.$language['lang_name'].'</option>'; + } + + echo ' + </optgroup> + </select> + </li> + </ol> + </td> + <td id="content">'; + } // end of member function navigation + + + + /** + * output site footer + * + * @access protected + */ + protected function footer( ) + { + // footer information + echo ' + </td> + </tr> + </table> + + + <hr size="1" /> + <address style="text-align:center"> + <a href="http://www.reactos.org" onmousedown="'."return clk(this.href,'res','');".'">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br /> + Copyright © Klemens Friedl 2005-'.date('Y').', All rights reserved. + </address> + + </body> + </html>'; + } // end of member function footer + + + + /** + * register a css file to be included in the header + * + * @param string name path & filename to a css file + * @param bool|string condition conditional statement (used by IE) to e.g. include sheets only for specific IE versions + * @access protected + */ + protected function register_css( $name, $condition = false ) + { + $this->css_files[] = array('name'=>$name, 'condition'=>$condition); + } // end of member function register_css + + + + /** + * register a javascript file to be included in the header + * + * @param string name path & filename to a javascript file + * @access protected + */ + protected function register_js( $name ) + { + $this->js_files[] = $name; + } // end of member function register_js + + + +} // end of HTML ?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html lang="<?php echo $RSDB_langres['lang_code']; ?>"> -<head> - <title>ReactOS <?php echo $page_title ; ?></title> - <base href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>" /> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $RSDB_langres['charset']; ?>" /> - <meta http-equiv="Pragma" content="no-cache" /> - <meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." /> - <meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" /> - <meta name="Copyright" content="ReactOS Foundation" /> - <meta name="Generator" content="RSDB" /> - <meta name="Content-language" content="<?php echo $RSDB_langres['lang_code']; ?>" /> - <meta name="Robots" content="index,follow" /> - <link rel="SHORTCUT ICON" href="../favicon.ico" /> - <link href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>css/style.css" type="text/css" rel="stylesheet" /> - <script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/smoothscroll.js" language="javascript"></script> - <script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/search.js" language="javascript"></script> - - - <script> -  - </script> -</head> -<body> -<div id="top"> - <div id="topMenu"> -  - <p align="center"> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=index"><?php echo $RSDB_langres['Home']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=about"><?php echo $RSDB_langres['Info']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=community"><?php echo $RSDB_langres['Community']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server; ?>?page=dev"><?php echo $RSDB_langres['Dev']; ?></a> <font color="#ffffff">|</font> - <a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user"><?php echo $RSDB_langres['myReactOS']; ?></a> </p> - </div> -</div> - - -<?php /*<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html><head><title>ReactOS Package Manager - Online</title> - -<link rel="stylesheet" type="text/css" href="reactos.basic.css"> -<META content="ReactOS Package Manager - CMS System" name=GENERATOR> -<META content="Klemens Friedl" name=AUTHOR> -</head> -<body>*/ - - -//require("./inc/inc_account_check.php"); - -?> - - - -<?php -} // End of function create_head -?> Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php ------------------------------------------------------------------------------ svn:mergeinfo = Copied: branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php (from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/about.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/about.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -18,26 +18,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ + +class About extends HTML +{ - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > <?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h1> -<h2><?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h2> -<p><?php echo $RSDB_langres['CONTENT_about_rsdb']; ?></p> -<p><?php echo $RSDB_langres['CONTENT_about_webteam']; ?></p> -<p> </p> -<h3><?php echo $RSDB_langres['TEXT_credits']; ?></h3> -<p><b>Klemens Friedl:</b> <?php echo $RSDB_langres['CONTENT_about_credits_frik85']; ?></p> + protected function body( ) + { + global $RSDB_langres; + + echo ' + <h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > '.$RSDB_langres['TEXT_about_rsdb'].'</h1> + <h2>'.$RSDB_langres['TEXT_about_rsdb'].'</h2> + <p>'.$RSDB_langres['CONTENT_about_rsdb'].'</p> + <p>'.$RSDB_langres['CONTENT_about_webteam'].'</p> + <p> </p> + <h3>'.$RSDB_langres['TEXT_credits'].'</h3> + <p><strong>Klemens Friedl:</strong> '.$RSDB_langres['CONTENT_about_credits_frik85'].'</p>'; + } // end of member function body + + + +} // end of About Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -36,7 +36,6 @@ global $RSDB_SET_page; - global $RSDB_SET_view; global $RSDB_SET_sec; global $RSDB_SET_cat; global $RSDB_SET_cat2; @@ -93,14 +92,14 @@ $RSDB_intern_link_HRU_about = $RSDB_intern_index_HRU."/about/"; $RSDB_intern_link_HRU_conditions = $RSDB_intern_index_HRU."/comp/conditions/"; $RSDB_intern_link_HRU_help = $RSDB_intern_index_HRU."/comp/help/"; - $RSDB_intern_index_HRU_view = $RSDB_intern_index_HRU."/".$RSDB_SET_view; + $RSDB_intern_index_HRU_view = $RSDB_intern_index_HRU."/comp"; $RSDB_intern_link_HRU_view = $RSDB_intern_index_HRU_view."/"; // Browse - general - $RSDB_intern_link_HRU_view_group = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/group/"; - $RSDB_intern_link_HRU_view_item = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/item/"; - $RSDB_intern_link_HRU_view_letter = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/letter/"; - $RSDB_intern_link_HRU_view_cat = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/id/"; + $RSDB_intern_link_HRU_view_group = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/group/"; + $RSDB_intern_link_HRU_view_item = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/item/"; + $RSDB_intern_link_HRU_view_letter = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/letter/"; + $RSDB_intern_link_HRU_view_cat = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/id/"; @@ -157,9 +156,9 @@ $RSDB_intern_link_roscms_page = $RSDB_intern_link_roscms."?page="; // Section - $RSDB_intern_link_db_sec = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec="; - $RSDB_intern_link_db_sec_javascript = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec="; - $RSDB_intern_link_db_sec_javascript2 = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec=".$RSDB_SET_sec; + $RSDB_intern_link_db_sec = $RSDB_intern_index_php."?page=db&sec="; + $RSDB_intern_link_db_sec_javascript = $RSDB_intern_index_php."?page=db&sec="; + $RSDB_intern_link_db_sec_javascript2 = $RSDB_intern_index_php."?page=db&sec=".$RSDB_SET_sec; // View @@ -229,7 +228,7 @@ // Item $RSDB_intern_link_item = $RSDB_intern_link_db_sec.$RSDB_SET_sec."&item="; - $RSDB_intern_link_item_javascript = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec=".$RSDB_SET_sec."&item="; + $RSDB_intern_link_item_javascript = $RSDB_intern_index_php."?page=db&sec=".$RSDB_SET_sec."&item="; $RSDB_intern_link_item_item2 = $RSDB_intern_link_item.$RSDB_SET_item."&item2="; $RSDB_intern_link_item_item2_both = $RSDB_intern_link_item_item2.$RSDB_SET_item2; $RSDB_intern_link_item_item2_both_javascript = $RSDB_intern_link_db_sec_javascript.$RSDB_SET_sec."&item=".$RSDB_SET_item."&item2=".$RSDB_SET_item2; @@ -308,14 +307,14 @@ // Language - $RSDB_intern_link_language = $RSDB_intern_index_php."?page=".$RSDB_SET_page."&sec=".$RSDB_SET_sec."&view=".$RSDB_SET_view."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang="; + $RSDB_intern_link_language = $RSDB_intern_index_php."?page=".$RSDB_SET_page."&sec=".$RSDB_SET_sec."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang="; // Ajax $RSDB_intern_link_ajax = $RSDB_intern_link_language.$RSDB_SET_lang."&ajax="; // Export - //$RSDB_intern_link_export = $RSDB_intern_index_php."?page=data&sec=".$RSDB_SET_sec."&view=".$RSDB_SET_view."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang=".$RSDB_SET_lang."&export="; - $RSDB_intern_link_export = $RSDB_intern_index_php."?page=dat&sec=".$RSDB_SET_sec."&view=".$RSDB_SET_view."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang=".$RSDB_SET_lang."&export="; + //$RSDB_intern_link_export = $RSDB_intern_index_php."?page=data&sec=".$RSDB_SET_sec."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang=".$RSDB_SET_lang."&export="; + $RSDB_intern_link_export = $RSDB_intern_index_php."?page=dat&sec=".$RSDB_SET_sec."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang=".$RSDB_SET_lang."&export="; $RSDB_intern_link_export2 = $RSDB_intern_index_php."?page=dat&export="; Modified: branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php [iso-8859-1] Fri Apr 3 02:33:34 2009 @@ -94,7 +94,6 @@ break; case "comp": // .../comp/cat/id/xx $RSDB_SET_page = "db"; - $RSDB_SET_view = "comp"; switch( $RSDB_HUMAN_URI_tree_2 ) { case "cat": // short case "category": @@ -166,7 +165,6 @@ $RSDB_SET_page = "db"; $RSDB_SET_lang = "en"; - $RSDB_SET_view = "comp"; /*$RSDB_SET_entry = ""; $RSDB_SET_entry = @$RSDB_URI_tree_array[2]; $RSDB_SET_action = "";

15 years, 9 months

[cfinck] 40337: - Improve the comparison speed by several magnitudes: -> Add an index for the "suite_id" column in "winetest_results" to make the JOINs *much* faster -> Don't rely on MySQL caching the result of a query, which is ran several times. Just run the query once instead and pass the result all the time. - Change the legend to a full CSS layout - Show 0 failures with a green color, otherwise keep the red background color for that cell (idea by Christoph) - Change the color for difference

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 3 02:05:36 2009 New Revision: 40337 URL: http://svn.reactos.org/svn/reactos?rev=40337&view=rev Log: - Improve the comparison speed by several magnitudes: -> Add an index for the "suite_id" column in "winetest_results" to make the JOINs *much* faster -> Don't rely on MySQL caching the result of a query, which is ran several times. Just run the query once instead and pass the result all the time. - Change the legend to a full CSS layout - Show 0 failures with a green color, otherwise keep the red background color for that cell (idea by Christoph) - Change the color for differences to a neutral grey tone - Little code cleanup Modified: branches/danny-web/reactos.org/htdocs/testman/compare.php branches/danny-web/reactos.org/htdocs/testman/css/compare.css branches/danny-web/reactos.org/resources/testman/testman.sql Modified: branches/danny-web/reactos.org/htdocs/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] Fri Apr 3 02:05:36 2009 @@ -79,8 +79,8 @@ die("<i>ids</i> parameter is no array"); // Verify that the array only contains numeric values to prevent SQL injections - foreach($id_array as $id) - if(!is_numeric($id)) + for($i = 0; $i < count($id_array); $i++) + if(!is_numeric($id_array[$i])) die("<i>ids</i> parameter is not entirely numeric!"); if(count($id_array) > MAX_COMPARE_RESULTS) @@ -94,26 +94,25 @@ } ?> -<table id="legend" cellspacing="5"> - <tr> - <td id="intro"><?php echo $testman_langres["legend"]; ?>:</td> - - <td class="box totaltests"></td> - <td><?php echo $testman_langres["totaltests"]; ?></td> - - <td class="box failedtests"></td> - <td><?php echo $testman_langres["failedtests"]; ?></td> - - <td class="box todotests"></td> - <td><?php echo $testman_langres["todotests"]; ?></td> - - <td class="box skippedtests"></td> - <td><?php echo $testman_langres["skippedtests"]; ?></td> - - <td class="box" style="background: green;"></td> - <td><?php echo $testman_langres["difference"]; ?></td> - </tr> -</table> +<div id="legend"> + <div id="intro"><?php echo $testman_langres["legend"]; ?>:</div> + + <div class="box totaltests"></div> + <div class="desc"><?php echo $testman_langres["totaltests"]; ?></div> + + <div class="zero_failedtests" style="border: solid 1px black; border-right: none; margin: 0; width: 8px;"></div> + <div class="real_failedtests" style="border: solid 1px black; border-left: none; width: 7px;"></div> + <div class="desc"><?php echo $testman_langres["failedtests"]; ?></div> + + <div class="box todotests"></div> + <div class="desc"><?php echo $testman_langres["todotests"]; ?></div> + + <div class="box skippedtests"></div> + <div class="desc"><?php echo $testman_langres["skippedtests"]; ?></div> + + <div class="box diff_legend"></div> + <div class="desc"><?php echo $testman_langres["difference"]; ?></div> +</div> <?php // Establish a DB connection @@ -127,37 +126,30 @@ die("Could not establish the DB connection"); } - // Get all test suites for which we have at least one result in our ID list - $suites_stmt = $dbh->query( - "SELECT DISTINCT s.id, s.module, s.test " . + // Get all Suite IDs linked to our Test IDs + $stmt = $dbh->query( + "SELECT s.id " . "FROM " . DB_TESTMAN . ".winetest_suites s " . "JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id " . - "WHERE test_id IN (" . $_GET["ids"] . ") " . - "ORDER BY s.module ASC, s.test ASC" + "WHERE e.test_id IN (" . $_GET["ids"] . ")" ) or die("Query failed #1"); + $suite_ids = $stmt->fetchAll(PDO::FETCH_COLUMN); + $suite_idlist = implode(",", $suite_ids); // Get the test results for each column $result_stmt = array(); - $i = 0; - - foreach($id_array as $id) + + for($i = 0; $i < count($id_array); $i++) { $result_stmt[$i] = $dbh->prepare( "SELECT e.id, e.count, e.todo, e.failures, e.skipped " . "FROM " . DB_TESTMAN . ".winetest_suites s " . "LEFT JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id AND e.test_id = :testid " . - "WHERE s.id IN (" . - "SELECT s.id " . - "FROM " . DB_TESTMAN . ".winetest_suites s " . - "JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id " . - "WHERE e.test_id IN (" . $_GET["ids"] . ") " . - ") " . + "WHERE s.id IN (" . $suite_idlist . ")" . "ORDER BY s.module, s.test" ); - $result_stmt[$i]->bindParam(":testid", $id); - $result_stmt[$i]->execute() or die("Query failed #2 for statement $i" . print_r($result_stmt[$i]->errorInfo(), true)); - - $i++; + $result_stmt[$i]->bindParam(":testid", $id_array[$i]); + $result_stmt[$i]->execute() or die("Query failed #2 for statement $i"); } echo '<table id="comparetable" class="datatable" cellspacing="0" cellpadding="0">'; @@ -171,9 +163,9 @@ "WHERE r.id = :id" ); - foreach($id_array as $id) - { - $stmt->bindParam(":id", $id); + for($i = 0; $i < count($id_array); $i++) + { + $stmt->bindParam(":id", $id_array[$i]); $stmt->execute() or die("Query failed #3"); $row = $stmt->fetch(PDO::FETCH_ASSOC); @@ -188,7 +180,16 @@ $oddeven = false; $unchanged = array(); - while($suites_row = $suites_stmt->fetch(PDO::FETCH_ASSOC)) + // Get all test suites for which we have at least one result in our ID list + $stmt = $dbh->query( + "SELECT DISTINCT s.id, s.module, s.test " . + "FROM " . DB_TESTMAN . ".winetest_suites s " . + "JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id " . + "WHERE test_id IN (" . $_GET["ids"] . ") " . + "ORDER BY s.module ASC, s.test ASC" + ) or die("Query failed #3"); + + while($suites_row = $stmt->fetch(PDO::FETCH_ASSOC)) { printf('<tr id="suite_%s" class="%s">', $suites_row["id"], ($oddeven ? "odd" : "even")); printf('<td onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)">%s:%s</td>', $suites_row["module"], $suites_row["test"]); @@ -223,7 +224,7 @@ echo '<tr>'; printf('<td colspan="3" title="%s" class="totaltests">%s <span class="diff">%s</span></td>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); echo '</tr><tr>'; - printf('<td title="%s" class="failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], ($result_row["failures"] > 0 ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); printf('<td title="%s" class="todotests">%d <span class="diff">%s</span></td>', $testman_langres["todotests"], $result_row["todo"], GetDifference($result_row, $prev_result_row, "todo")); printf('<td title="%s" class="skippedtests">%d <span class="diff">%s</span></td>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); echo '</tr></table>'; @@ -254,13 +255,8 @@ echo "//<![CDATA[\n"; echo "var UnchangedRows = Array("; - for($i = 0; $i < count($unchanged); $i++) - { - if($i) - echo "," . $unchanged[$i]; - else - echo $unchanged[$i]; - } + // Cut the last comma from the string + echo implode(",", $unchanged); echo ");\n"; echo "//]]>\n"; Modified: branches/danny-web/reactos.org/htdocs/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/css/compare.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/css/compare.css [iso-8859-1] Fri Apr 3 02:05:36 2009 @@ -7,7 +7,16 @@ #legend { border: solid 1px black; + display: inline-block; + height: 16px; margin-bottom: 1em; + padding: 5px; +} + +#legend div { + float: left; + height: 15px; + margin-right: 5px; } #legend #intro { @@ -15,21 +24,24 @@ padding-right: 10px; } -#legend td { - padding-right: 5px; +#legend .box { + border: solid 1px black; + width: 15px; } -#legend td.box { - border: solid 1px black; - padding: 0; - width: 15px; +#legend .desc { + margin-right: 9px; } .totaltests { background-color: #FFFFCC !important; } -.failedtests { +.zero_failedtests { + background-color: #33FF66 !important; +} + +.real_failedtests { background-color: #FF6666 !important; } @@ -41,14 +53,22 @@ background-color: #CCCCCC !important; } +.diff_legend { + background-color: #5A5A5A !important; +} + .diff { - color: green; + color: #5A5A5A; } #TempBlock { background: #5984C3; color: white; font-weight: bold; +} + +#comparetable { + clear: left; } #comparetable th, #TempBlock { Modified: branches/danny-web/reactos.org/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/resources… ============================================================================== --- branches/danny-web/reactos.org/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/resources/testman/testman.sql [iso-8859-1] Fri Apr 3 02:05:36 2009 @@ -14,7 +14,8 @@ `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `suite_id` (`suite_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; CREATE TABLE `winetest_runs` (

15 years, 9 months

[dgoette] 40336: collect functions in classes, and rename them

by dgoette＠svn.reactos.org

15 years, 9 months

[cfinck] 40335: Add a reasonable memory limit for a test result log, so the script doesn't exceed PHP's memory limit in case of bloated logs Uses memory_get_usage(), so the script needs PHP >= 5.2

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Apr 2 23:15:06 2009 New Revision: 40335 URL: http://svn.reactos.org/svn/reactos?rev=40335&view=rev Log: Add a reasonable memory limit for a test result log, so the script doesn't exceed PHP's memory limit in case of bloated logs Uses memory_get_usage(), so the script needs PHP >= 5.2 Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… [iso-8859-1] Thu Apr 2 23:15:06 2009 @@ -93,6 +93,14 @@ break; $log .= $line; + + // We can easily exceed PHP's memory limit here in case we're reading a bloated log + // Stop in this case + if(memory_get_usage() > MAX_MEMORY) + { + $log .= "[TESTMAN] Maximum memory for log exceeded, aborting!"; + break; + } } while(strpos($line, " tests executed (") === false && substr($line, 0, 9) != "[SYSREG] " && !feof($fp)); Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php [iso-8859-1] Thu Apr 2 23:15:06 2009 @@ -7,4 +7,11 @@ */ define("TESTMAN_PATH", "../"); + + // Ensure we don't get bloated logs or even exceed PHP's memory limit + // by defining a maximum amount of memory, which may be allocated by the + // aggregator script + // NOTE: The aggregator script allocates memory per test result, so this + // has no effect on the total log size + define("MAX_MEMORY", 500000); ?>

15 years, 9 months

[fireball] 40334: - Rework NtGdiStretchBlt into GreStretchBltMask function, which provides stretch blitting with mask support. - Add NtGdiStretchBlt as a simple forwarder to the internal GreStretchBltMask helper. - Based on a patch by Evgeniy Boltik. - Some optimisation issues could still be solved as Timo suggested. See issue #4294 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 2 23:00:09 2009 New Revision: 40334 URL: http://svn.reactos.org/svn/reactos?rev=40334&view=rev Log: - Rework NtGdiStretchBlt into GreStretchBltMask function, which provides stretch blitting with mask support. - Add NtGdiStretchBlt as a simple forwarder to the internal GreStretchBltMask helper. - Based on a patch by Evgeniy Boltik. - Some optimisation issues could still be solved as Timo suggested. See issue #4294 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -224,7 +224,7 @@ } BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - SURFOBJ *PatternSurface, + SURFOBJ *PatternSurface, SURFOBJ *MaskSurf, RECTL* DestRect, RECTL *SourceRect, POINTL* MaskOrigin, BRUSHOBJ* Brush, POINTL* BrushOrign, Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -41,7 +41,7 @@ typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); -typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -67,7 +67,7 @@ VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG); VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); -BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -132,7 +132,7 @@ BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFOBJ *MaskSurf, SURFOBJ *PatternSurface, RECTL *DestRect, RECTL *SourceRect, POINTL *MaskOrigin, BRUSHOBJ *Brush, @@ -48,6 +48,7 @@ PFN_DIB_GetPixel fnDest_GetPixel = NULL; PFN_DIB_PutPixel fnDest_PutPixel = NULL; PFN_DIB_GetPixel fnPattern_GetPixel = NULL; + PFN_DIB_GetPixel fnMask_GetPixel = NULL; ULONG PatternX = 0, PatternY = 0; @@ -65,6 +66,11 @@ fnSource_GetPixel = DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat].DIB_GetPixel; DPRINT("Source BPP: %u, srcRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); + } + + if (MaskSurf) + { + fnMask_GetPixel = DibFunctionsForBitmapFormat[MaskSurf->iBitmapFormat].DIB_GetPixel; } DstHeight = DestRect->bottom - DestRect->top; @@ -120,7 +126,19 @@ for (DesX = DestRect->left; DesX < DestRect->right; DesX++) { CanDraw = TRUE; - if (UsesSource) + + if (fnMask_GetPixel) + { + sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; + if (sx < 0 || sy < 0 || + MaskSurf->sizlBitmap.cx < sx || MaskSurf->sizlBitmap.cy < sy || + fnMask_GetPixel(MaskSurf, sx, sy) != 0) + { + CanDraw = FALSE; + } + } + + if (UsesSource && CanDraw) { sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; if (sx >= 0 && sy >= 0 && Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -808,7 +808,7 @@ } return DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( - psoDest, psoSource, PatternSurface, + psoDest, psoSource, Mask, PatternSurface, OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, ColorTranslation, XlatePatternToDest, Rop4); @@ -1021,21 +1021,7 @@ AdjustedBrushOrigin = Translate; } - if (Mask != NULL) - { - //BltRectFunc = BltMask; - DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - else - { - BltRectFunc = CallDibStretchBlt; - } + BltRectFunc = CallDibStretchBlt; DstHeight = OutputRect.bottom - OutputRect.top; DstWidth = OutputRect.right - OutputRect.left; Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -253,5 +253,20 @@ UINT APIENTRY IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors); +BOOL APIENTRY +GreStretchBltMask(IN HDC hdcDst, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN DWORD dwRop, + IN DWORD dwBackColor, + IN HDC hdcMask); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -720,7 +720,7 @@ } BOOL APIENTRY -NtGdiStretchBlt( +GreStretchBltMask( HDC hDCDest, INT XOriginDest, INT YOriginDest, @@ -732,12 +732,15 @@ INT WidthSrc, INT HeightSrc, DWORD ROP, - IN DWORD dwBackColor) + IN DWORD dwBackColor, + HDC hDCMask) { PDC DCDest; PDC DCSrc = NULL; + PDC DCMask = NULL; PDC_ATTR pdcattr; SURFACE *BitmapDest, *BitmapSrc = NULL; + SURFACE *BitmapMask = NULL; RECTL DestRect; RECTL SourceRect; BOOL Status = FALSE; @@ -853,6 +856,23 @@ BrushOrigin.x += DCDest->ptlDCOrig.x; BrushOrigin.y += DCDest->ptlDCOrig.y; + /* Make mask surface for source surface */ + if (BitmapSrc && hDCMask) + { + DCMask = DC_LockDc(hDCMask); + if (DCMask) + { + BitmapMask = SURFACE_LockSurface(DCMask->rosdc.hBitmap); + if (BitmapMask && + (BitmapMask->SurfObj.sizlBitmap.cx != WidthSrc || + BitmapMask->SurfObj.sizlBitmap.cy != HeightSrc)) + { + DPRINT1("Mask and bitmap sizes don't match!\n"); + goto failed; + } + } + } + /* Perform the bitblt operation */ Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, @@ -879,14 +899,55 @@ { SURFACE_UnlockSurface(BitmapDest); } + if (BitmapMask) + { + SURFACE_UnlockSurface(BitmapMask); + } if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); + } + if (DCMask) + { + DC_UnlockDc(DCMask); } DC_UnlockDc(DCDest); return Status; } + + +BOOL APIENTRY +NtGdiStretchBlt( + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP, + IN DWORD dwBackColor) +{ + return GreStretchBltMask( + hDCDest, + XOriginDest, + YOriginDest, + WidthDest, + HeightDest, + hDCSrc, + XOriginSrc, + YOriginSrc, + WidthSrc, + HeightSrc, + ROP, + dwBackColor, + NULL); +} + BOOL FASTCALL IntPatBlt(

15 years, 9 months

[jimtabor] 40333: - Migration changes from PPROCESSINFO and PTHREADINFO to use ClientInfo from TEB. I moved kpi to ci->ppi, we still depend on it as a reference pointer. - Added and changed structure types. - Tested with old AbiWord, FireFox and explorer. - Comment out TestWindowProcess until the rest is ready.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Apr 2 22:52:34 2009 New Revision: 40333 URL: http://svn.reactos.org/svn/reactos?rev=40333&view=rev Log: - Migration changes from PPROCESSINFO and PTHREADINFO to use ClientInfo from TEB. I moved kpi to ci->ppi, we still depend on it as a reference pointer. - Added and changed structure types. - Tested with old AbiWord, FireFox and explorer. - Comment out TestWindowProcess until the rest is ready. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -93,7 +93,7 @@ static __inline BOOL IsThreadHooked(PW32THREADINFO ti) { - return ti->Hooks != 0; + return ti->fsHooks != 0; } static __inline PDESKTOPINFO @@ -104,7 +104,7 @@ ti = GetW32ThreadInfo(); if (ti != NULL) - di = DesktopPtrToUser(ti->Desktop); + di = DesktopPtrToUser(ti->pDeskInfo); return di; } Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -431,7 +431,7 @@ ValidateCallProc(HANDLE hCallProc) { PCALLPROC CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); - if (CallProc != NULL ) //&& CallProc->pi == g_kpi) + if (CallProc != NULL && CallProc->pi == GetWin32ClientInfo()->ppi) return CallProc; return NULL; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -1126,7 +1126,8 @@ _SEH2_TRY { - if (TestWindowProcess( Wnd))// if (Wnd->pi != g_kpi) +// if (TestWindowProcess( Wnd)) + if (Wnd->pi != GetWin32ClientInfo()->ppi) { if (nMaxCount > 0) { @@ -1216,7 +1217,8 @@ _SEH2_TRY { - if (TestWindowProcess( Wnd)) //if (Wnd->pi != g_kpi) +// if (TestWindowProcess( Wnd)) + if (Wnd->pi != GetWin32ClientInfo()->ppi) { if (nMaxCount > 0) { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -364,13 +364,12 @@ typedef struct _W32THREADINFO { - PPROCESSINFO pi; /* [USER] */ - PPROCESSINFO kpi; /* [KERNEL] */ - PDESKTOPINFO Desktop; + PPROCESSINFO ppi; /* [KERNEL] */ + PDESKTOPINFO pDeskInfo; // PVOID DesktopHeapBase; // ULONG_PTR DesktopHeapLimit; /* A mask of what hooks are currently active */ - ULONG Hooks; + ULONG fsHooks; CLIENTTHREADINFO ClientThreadInfo; } W32THREADINFO, *PW32THREADINFO; @@ -424,7 +423,9 @@ USHORT CodePage; USHORT achDbcsCF; MSG msgDbcsCB; - ULONG Win32ClientInfo3[29]; + ULONG Win32ClientInfo3[28]; +/* It's just a pointer reference not to be used w the structure in user space. */ + PPROCESSINFO ppi; } CLIENTINFO, *PCLIENTINFO; /* Make sure it fits exactly into the TEB */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -1142,13 +1142,13 @@ pti = PsGetCurrentThreadWin32Thread(); ti = GetW32ThreadInfo(); - if (ti == NULL || !ti->kpi->RegisteredSysClasses) + if (ti == NULL || !ti->ppi->RegisteredSysClasses) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return (RTL_ATOM)0; } - pi = ti->kpi; + pi = ti->ppi; /* try to find a previously registered class */ ClassAtom = IntGetClassAtom(ClassName, @@ -2149,7 +2149,7 @@ Window = UserGetWindowObject(hWnd); if (Window != NULL) { - if (Window->ti->kpi != pi) + if (Window->ti->ppi != pi) { SetLastWin32Error(ERROR_ACCESS_DENIED); goto Cleanup; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -1748,9 +1748,9 @@ ti = GetW32ThreadInfo(); if (ti != NULL) { - if (ti->Desktop == DesktopObject->DesktopInfo) + if (ti->pDeskInfo == DesktopObject->DesktopInfo) { - ti->Desktop = NULL; + ti->pDeskInfo = NULL; } GetWin32ClientInfo()->pDeskInfo = NULL; } @@ -1830,11 +1830,11 @@ GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); if (ti != NULL) { - if (ti->Desktop == NULL) + if (ti->pDeskInfo == NULL) { - ti->Desktop = DesktopObject->DesktopInfo; + ti->pDeskInfo = DesktopObject->DesktopInfo; GetWin32ClientInfo()->pDeskInfo = - (PVOID)((ULONG_PTR)ti->Desktop - GetWin32ClientInfo()->ulClientDelta); + (PVOID)((ULONG_PTR)ti->pDeskInfo - GetWin32ClientInfo()->ulClientDelta); } } @@ -1882,7 +1882,7 @@ PW32THREADINFO ti = GetW32ThreadInfo(); if (ti != NULL) { - ti->Desktop = NULL; + ti->pDeskInfo = NULL; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -113,7 +113,7 @@ GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -227,7 +227,7 @@ GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -306,7 +306,7 @@ if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->ThreadInfo) SameThread = TRUE; - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || + if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) { CWPSTRUCT CWP; @@ -328,7 +328,7 @@ if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->ThreadInfo) SameThread = TRUE; - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || + if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) { CWPRETSTRUCT CWPR; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -91,9 +91,9 @@ /* FIXME should use UserEnterShared */ RETURN( (DWORD)IntGetCapture()); case THREADSTATE_PROGMANWINDOW: - RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hProgmanWindow); + RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow); case THREADSTATE_TASKMANWINDOW: - RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hTaskManWindow); + RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow); case THREADSTATE_ACTIVEWINDOW: RETURN ( (DWORD)UserGetActiveWindow()); } @@ -501,17 +501,16 @@ sizeof(W32THREADINFO)); /* initialize it */ - ti->kpi = GetW32ProcessInfo(); - ti->pi = UserHeapAddressToUser(ti->kpi); - ti->Hooks = W32Thread->Hooks; + ti->ppi = GetW32ProcessInfo(); + ti->fsHooks = W32Thread->Hooks; W32Thread->pcti = &ti->ClientThreadInfo; if (W32Thread->Desktop != NULL) { - ti->Desktop = W32Thread->Desktop->DesktopInfo; + ti->pDeskInfo = W32Thread->Desktop->DesktopInfo; } else { - ti->Desktop = NULL; + ti->pDeskInfo = NULL; } W32Thread->ThreadInfo = ti; @@ -527,6 +526,7 @@ // FIXME PLEASE! it's a ref pointer and not user data! Use ClientThreadInfo! Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! + ci->ppi = ti->ppi; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -79,7 +79,7 @@ if (Window && Window->ti) { - if (Window->ti->Hooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) + if (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) { co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); } @@ -547,7 +547,7 @@ if (DesktopWindow) { UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? - Desk = DesktopWindow->ti->Desktop; + Desk = DesktopWindow->ti->pDeskInfo; } /* Process messages in the message queue itself. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -376,7 +376,7 @@ RETURN(FALSE); } - if (InterlockedCompareExchangePointer(&ti->kpi->hModUser, + if (InterlockedCompareExchangePointer(&ti->ppi->hModUser, (HINSTANCE)Param, NULL) == NULL) { @@ -814,11 +814,11 @@ switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - GetW32ThreadInfo()->Desktop->hProgmanWindow = hWnd; + GetW32ThreadInfo()->pDeskInfo->hProgmanWindow = hWnd; break; case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - GetW32ThreadInfo()->Desktop->hTaskManWindow = hWnd; + GetW32ThreadInfo()->pDeskInfo->hTaskManWindow = hWnd; break; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -162,7 +162,7 @@ { if ( (lParam == (LPARAM)pTmr->pfn) && (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && - (pTmr->pti->ThreadInfo->kpi == pti->ThreadInfo->kpi) ) + (pTmr->pti->ThreadInfo->ppi == pti->ThreadInfo->ppi) ) break; pTmr = (PTIMER)pTmr->ptmrList.Flink; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -499,8 +499,8 @@ /* dereference the class */ IntDereferenceClass(Wnd->Class, - Window->ti->Desktop, - Window->ti->kpi); + Window->ti->pDeskInfo, + Window->ti->ppi); Wnd->Class = NULL; if(Window->WindowRegion) @@ -581,10 +581,10 @@ Wnd->Unicode); if (NewCallProc == NULL) { - NewCallProc = CreateCallProc(Wnd->ti->Desktop, + NewCallProc = CreateCallProc(Wnd->ti->pDeskInfo, Wnd->WndProc, Wnd->Unicode, - Wnd->ti->kpi); + Wnd->ti->ppi); if (NewCallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -1630,7 +1630,7 @@ ClassAtom = IntGetClassAtom(ClassName, hInstance, - ti->kpi, + ti->ppi, &Class, &ClassLink); @@ -1679,7 +1679,7 @@ Wnd = Window->Wnd; Wnd->ti = ti; - Wnd->pi = ti->kpi; + Wnd->pi = ti->ppi; Wnd->pdesktop = pti->Desktop; Wnd->hWndLastActive = hWnd; } @@ -2245,8 +2245,8 @@ if (ClassAtom == 0XC007) { PCALLPROC CallProc; - //CallProc = CreateCallProc(NULL, Wnd->WndProc, bUnicodeWindow, Wnd->ti->kpi); - CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode , Wnd->ti->kpi); + //CallProc = CreateCallProc(NULL, Wnd->WndProc, bUnicodeWindow, Wnd->ti->ppi); + CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode , Wnd->ti->ppi); if (!CallProc) { @@ -2279,8 +2279,8 @@ if (Class != NULL) { IntDereferenceClass(Class, - ti->Desktop, - ti->kpi); + ti->pDeskInfo, + ti->ppi); } } END_CLEANUP; @@ -3339,7 +3339,7 @@ WinStaObject->ShellListView = hwndListView; ti = GetW32ThreadInfo(); - if (ti->Desktop) ti->Desktop->hShellWindow = hwndShell; + if (ti->pDeskInfo) ti->pDeskInfo->hShellWindow = hwndShell; UserDerefObjectCo(WndShell); @@ -3707,7 +3707,7 @@ CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode, - Wnd->ti->kpi); + Wnd->ti->ppi); if (CallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);

15 years, 9 months

[fireball] 40332: - Apply a fix by Timo Kreuzer for the bug spotted by Evgeniy Boltik. 4 failures less in "gdi32_winetest.exe bitmap" now. See issue #4326 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 2 21:43:24 2009 New Revision: 40332 URL: http://svn.reactos.org/svn/reactos?rev=40332&view=rev Log: - Apply a fix by Timo Kreuzer for the bug spotted by Evgeniy Boltik. 4 failures less in "gdi32_winetest.exe bitmap" now. See issue #4326 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Thu Apr 2 21:43:24 2009 @@ -62,8 +62,11 @@ static void DIB_1BPP_BitBltSrcCopy_From1BPP ( - SURFOBJ* DestSurf, SURFOBJ* SourceSurf, - PRECTL DestRect, POINTL *SourcePoint ) + SURFOBJ* DestSurf, + SURFOBJ* SourceSurf, + XLATEOBJ* pxlo, + PRECTL DestRect, + POINTL *SourcePoint ) { // the 'window' in this sense is the x-position that corresponds // to the left-edge of the 8-pixel byte we are currently working with. @@ -88,9 +91,9 @@ int dy2; // dest y end int sy1; // src y start - int dx; + int dx; int shift; - BYTE srcmask, dstmask; + BYTE srcmask, dstmask, xormask; // 'd' and 's' are the dest & src buffer pointers that I use on my x-sweep // 'pd' and 'ps' are the dest & src buffer pointers used on the inner y-sweep @@ -98,6 +101,8 @@ PBYTE s, ps; // src ptrs shift = (dl-sl)&7; + + xormask = 0xFF * XLATEOBJ_iXlate(pxlo, 0); if ( DestRect->top <= SourcePoint->y ) { @@ -164,7 +169,7 @@ { for ( ;; ) { - *pd = (BYTE)((*pd & dstmask) | (*ps & srcmask)); + *pd = (BYTE)((*pd & dstmask) | ((ps[0]^xormask) & srcmask)); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -179,7 +184,7 @@ for ( ;; ) { *pd = (BYTE)((*pd & dstmask) - | ( ( ps[1] >> shift ) & srcmask )); + | ( ( (ps[1]^xormask) >> shift ) & srcmask )); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -194,7 +199,7 @@ for ( ;; ) { *pd = (*pd & dstmask) - | ( ( ps[0] << ( 8 - shift ) ) & srcmask ); + | ( ( (ps[0]^xormask) << ( 8 - shift ) ) & srcmask ); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -209,7 +214,7 @@ for ( ;; ) { *pd = (*pd & dstmask) - | ( ( ( (ps[1])|(ps[0]<<8) ) >> shift ) & srcmask ); + | ( ( ( ((ps[1]^xormask))|((ps[0]^xormask)<<8) ) >> shift ) & srcmask ); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -239,7 +244,7 @@ switch ( BltInfo->SourceSurface->iBitmapFormat ) { case BMF_1BPP: - DIB_1BPP_BitBltSrcCopy_From1BPP ( BltInfo->DestSurface, BltInfo->SourceSurface, &BltInfo->DestRect, &BltInfo->SourcePoint ); + DIB_1BPP_BitBltSrcCopy_From1BPP ( BltInfo->DestSurface, BltInfo->SourceSurface, BltInfo->XlateSourceToDest, &BltInfo->DestRect, &BltInfo->SourcePoint ); break; case BMF_4BPP:

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009