ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
March 2009
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
28 participants
483 discussions
Start a n
N
ew thread
[fireball] 40256: - My OLPC-tree debugging hack/patch.
by fireball@svn.reactos.org
Author: fireball Date: Thu Mar 26 20:55:47 2009 New Revision: 40256 URL:
http://svn.reactos.org/svn/reactos?rev=40256&view=rev
Log: - My OLPC-tree debugging hack/patch. Added: branches/olpc/olpc_26mar09.diff Added: branches/olpc/olpc_26mar09.diff URL:
http://svn.reactos.org/svn/reactos/branches/olpc/olpc_26mar09.diff?rev=4025…
============================================================================== --- branches/olpc/olpc_26mar09.diff (added) +++ branches/olpc/olpc_26mar09.diff [iso-8859-1] Thu Mar 26 20:55:47 2009 @@ -1,0 +1,134 @@ +Index: boot/freeldr/freeldr/arch/i386/loader.c +=================================================================== +--- boot/freeldr/freeldr/arch/i386/loader.c (revision 27633) ++++ boot/freeldr/freeldr/arch/i386/loader.c (working copy) +@@ -85,7 +85,7 @@ + FrLdrStartup(ULONG Magic) + { + /* Goodbye OFW */ +- OFInterpret0("usb-quiet"); ++ //OFInterpret0("usb-quiet"); + + /* Disable Interrupts */ + _disable(); +Index: boot/freeldr/freeldr/arch/i386/macholpc.c +=================================================================== +--- boot/freeldr/freeldr/arch/i386/macholpc.c (revision 27284) ++++ boot/freeldr/freeldr/arch/i386/macholpc.c (working copy) +@@ -230,9 +230,9 @@ + //char * gethomedir(); + //char *homedir = gethomedir(); + ++ ofwprintf("OlpcDiskReadLogicalSectors() SN %x %x, SC %x\n", (ULONG)(SectorNumber >> 25), ++ (ULONG)((SectorNumber * 512) & 0xffffffff), SectorCount); + +- //ofwprintf("OlpcDiskReadLogicalSectors() SN %x, SC %x\n", SectorNumber, SectorCount); //FIXME: incorrect due to SN being ULONGLONG +- + if( part_handle == -1 ) + { + part_handle = OFOpen(BootPart); +@@ -244,7 +244,7 @@ + } + } + +- //ofwprintf("Got partition handle %x\n", part_handle); ++ ofwprintf("Got partition handle %x\n", part_handle); + + if( part_handle == -1 ) + { +Index: drivers/base/bootvid/vid_fb.c +=================================================================== +--- drivers/base/bootvid/vid_fb.c (revision 27277) ++++ drivers/base/bootvid/vid_fb.c (working copy) +@@ -101,7 +101,8 @@ + if (!Transparent) + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : BackTextColor); + else +- Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : Pixel[Col]); // transparent background ++ /* FIXME: A hack here preventing transparent chars */ ++ Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : BackTextColor/*Pixel[Col]*/); // transparent background + + Mask = Mask >> 1; + } +@@ -182,7 +183,8 @@ + + if (!VidpInitialized) + { +- PhysicalAddress.QuadPart = 0xFD000000; ++ PhysicalAddress.QuadPart = 0xFD000000; // OLPC ++ //PhysicalAddress.QuadPart = 0xF0000000; // VMWare + VidpMemory = MmMapIoSpace(PhysicalAddress, 0x200000, MmNonCached); + if (VidpMemory == NULL) + return FALSE; +@@ -269,7 +271,7 @@ + VidFbDisplayString( + IN PCSTR String) + { +- ULONG TopDelta = CHAR_HEIGHT-2; ++ ULONG TopDelta = CHAR_HEIGHT;//-2; + + /* Start looping the string */ + while (*String) +Index: ntoskrnl/io/iomgr/iomgr.c +=================================================================== +--- ntoskrnl/io/iomgr/iomgr.c (revision 27165) ++++ ntoskrnl/io/iomgr/iomgr.c (working copy) +@@ -400,6 +400,7 @@ + FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { ++ while (TRUE) { NtYieldExecution(); }; // HACK to watch olpc boot process + /* Fail */ + KeBugCheckEx(INACCESSIBLE_BOOT_DEVICE, + (ULONG_PTR)&DeviceName, +Index: ntoskrnl/ke/i386/ctxswitch.S +=================================================================== +--- ntoskrnl/ke/i386/ctxswitch.S (revision 26941) ++++ ntoskrnl/ke/i386/ctxswitch.S (working copy) +@@ -175,14 +175,14 @@ + /* Save the NPX State */ + mov ecx, [eax+KTHREAD_INITIAL_STACK] + sub ecx, NPX_FRAME_LENGTH +- fxsave [ecx] ++ fsave [ecx] + mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + + DontSave: + /* Load the NPX State */ + mov ecx, [esi+KTHREAD_INITIAL_STACK] + sub ecx, NPX_FRAME_LENGTH +- fxrstor [ecx] ++ frstor [ecx] + + /* Get the CR0 state and destination */ + mov edx, [ecx+FN_CR0_NPX_STATE] +@@ -213,7 +213,7 @@ + jz DoneLoad + + /* Save the FX State */ +- fxsave [ecx] ++ fsave [ecx] + + /* Check if we also have to save it in the parameter */ + mov ecx, [esp+20] +Index: ntoskrnl/mm/freelist.c +=================================================================== +--- ntoskrnl/mm/freelist.c (revision 26941) ++++ ntoskrnl/mm/freelist.c (working copy) +@@ -473,6 +473,16 @@ + &MmPageArray[j].ListEntry); + MmStats.NrReservedPages++; + } ++ else if (j >= 0x7000000 / PAGE_SIZE) ++ { ++ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_BIOS; ++ MmPageArray[j].Flags.Zero = 0; ++ MmPageArray[j].Flags.Consumer = MC_NPPOOL; ++ MmPageArray[j].ReferenceCount = 1; ++ InsertTailList(&BiosPageListHead, ++ &MmPageArray[j].ListEntry); ++ MmStats.NrReservedPages++; ++ } + else if (j >= (ULONG)FirstPhysKernelAddress/PAGE_SIZE && + j < (ULONG)LastPhysKernelAddress/PAGE_SIZE) + {
15 years, 9 months
1
0
0
0
[tkreuzer] 40255: comment out audio drivers for now
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Mar 26 15:24:46 2009 New Revision: 40255 URL:
http://svn.reactos.org/svn/reactos?rev=40255&view=rev
Log: comment out audio drivers for now Modified: branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild [iso-8859-1] Thu Mar 26 15:24:46 2009 @@ -13,7 +13,7 @@ <directory name="chew"> <xi:include href="chew/chew.rbuild" /> </directory> - <directory name="sound"> + <!-- directory name="sound"> <xi:include href="sound/sound.rbuild" /> - </directory> + </directory --> </group>
15 years, 9 months
1
0
0
0
[dgoette] 40254: start to convert database calls to PDO, also removing dependency from roscms function cookie_domain()
by dgoette@svn.reactos.org
Author: dgoette Date: Thu Mar 26 15:20:55 2009 New Revision: 40254 URL:
http://svn.reactos.org/svn/reactos?rev=40254&view=rev
Log: start to convert database calls to PDO, also removing dependency from roscms function cookie_domain() Added:
branches/danny-web/reactos.org/htdocs/compat/connect.db.php
- copied, changed from r40250,
branches/danny-web/reactos.org/htdocs/roscms/connect.db.php
branches/danny-web/reactos.org/htdocs/compat/lib/CDBConnection.class.php
- copied, changed from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php
branches/danny-web/reactos.org/htdocs/compat/lib/CDBStatement.class.php
- copied, changed from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/DBStatement.class.php
branches/danny-web/reactos.org/htdocs/compat/lib/Compat_Autoloader.class.php
- copied, changed from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS_Autoloader.class.php
branches/danny-web/reactos.org/htdocs/compat/lib/om/
branches/danny-web/reactos.org/htdocs/compat/lib/om/Cookie.class.php
- copied unchanged from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/om/Cookie.class.php
Removed:
branches/danny-web/reactos.org/htdocs/compat/inc/utils.php
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group_maintainer…
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details_mai…
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_…
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots…
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_submit.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi…
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_itemver_submit.p…
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_rank.php
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_stats.php
branches/danny-web/reactos.org/htdocs/compat/inc/header.php
branches/danny-web/reactos.org/htdocs/compat/inc/lang.php
branches/danny-web/reactos.org/htdocs/compat/index.php
branches/danny-web/reactos.org/htdocs/compat/rsdb_setting.php
[This mail would be too long, it was shortened to contain the URLs only.] Copied:
branches/danny-web/reactos.org/htdocs/compat/connect.db.php
(from r40250,
branches/danny-web/reactos.org/htdocs/roscms/connect.db.php
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group_maintainer…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details_mai…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_submit.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_itemver_submit.p…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_rank.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_stats.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/header.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/inc/lang.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Removed:
branches/danny-web/reactos.org/htdocs/compat/inc/utils.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/index.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Copied:
branches/danny-web/reactos.org/htdocs/compat/lib/CDBConnection.class.php
(from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Copied:
branches/danny-web/reactos.org/htdocs/compat/lib/CDBStatement.class.php
(from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/DBStatement.class.php
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Copied:
branches/danny-web/reactos.org/htdocs/compat/lib/Compat_Autoloader.class.php
(from r40250,
branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS_Autoloader.class.php
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
Modified:
branches/danny-web/reactos.org/htdocs/compat/rsdb_setting.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
15 years, 9 months
1
0
0
0
[dgoette] 40253: Rename Subsystem class for subsystems with own user tables to SubsystemExternal, and use Subsystem for our own subsystems
by dgoette@svn.reactos.org
Author: dgoette Date: Thu Mar 26 15:14:54 2009 New Revision: 40253 URL:
http://svn.reactos.org/svn/reactos?rev=40253&view=rev
Log: Rename Subsystem class for subsystems with own user tables to SubsystemExternal, and use Subsystem for our own subsystems Added:
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
branches/danny-web/reactos.org/htdocs/roscms/lib/SubsystemExternal.class.php
- copied, changed from r40223,
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
Modified:
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil…
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.…
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c…
Added:
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
(added) +++
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
[iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -1,0 +1,50 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Gtte <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 + 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. + */ + + +/** + * class Subsystem + * + * @package subsystems + */ +class Subsystem extends Login +{ + + + + /** + * returns the roscms username + * + * @param int id user_id + * @return string + * @access public + */ + public static function getUserName( $user_id ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_USERS." WHERE id = :user_id"); + $stmt->bindParam('user_id',$user_id,PDO::PARAM_STR); + $stmt->execute(); + return $stmt->fetchColumn(); + } // end of member function getUserName + + + +} // end of Subsystem +?> Copied:
branches/danny-web/reactos.org/htdocs/roscms/lib/SubsystemExternal.class.php
(from r40223,
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/roscms/lib/SubsystemExternal.class.php
[iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -24,7 +24,7 @@ * * @package subsystems */ -abstract class Subsystem extends Login +abstract class SubsystemExternal extends Subsystem { protected $name = ''; // name of subsystem @@ -247,5 +247,5 @@ -} // end of Subsystem +} // end of SubsystemExternal ?> Modified:
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil…
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil…
[iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -23,7 +23,7 @@ * class Subsystem_Bugzilla * */ -class Subsystem_Bugzilla extends Subsystem +class Subsystem_Bugzilla extends SubsystemExternal { Modified:
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.…
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.…
[iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -23,7 +23,7 @@ * class Subsystem_PHPBB * */ -class Subsystem_PHPBB extends Subsystem +class Subsystem_PHPBB extends SubsystemExternal { Modified:
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c…
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c…
[iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -23,7 +23,7 @@ * class Subsystem_Wiki * */ -class Subsystem_Wiki extends Subsystem +class Subsystem_Wiki extends SubsystemExternal {
15 years, 9 months
1
0
0
0
[dgoette] 40252: create new folder structure and move files to their new folders, update header
by dgoette@svn.reactos.org
Author: dgoette Date: Thu Mar 26 14:08:27 2009 New Revision: 40252 URL:
http://svn.reactos.org/svn/reactos?rev=40252&view=rev
Log: create new folder structure and move files to their new folders, update header Added:
branches/danny-web/reactos.org/htdocs/compat/css/
branches/danny-web/reactos.org/htdocs/compat/css/style.css
(contents, props changed) - copied, changed from r40251,
branches/danny-web/reactos.org/htdocs/compat/style.css
branches/danny-web/reactos.org/htdocs/compat/js/
branches/danny-web/reactos.org/htdocs/compat/js/search.js
(contents, props changed) - copied, changed from r40251,
branches/danny-web/reactos.org/htdocs/compat/search.js
branches/danny-web/reactos.org/htdocs/compat/js/smoothscroll.js
(props changed) - copied unchanged from r40251,
branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js
branches/danny-web/reactos.org/htdocs/compat/lib/
Removed:
branches/danny-web/reactos.org/htdocs/compat/search.js
branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js
branches/danny-web/reactos.org/htdocs/compat/style.css
Copied:
branches/danny-web/reactos.org/htdocs/compat/css/style.css
(from r40251,
branches/danny-web/reactos.org/htdocs/compat/style.css
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/compat/style.css
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/compat/css/style.css
[iso-8859-1] Thu Mar 26 14:08:27 2009 @@ -1,383 +1,383 @@ -body { - font-family: Verdana; - 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; -} - -hr { - margin: 5px 0 5px 0; - color: #8D8D8D; -} - -address { - font-size: 9px; -} - -address p { - margin: 0; -} -address a { - font-size: 9px; - text-decoration:none; -} -address a:hover { - font-size: 9px; - text-decoration:underline; -} - - - -h1, .contentSmallTitle { - display: block; - line-height: normal; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - padding: 0px 0px 1px 10px; - margin-top: 0; -} -h1 a { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:none; -} -h1 a:hover { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:underline; -} - -h2 { - font-size: 22px; - color: #5984C3; - font-weight: bold; - margin-top: 15px; -} - -h3 { - font-size: 18px; - color: #5984C3; - font-weight: bold; - margin-top: 10px; -} - -h4 { - font-size: 16px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h5 { - font-size: 14px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h6 { - font-size: 12px; - color: #5984C3; - font-weight: bold; -} - -a { - font-size: 12px; - color: #006090; -} - -a:hover { - background-color: #DDEEFF; - color: #000000; -} - -/* set by the generator */ -a.extern { - background: url('
http://localhost/reactos.org/wiki/stylesheets/monobook/external.png
') no-repeat center right; - padding-right: 14px; -} - -#content, .contentSmall { - padding-right: 3px; - font-size: 12px; - text-align: justify; -} - -#content li { - list-style-image: url('
http://localhost/reactos.org/images/bullet.png
') -} - -#top { - margin: 0; - background: url('
http://localhost/reactos.org/support/images/logo_rsdb.jpg
') no-repeat scroll 35px 0; - padding: 103px 0 26px 0; - color: #FFFFFF; - text-align: right; -} - -#top a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} - -#top a:hover { - color: #000000; - background-color: #FFCC33; -} - -#topMenu { - font-size: 13px; - margin-left: 300px; - background-color: #5984C3; -} - -#topMenu p { - text-align: left; - margin: 0; -} - -#leftNav { - padding: 0px 10px 10px 7px; -} - -#rightNav { - padding: 0px 3px 0px 5px; - width: 270px; - line-height: 150%; -} - -#rightNav img { - border: 1px solid #000000; - height: 200px; - width: 266px; -} - -#leftNav ol { - margin: 0; - padding: 0; - list-style-type: none; - background-color: #EEEEEE; - border-top: #3F3849 0px solid; - border-right: #3F3849 1px solid; - border-left: #3F3849 1px solid; -} - -#leftNav ol li { - font-size: 13px; - font-weight: bold; - border-bottom: #3f3849 1px solid; -} - -#leftNav ol li a { - display: block; - width: 145px; - padding: 2px 4px 2px 4px; - - color: #3F3849; - text-decoration: none; - background-color: #EEEEEE; -} - -#leftNav ol li a:hover { - color: #000000; - background-color: #FFCC33; -} - -#leftNav ol li a.extern { - background: none; - padding-right: 0px; -} - -#leftNav .navTitle { - padding-left: 12px; - border-top: #3F3849 1px solid; - border-right: #3F3849 1px solid; - border-bottom: #3F3849 1px solid; - border-left: #3F3849 1px solid; - - font-weight: bold; - font-size: 14px; - color: #FFFFFF; - background-color: #5984c3; -} - -#leftNav .navBox { - text-align: center; - padding: 2px; - background-color: #EEEEEE; - border-right: 1px solid #3F3849; - border-bottom: 1px solid #3F3849; - border-left: 1px solid #3F3849; - font-size: 13px; -} - - -#bugzillaContent { - font-size: 12px; -} - -#bugzillaContent table { - font-size: 12px; -} - - - -#sectionMenu { - margin: 0; - font-size: 13px; - background-color: #5984C3; -} -#sectionMenu a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} -#sectionMenu a:hover { - color: #000000; - background-color: #FFCC33; -} - - -/* Maintainer Bar */ - -table.maintainer { - background-color: #ddddee; - padding:4px 8px; - border:1px solid #ccccdd; - text-align: Center; -} - -table.maintainer td { - background-color: #ddddee; - font-family: Verdana; - font-size: 15px; -} - -table.maintainer a { - font-size: 15px; -} - -table.maintainer a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Admin Bar */ - -table.admin { - background-color: #FEE3CB; - padding:4px 8px; - border:1px solid #FBBB95; - text-align: Center; -} - -table.admin td { - background-color: #FEE3CB; - font-family: Verdana; - font-size: 15px; -} - -table.admin a { - font-size: 15px; -} - -table.admin a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - -/* Message Bar */ - -table.message { - background-color: #FFCC00; - padding:4px 8px; - border: 1px solid #FF6600; - text-align: Center; -} - -table.message td { - background-color: #FFCC00; - font-family: Verdana; - font-size: 15px; -} - -table.message a { - font-size: 15px; -} - -table.message a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Forum Bar */ - -table.forumbar { - background-color: #99CCCC; - padding:4px 8px; - border: 1px solid #5984C3; - text-align: Center; -} - -table.forumbar td { - background-color: #DDEEFF; - font-family: Verdana; - font-size: 15px; -} - -table.forumbar a { - font-size: 15px; -} - -table.forumbar a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -.button -{ - background-color: #5984C3; color: white; - font-family: "verdana bitstream vera sans", verdana, sans-serif; font-size: 13px; - border-width:1px; border-style:solid; border-color: #C0C0C0; - font-weight: bold; padding: 0; -} - - - -UL.simple { - PADDING-RIGHT: 0px; - PADDING-LEFT: 20px; - PADDING-BOTTOM: 0px; - PADDING-TOP: 0px; - MARGIN: 0px 0px 1em; - LIST-STYLE-TYPE: none; - FONT-SIZE: 12px; -} -SPAN.simple { - font-size: 15px; - font-weight: bold; -} - - - +body { + font-family: Verdana; + 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; +} + +hr { + margin: 5px 0 5px 0; + color: #8D8D8D; +} + +address { + font-size: 9px; +} + +address p { + margin: 0; +} +address a { + font-size: 9px; + text-decoration:none; +} +address a:hover { + font-size: 9px; + text-decoration:underline; +} + + + +h1, .contentSmallTitle { + display: block; + line-height: normal; + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + padding: 0px 0px 1px 10px; + margin-top: 0; +} +h1 a { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration:none; +} +h1 a:hover { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration:underline; +} + +h2 { + font-size: 22px; + color: #5984C3; + font-weight: bold; + margin-top: 15px; +} + +h3 { + font-size: 18px; + color: #5984C3; + font-weight: bold; + margin-top: 10px; +} + +h4 { + font-size: 16px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h5 { + font-size: 14px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h6 { + font-size: 12px; + color: #5984C3; + font-weight: bold; +} + +a { + font-size: 12px; + color: #006090; +} + +a:hover { + background-color: #DDEEFF; + color: #000000; +} + +/* set by the generator */ +a.extern { + background: url('
http://localhost/reactos.org/wiki/stylesheets/monobook/external.png
') no-repeat center right; + padding-right: 14px; +} + +#content, .contentSmall { + padding-right: 3px; + font-size: 12px; + text-align: justify; +} + +#content li { + list-style-image: url('
http://localhost/reactos.org/images/bullet.png
') +} + +#top { + margin: 0; + background: url('
http://localhost/reactos.org/support/images/logo_rsdb.jpg
') no-repeat scroll 35px 0; + padding: 103px 0 26px 0; + color: #FFFFFF; + text-align: right; +} + +#top a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} + +#top a:hover { + color: #000000; + background-color: #FFCC33; +} + +#topMenu { + font-size: 13px; + margin-left: 300px; + background-color: #5984C3; +} + +#topMenu p { + text-align: left; + margin: 0; +} + +#leftNav { + padding: 0px 10px 10px 7px; +} + +#rightNav { + padding: 0px 3px 0px 5px; + width: 270px; + line-height: 150%; +} + +#rightNav img { + border: 1px solid #000000; + height: 200px; + width: 266px; +} + +#leftNav ol { + margin: 0; + padding: 0; + list-style-type: none; + background-color: #EEEEEE; + border-top: #3F3849 0px solid; + border-right: #3F3849 1px solid; + border-left: #3F3849 1px solid; +} + +#leftNav ol li { + font-size: 13px; + font-weight: bold; + border-bottom: #3f3849 1px solid; +} + +#leftNav ol li a { + display: block; + width: 145px; + padding: 2px 4px 2px 4px; + + color: #3F3849; + text-decoration: none; + background-color: #EEEEEE; +} + +#leftNav ol li a:hover { + color: #000000; + background-color: #FFCC33; +} + +#leftNav ol li a.extern { + background: none; + padding-right: 0px; +} + +#leftNav .navTitle { + padding-left: 12px; + border-top: #3F3849 1px solid; + border-right: #3F3849 1px solid; + border-bottom: #3F3849 1px solid; + border-left: #3F3849 1px solid; + + font-weight: bold; + font-size: 14px; + color: #FFFFFF; + background-color: #5984c3; +} + +#leftNav .navBox { + text-align: center; + padding: 2px; + background-color: #EEEEEE; + border-right: 1px solid #3F3849; + border-bottom: 1px solid #3F3849; + border-left: 1px solid #3F3849; + font-size: 13px; +} + + +#bugzillaContent { + font-size: 12px; +} + +#bugzillaContent table { + font-size: 12px; +} + + + +#sectionMenu { + margin: 0; + font-size: 13px; + background-color: #5984C3; +} +#sectionMenu a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} +#sectionMenu a:hover { + color: #000000; + background-color: #FFCC33; +} + + +/* Maintainer Bar */ + +table.maintainer { + background-color: #ddddee; + padding:4px 8px; + border:1px solid #ccccdd; + text-align: Center; +} + +table.maintainer td { + background-color: #ddddee; + font-family: Verdana; + font-size: 15px; +} + +table.maintainer a { + font-size: 15px; +} + +table.maintainer a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + + +/* Admin Bar */ + +table.admin { + background-color: #FEE3CB; + padding:4px 8px; + border:1px solid #FBBB95; + text-align: Center; +} + +table.admin td { + background-color: #FEE3CB; + font-family: Verdana; + font-size: 15px; +} + +table.admin a { + font-size: 15px; +} + +table.admin a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + +/* Message Bar */ + +table.message { + background-color: #FFCC00; + padding:4px 8px; + border: 1px solid #FF6600; + text-align: Center; +} + +table.message td { + background-color: #FFCC00; + font-family: Verdana; + font-size: 15px; +} + +table.message a { + font-size: 15px; +} + +table.message a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + + +/* Forum Bar */ + +table.forumbar { + background-color: #99CCCC; + padding:4px 8px; + border: 1px solid #5984C3; + text-align: Center; +} + +table.forumbar td { + background-color: #DDEEFF; + font-family: Verdana; + font-size: 15px; +} + +table.forumbar a { + font-size: 15px; +} + +table.forumbar a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + + +.button +{ + background-color: #5984C3; color: white; + font-family: "verdana bitstream vera sans", verdana, sans-serif; font-size: 13px; + border-width:1px; border-style:solid; border-color: #C0C0C0; + font-weight: bold; padding: 0; +} + + + +UL.simple { + PADDING-RIGHT: 0px; + PADDING-LEFT: 20px; + PADDING-BOTTOM: 0px; + PADDING-TOP: 0px; + MARGIN: 0px 0px 1em; + LIST-STYLE-TYPE: none; + FONT-SIZE: 12px; +} +SPAN.simple { + font-size: 15px; + font-weight: bold; +} + + + Propchange:
branches/danny-web/reactos.org/htdocs/compat/css/style.css
------------------------------------------------------------------------------ svn:eol-style = native Copied:
branches/danny-web/reactos.org/htdocs/compat/js/search.js
(from r40251,
branches/danny-web/reactos.org/htdocs/compat/search.js
) URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/compat/search.js
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/compat/js/search.js
[iso-8859-1] Thu Mar 26 14:08:27 2009 @@ -1,353 +1,353 @@ -<!-- - - // Ajax driven search box - // (c) by Klemens Friedl 2006 -
http://www.reactos.org/support/
- - - // Global variable for the request-object - var http_request = false; - var tSearch = ""; - var tView = ""; - var tWhere = ""; - var tPicAnimation = ""; - var tResults = ""; - //var twebsite = "
http://localhost/reactos.org/support/index.php
"; - //var twebsite2 = "
http://localhost/reactos.org/
"; - var twebsite = "
http://www.reactos.org/support/index.php
"; - var twebsite2 = "
http://www.reactos.org/
"; - - - function writeItemList_style_header() { - var tempa = ""; - - tempa = "<table width=\"700\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; - tempa += "<tr bgcolor=\"#5984C3\"> \n"; - tempa += "<td width=\"30%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Application</strong></font></div></td> \n"; - tempa += "<td width=\"30%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; - tempa += "<td width=\"40%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Description</strong></font></div></td> \n"; - tempa += "</tr>"; - return tempa; - } - - function writeItemList_style_entry(itemid, itemname, vendorid, vendorname, description, colorcur) { - var tempb = ""; - - tempb += "<tr> \n"; - tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">" + itemname + "</a></b></font></td> \n"; - if (vendorid != 0) { - tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><a href=\""+twebsite+"?page=db&view=comp&sec=vendor&vendor=" + vendorid + "\">" + vendorname + "</a></font></td> \n"; - } - else { - tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; - } - if (description != ".") { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + description + "</font></td> \n"; - } - else { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; - } - tempb += "</tr>"; - return tempb; - } - - function writeItemList_style_footer() { - return "</table>"; - } - - function write_bar_entry(itemid, itemname) { - var tempb = ""; - tempb += "<a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">• " + itemname + "</a>\n"; - return tempb; - } - - function write_rosweb_entry(itemname, itemid) { - var tempb = ""; - tempb += "<a href=\""+twebsite2+"?page=" + itemid + "\">• " + itemname + "</a>\n"; - return tempb; - } - - function write_compsubmit_header() { - var tempa = ""; - - tempa = "<table width=\"500\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; - tempa += "<tr bgcolor=\"#5984C3\"> \n"; - tempa += "<td width=\"60%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Application</strong></font></div></td> \n"; - tempa += "<td width=\"40%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; - tempa += "</tr>"; - return tempa; - } - - function write_compsubmit_entry(itemid, itemname, vendorname, colorcur) { - var tempb = ""; - - tempb += "<tr> \n"; - tempb += "<td width=\"60%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">" + itemname + "</a></b></font></td> \n"; - if (vendorname != ". ") { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + vendorname + "</font></td> \n"; - } - else { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><i>no vendor defined</i></font></td> \n"; - } - tempb += "</tr>"; - return tempb; - } - - function write_vendorsubmit_header() { - var tempa = ""; - - tempa = "<table width=\"500\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; - tempa += "<tr bgcolor=\"#5984C3\"> \n"; - tempa += "<td width=\"50%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; - tempa += "<td width=\"50%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Website</strong></font></div></td> \n"; - tempa += "</tr>"; - return tempa; - } - - function write_vendorsubmit_entry(vendorid, vendorname, vendorurl, colorcur) { - var tempb = ""; - - tempb += "<tr> \n"; - tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\"javascript:\/\/\" onclick=\"UseThisVendor("+vendorid+",\'"+vendorname+"\')\">" + vendorname + "</a></b></font></td> \n"; - if (vendorurl != ".") { - tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + vendorurl + "</font></td> \n"; - } - else { - tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; - } - tempb += "</tr>"; - return tempb; - } - - function deleteItemList() { - document.getElementById(tResults).innerHTML = ""; - } - - function loadItemList(asearch,aview,awhere,apicani,aoutput) { - - // Prevent extra load, when using onblur and nothing has changed - if (tSearch == asearch) { - return 0; - } - - tSearch=asearch; - tView=aview; - tWhere=awhere; - tPicAnimation=apicani; - tResults=aoutput; - - if (tWhere == "vendor") { - checkFields(); - } - if (tResults == "submitresult" && tSearch.length < 2) { - enableButtonWizPageNext2(1); - } - - if (asearch.length > 1) { - document.getElementById(tResults).style.display = "block"; - document.getElementById(tPicAnimation).style.display = "inline"; - if (asearch != "") { - setCursor('wait'); - if (http_request && (http_request.readyState == 2 || http_request.readyState == 3)) { - http_request.abort(); // stop running request - } - - - if (tWhere == "comp") { - makeRequest(twebsite+'?page=dat&export=grplst&search='+asearch); - } - else if (tWhere == "vendor") { - //alert("vendor"); - makeRequest(twebsite+'?page=dat&export=vdrlst&search='+asearch); - } - else if (tWhere.substr(0, 6) == "roscms") { - //alert("vendor"); - makeRequest(twebsite2+'roscms/search.php?search='+asearch+'&searchlang='+tWhere.substr(7, 2)); - } - } - } - else { - document.getElementById(tResults).style.display = "none"; - document.getElementById(tPicAnimation).style.display = "none"; - deleteItemList(); - } - } - - - function setCursor(mode) { - var pageBody = document.getElementsByTagName("body")[0]; - pageBody.style.cursor = mode; - } - - - - function makeRequest(url) { - - http_request = false; - - if (window.XMLHttpRequest) { // Mozilla, Safari,... - http_request = new XMLHttpRequest(); - if (http_request.overrideMimeType) { - http_request.overrideMimeType('text/xml'); - } - } else if (window.ActiveXObject) { // IE - try { - http_request = new ActiveXObject("Msxml2.XMLHTTP"); - } catch (e) { - try { - http_request = new ActiveXObject("Microsoft.XMLHTTP"); - } catch (e) {} - } - } - - if (!http_request) { - alert('Giving up :( Cannot create an XMLHTTP instance'); - return false; - } - http_request.onreadystatechange = showItemList; - http_request.open('GET', url, true); - http_request.send(null); - - } - - function showItemList() { - - if (http_request.readyState == 4) { - if (http_request.status == 200) { - - var lstData = ""; - - var xmldoc = http_request.responseXML; - var root_node = xmldoc.getElementsByTagName('root').item(0); - - if ((root_node.firstChild.data.search(/#none#/)) == -1) { - lstData = ""; - - // Table header: - if (tView == "table") { - lstData = writeItemList_style_header(); - } - else if (tView == "submit") { - lstData = write_compsubmit_header(); - } - else if (tView == "submit_vendor") { - lstData = write_vendorsubmit_header(); - } - - // XML schema: - if (tWhere == "comp") { - var items = http_request.responseXML.getElementsByTagName("item"); - var descs = http_request.responseXML.getElementsByTagName("desc"); - var vendo = http_request.responseXML.getElementsByTagName("vendor"); - } - else if (tWhere == "vendor") { - var vendo = http_request.responseXML.getElementsByTagName("vendor"); - var vendurl = http_request.responseXML.getElementsByTagName("url"); - } - else if (tWhere.substr(0, 6) == "roscms") { - var webcontent = http_request.responseXML.getElementsByTagName("content"); - } - - // Colors: - var colorcur=""; - var color1="#E2E2E2"; - var color2="#EEEEEE"; - var colorcounter=0; - - // XML length: - var xmllength=0; - if (tWhere == "comp") { - xmllength = items.length; - } - else if (tWhere == "vendor") { - xmllength = vendo.length; - } - else if (tWhere.substr(0, 6) == "roscms") { - xmllength = webcontent.length; - } - - // XML-Loop: - for (var i = 0; i < xmllength; i++) { - // Table colors: - colorcounter++; - if (colorcounter == "1") { - colorcur = color1; - } - else if (colorcounter == "2") { - colorcounter="0"; - colorcur = color2; - } - - // Table data: - if (tView == "table") { - lstData += writeItemList_style_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data, vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, descs[i].firstChild.data, colorcur); - } - else if (tView == "submit") { - lstData += write_compsubmit_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data, vendo[i].firstChild.data, colorcur); - } - else if (tView == "bar") { - lstData += write_bar_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data); - } - else if (tView == "submit_vendor") { - lstData += write_vendorsubmit_entry(vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, vendurl[i].firstChild.data, colorcur); - } - else if (tView == "rosweb") { - lstData += write_rosweb_entry(webcontent[i].getAttributeNode("id").value, webcontent[i].firstChild.data); - } - - } - - // Table footer: - if (tView == "table") { - lstData += writeItemList_style_footer(); - } - else if (tView == "submit") { - lstData += writeItemList_style_footer(); - lstData += "<p>Click on an application in the list above or <a href=\"javascript://\" onclick=\"WizPag2()\">submit new application</a> to the database.</p>"; - } - else if (tView == "submit_vendor") { - lstData += writeItemList_style_footer(); - lstData += "<p>Click on a vendor name in the search result list above, choose a vendor from the <b><a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a></b> or <b><a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a></b> to the database.</p>"; - } - - if (tResults == "submitresult") { - enableButtonWizPageNext2(1); - } - - // HTML output: - document.getElementById(tResults).innerHTML = lstData; - } - else { - // No related database entries found: - if (tView == "table") { - document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p>"; - } - else if (tView == "bar") { - document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; - } - else if (tView == "submit") { - document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p><p><b><a href=\"javascript://\" onclick=\"WizPag2()\">Submit new application</a></b> to the database.</p>"; - enableButtonWizPageNext2(2); - } - else if (tView == "submit_vendor") { - document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p><p>Choose a vendor from the <b><a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a></b> or <b><a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a></b> to the database.</p>"; - } - else if (tView == "rosweb") { - document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; - } - } - - // reset mouse cursor - setCursor('auto'); - - // reset loading picture: - document.getElementById(tPicAnimation).style.display = "none"; - - } - else { - alert('There was a problem with the request:\n' + http_request.statusText); - } - } - - } - +<!-- + + // Ajax driven search box + // (c) by Klemens Friedl 2006 -
http://www.reactos.org/support/
+ + + // Global variable for the request-object + var http_request = false; + var tSearch = ""; + var tView = ""; + var tWhere = ""; + var tPicAnimation = ""; + var tResults = ""; + //var twebsite = "
http://localhost/reactos.org/support/index.php
"; + //var twebsite2 = "
http://localhost/reactos.org/
"; + var twebsite = "
http://www.reactos.org/support/index.php
"; + var twebsite2 = "
http://www.reactos.org/
"; + + + function writeItemList_style_header() { + var tempa = ""; + + tempa = "<table width=\"700\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; + tempa += "<tr bgcolor=\"#5984C3\"> \n"; + tempa += "<td width=\"30%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Application</strong></font></div></td> \n"; + tempa += "<td width=\"30%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; + tempa += "<td width=\"40%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Description</strong></font></div></td> \n"; + tempa += "</tr>"; + return tempa; + } + + function writeItemList_style_entry(itemid, itemname, vendorid, vendorname, description, colorcur) { + var tempb = ""; + + tempb += "<tr> \n"; + tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">" + itemname + "</a></b></font></td> \n"; + if (vendorid != 0) { + tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><a href=\""+twebsite+"?page=db&view=comp&sec=vendor&vendor=" + vendorid + "\">" + vendorname + "</a></font></td> \n"; + } + else { + tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; + } + if (description != ".") { + tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + description + "</font></td> \n"; + } + else { + tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; + } + tempb += "</tr>"; + return tempb; + } + + function writeItemList_style_footer() { + return "</table>"; + } + + function write_bar_entry(itemid, itemname) { + var tempb = ""; + tempb += "<a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">• " + itemname + "</a>\n"; + return tempb; + } + + function write_rosweb_entry(itemname, itemid) { + var tempb = ""; + tempb += "<a href=\""+twebsite2+"?page=" + itemid + "\">• " + itemname + "</a>\n"; + return tempb; + } + + function write_compsubmit_header() { + var tempa = ""; + + tempa = "<table width=\"500\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; + tempa += "<tr bgcolor=\"#5984C3\"> \n"; + tempa += "<td width=\"60%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Application</strong></font></div></td> \n"; + tempa += "<td width=\"40%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; + tempa += "</tr>"; + return tempa; + } + + function write_compsubmit_entry(itemid, itemname, vendorname, colorcur) { + var tempb = ""; + + tempb += "<tr> \n"; + tempb += "<td width=\"60%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">" + itemname + "</a></b></font></td> \n"; + if (vendorname != ". ") { + tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + vendorname + "</font></td> \n"; + } + else { + tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><i>no vendor defined</i></font></td> \n"; + } + tempb += "</tr>"; + return tempb; + } + + function write_vendorsubmit_header() { + var tempa = ""; + + tempa = "<table width=\"500\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; + tempa += "<tr bgcolor=\"#5984C3\"> \n"; + tempa += "<td width=\"50%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; + tempa += "<td width=\"50%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Website</strong></font></div></td> \n"; + tempa += "</tr>"; + return tempa; + } + + function write_vendorsubmit_entry(vendorid, vendorname, vendorurl, colorcur) { + var tempb = ""; + + tempb += "<tr> \n"; + tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\"javascript:\/\/\" onclick=\"UseThisVendor("+vendorid+",\'"+vendorname+"\')\">" + vendorname + "</a></b></font></td> \n"; + if (vendorurl != ".") { + tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + vendorurl + "</font></td> \n"; + } + else { + tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; + } + tempb += "</tr>"; + return tempb; + } + + function deleteItemList() { + document.getElementById(tResults).innerHTML = ""; + } + + function loadItemList(asearch,aview,awhere,apicani,aoutput) { + + // Prevent extra load, when using onblur and nothing has changed + if (tSearch == asearch) { + return 0; + } + + tSearch=asearch; + tView=aview; + tWhere=awhere; + tPicAnimation=apicani; + tResults=aoutput; + + if (tWhere == "vendor") { + checkFields(); + } + if (tResults == "submitresult" && tSearch.length < 2) { + enableButtonWizPageNext2(1); + } + + if (asearch.length > 1) { + document.getElementById(tResults).style.display = "block"; + document.getElementById(tPicAnimation).style.display = "inline"; + if (asearch != "") { + setCursor('wait'); + if (http_request && (http_request.readyState == 2 || http_request.readyState == 3)) { + http_request.abort(); // stop running request + } + + + if (tWhere == "comp") { + makeRequest(twebsite+'?page=dat&export=grplst&search='+asearch); + } + else if (tWhere == "vendor") { + //alert("vendor"); + makeRequest(twebsite+'?page=dat&export=vdrlst&search='+asearch); + } + else if (tWhere.substr(0, 6) == "roscms") { + //alert("vendor"); + makeRequest(twebsite2+'roscms/search.php?search='+asearch+'&searchlang='+tWhere.substr(7, 2)); + } + } + } + else { + document.getElementById(tResults).style.display = "none"; + document.getElementById(tPicAnimation).style.display = "none"; + deleteItemList(); + } + } + + + function setCursor(mode) { + var pageBody = document.getElementsByTagName("body")[0]; + pageBody.style.cursor = mode; + } + + + + function makeRequest(url) { + + http_request = false; + + if (window.XMLHttpRequest) { // Mozilla, Safari,... + http_request = new XMLHttpRequest(); + if (http_request.overrideMimeType) { + http_request.overrideMimeType('text/xml'); + } + } else if (window.ActiveXObject) { // IE + try { + http_request = new ActiveXObject("Msxml2.XMLHTTP"); + } catch (e) { + try { + http_request = new ActiveXObject("Microsoft.XMLHTTP"); + } catch (e) {} + } + } + + if (!http_request) { + alert('Giving up :( Cannot create an XMLHTTP instance'); + return false; + } + http_request.onreadystatechange = showItemList; + http_request.open('GET', url, true); + http_request.send(null); + + } + + function showItemList() { + + if (http_request.readyState == 4) { + if (http_request.status == 200) { + + var lstData = ""; + + var xmldoc = http_request.responseXML; + var root_node = xmldoc.getElementsByTagName('root').item(0); + + if ((root_node.firstChild.data.search(/#none#/)) == -1) { + lstData = ""; + + // Table header: + if (tView == "table") { + lstData = writeItemList_style_header(); + } + else if (tView == "submit") { + lstData = write_compsubmit_header(); + } + else if (tView == "submit_vendor") { + lstData = write_vendorsubmit_header(); + } + + // XML schema: + if (tWhere == "comp") { + var items = http_request.responseXML.getElementsByTagName("item"); + var descs = http_request.responseXML.getElementsByTagName("desc"); + var vendo = http_request.responseXML.getElementsByTagName("vendor"); + } + else if (tWhere == "vendor") { + var vendo = http_request.responseXML.getElementsByTagName("vendor"); + var vendurl = http_request.responseXML.getElementsByTagName("url"); + } + else if (tWhere.substr(0, 6) == "roscms") { + var webcontent = http_request.responseXML.getElementsByTagName("content"); + } + + // Colors: + var colorcur=""; + var color1="#E2E2E2"; + var color2="#EEEEEE"; + var colorcounter=0; + + // XML length: + var xmllength=0; + if (tWhere == "comp") { + xmllength = items.length; + } + else if (tWhere == "vendor") { + xmllength = vendo.length; + } + else if (tWhere.substr(0, 6) == "roscms") { + xmllength = webcontent.length; + } + + // XML-Loop: + for (var i = 0; i < xmllength; i++) { + // Table colors: + colorcounter++; + if (colorcounter == "1") { + colorcur = color1; + } + else if (colorcounter == "2") { + colorcounter="0"; + colorcur = color2; + } + + // Table data: + if (tView == "table") { + lstData += writeItemList_style_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data, vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, descs[i].firstChild.data, colorcur); + } + else if (tView == "submit") { + lstData += write_compsubmit_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data, vendo[i].firstChild.data, colorcur); + } + else if (tView == "bar") { + lstData += write_bar_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data); + } + else if (tView == "submit_vendor") { + lstData += write_vendorsubmit_entry(vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, vendurl[i].firstChild.data, colorcur); + } + else if (tView == "rosweb") { + lstData += write_rosweb_entry(webcontent[i].getAttributeNode("id").value, webcontent[i].firstChild.data); + } + + } + + // Table footer: + if (tView == "table") { + lstData += writeItemList_style_footer(); + } + else if (tView == "submit") { + lstData += writeItemList_style_footer(); + lstData += "<p>Click on an application in the list above or <a href=\"javascript://\" onclick=\"WizPag2()\">submit new application</a> to the database.</p>"; + } + else if (tView == "submit_vendor") { + lstData += writeItemList_style_footer(); + lstData += "<p>Click on a vendor name in the search result list above, choose a vendor from the <b><a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a></b> or <b><a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a></b> to the database.</p>"; + } + + if (tResults == "submitresult") { + enableButtonWizPageNext2(1); + } + + // HTML output: + document.getElementById(tResults).innerHTML = lstData; + } + else { + // No related database entries found: + if (tView == "table") { + document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p>"; + } + else if (tView == "bar") { + document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; + } + else if (tView == "submit") { + document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p><p><b><a href=\"javascript://\" onclick=\"WizPag2()\">Submit new application</a></b> to the database.</p>"; + enableButtonWizPageNext2(2); + } + else if (tView == "submit_vendor") { + document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p><p>Choose a vendor from the <b><a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a></b> or <b><a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a></b> to the database.</p>"; + } + else if (tView == "rosweb") { + document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; + } + } + + // reset mouse cursor + setCursor('auto'); + + // reset loading picture: + document.getElementById(tPicAnimation).style.display = "none"; + + } + else { + alert('There was a problem with the request:\n' + http_request.statusText); + } + } + + } + --> Propchange:
branches/danny-web/reactos.org/htdocs/compat/js/search.js
------------------------------------------------------------------------------ svn:eol-style = native Propchange:
branches/danny-web/reactos.org/htdocs/compat/js/smoothscroll.js
------------------------------------------------------------------------------ svn:eol-style = native Removed:
branches/danny-web/reactos.org/htdocs/compat/search.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/compat/search.js
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/compat/search.js
(removed) @@ -1,353 +1,0 @@ -<!-- - - // Ajax driven search box - // (c) by Klemens Friedl 2006 -
http://www.reactos.org/support/
- - - // Global variable for the request-object - var http_request = false; - var tSearch = ""; - var tView = ""; - var tWhere = ""; - var tPicAnimation = ""; - var tResults = ""; - //var twebsite = "
http://localhost/reactos.org/support/index.php
"; - //var twebsite2 = "
http://localhost/reactos.org/
"; - var twebsite = "
http://www.reactos.org/support/index.php
"; - var twebsite2 = "
http://www.reactos.org/
"; - - - function writeItemList_style_header() { - var tempa = ""; - - tempa = "<table width=\"700\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; - tempa += "<tr bgcolor=\"#5984C3\"> \n"; - tempa += "<td width=\"30%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Application</strong></font></div></td> \n"; - tempa += "<td width=\"30%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; - tempa += "<td width=\"40%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Description</strong></font></div></td> \n"; - tempa += "</tr>"; - return tempa; - } - - function writeItemList_style_entry(itemid, itemname, vendorid, vendorname, description, colorcur) { - var tempb = ""; - - tempb += "<tr> \n"; - tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">" + itemname + "</a></b></font></td> \n"; - if (vendorid != 0) { - tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><a href=\""+twebsite+"?page=db&view=comp&sec=vendor&vendor=" + vendorid + "\">" + vendorname + "</a></font></td> \n"; - } - else { - tempb += "<td width=\"30%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; - } - if (description != ".") { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + description + "</font></td> \n"; - } - else { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; - } - tempb += "</tr>"; - return tempb; - } - - function writeItemList_style_footer() { - return "</table>"; - } - - function write_bar_entry(itemid, itemname) { - var tempb = ""; - tempb += "<a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">• " + itemname + "</a>\n"; - return tempb; - } - - function write_rosweb_entry(itemname, itemid) { - var tempb = ""; - tempb += "<a href=\""+twebsite2+"?page=" + itemid + "\">• " + itemname + "</a>\n"; - return tempb; - } - - function write_compsubmit_header() { - var tempa = ""; - - tempa = "<table width=\"500\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; - tempa += "<tr bgcolor=\"#5984C3\"> \n"; - tempa += "<td width=\"60%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Application</strong></font></div></td> \n"; - tempa += "<td width=\"40%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; - tempa += "</tr>"; - return tempa; - } - - function write_compsubmit_entry(itemid, itemname, vendorname, colorcur) { - var tempb = ""; - - tempb += "<tr> \n"; - tempb += "<td width=\"60%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\""+twebsite+"?page=db&view=comp&sec=category&group=" + itemid + "\">" + itemname + "</a></b></font></td> \n"; - if (vendorname != ". ") { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + vendorname + "</font></td> \n"; - } - else { - tempb += "<td width=\"40%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><i>no vendor defined</i></font></td> \n"; - } - tempb += "</tr>"; - return tempb; - } - - function write_vendorsubmit_header() { - var tempa = ""; - - tempa = "<table width=\"500\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; - tempa += "<tr bgcolor=\"#5984C3\"> \n"; - tempa += "<td width=\"50%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Vendor</strong></font></div></td> \n"; - tempa += "<td width=\"50%\"> <div align=\"center\"><font color=\"#FFFFFF\" face=\"Arial, Helvetica, sans-serif\"><strong>Website</strong></font></div></td> \n"; - tempa += "</tr>"; - return tempa; - } - - function write_vendorsubmit_entry(vendorid, vendorname, vendorurl, colorcur) { - var tempb = ""; - - tempb += "<tr> \n"; - tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"><b><a href=\"javascript:\/\/\" onclick=\"UseThisVendor("+vendorid+",\'"+vendorname+"\')\">" + vendorname + "</a></b></font></td> \n"; - if (vendorurl != ".") { - tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\">" + vendorurl + "</font></td> \n"; - } - else { - tempb += "<td width=\"50%\" valign=\"top\" bgcolor=\"" + colorcur + "\"><font size=\"2\"> </font></td> \n"; - } - tempb += "</tr>"; - return tempb; - } - - function deleteItemList() { - document.getElementById(tResults).innerHTML = ""; - } - - function loadItemList(asearch,aview,awhere,apicani,aoutput) { - - // Prevent extra load, when using onblur and nothing has changed - if (tSearch == asearch) { - return 0; - } - - tSearch=asearch; - tView=aview; - tWhere=awhere; - tPicAnimation=apicani; - tResults=aoutput; - - if (tWhere == "vendor") { - checkFields(); - } - if (tResults == "submitresult" && tSearch.length < 2) { - enableButtonWizPageNext2(1); - } - - if (asearch.length > 1) { - document.getElementById(tResults).style.display = "block"; - document.getElementById(tPicAnimation).style.display = "inline"; - if (asearch != "") { - setCursor('wait'); - if (http_request && (http_request.readyState == 2 || http_request.readyState == 3)) { - http_request.abort(); // stop running request - } - - - if (tWhere == "comp") { - makeRequest(twebsite+'?page=dat&export=grplst&search='+asearch); - } - else if (tWhere == "vendor") { - //alert("vendor"); - makeRequest(twebsite+'?page=dat&export=vdrlst&search='+asearch); - } - else if (tWhere.substr(0, 6) == "roscms") { - //alert("vendor"); - makeRequest(twebsite2+'roscms/search.php?search='+asearch+'&searchlang='+tWhere.substr(7, 2)); - } - } - } - else { - document.getElementById(tResults).style.display = "none"; - document.getElementById(tPicAnimation).style.display = "none"; - deleteItemList(); - } - } - - - function setCursor(mode) { - var pageBody = document.getElementsByTagName("body")[0]; - pageBody.style.cursor = mode; - } - - - - function makeRequest(url) { - - http_request = false; - - if (window.XMLHttpRequest) { // Mozilla, Safari,... - http_request = new XMLHttpRequest(); - if (http_request.overrideMimeType) { - http_request.overrideMimeType('text/xml'); - } - } else if (window.ActiveXObject) { // IE - try { - http_request = new ActiveXObject("Msxml2.XMLHTTP"); - } catch (e) { - try { - http_request = new ActiveXObject("Microsoft.XMLHTTP"); - } catch (e) {} - } - } - - if (!http_request) { - alert('Giving up :( Cannot create an XMLHTTP instance'); - return false; - } - http_request.onreadystatechange = showItemList; - http_request.open('GET', url, true); - http_request.send(null); - - } - - function showItemList() { - - if (http_request.readyState == 4) { - if (http_request.status == 200) { - - var lstData = ""; - - var xmldoc = http_request.responseXML; - var root_node = xmldoc.getElementsByTagName('root').item(0); - - if ((root_node.firstChild.data.search(/#none#/)) == -1) { - lstData = ""; - - // Table header: - if (tView == "table") { - lstData = writeItemList_style_header(); - } - else if (tView == "submit") { - lstData = write_compsubmit_header(); - } - else if (tView == "submit_vendor") { - lstData = write_vendorsubmit_header(); - } - - // XML schema: - if (tWhere == "comp") { - var items = http_request.responseXML.getElementsByTagName("item"); - var descs = http_request.responseXML.getElementsByTagName("desc"); - var vendo = http_request.responseXML.getElementsByTagName("vendor"); - } - else if (tWhere == "vendor") { - var vendo = http_request.responseXML.getElementsByTagName("vendor"); - var vendurl = http_request.responseXML.getElementsByTagName("url"); - } - else if (tWhere.substr(0, 6) == "roscms") { - var webcontent = http_request.responseXML.getElementsByTagName("content"); - } - - // Colors: - var colorcur=""; - var color1="#E2E2E2"; - var color2="#EEEEEE"; - var colorcounter=0; - - // XML length: - var xmllength=0; - if (tWhere == "comp") { - xmllength = items.length; - } - else if (tWhere == "vendor") { - xmllength = vendo.length; - } - else if (tWhere.substr(0, 6) == "roscms") { - xmllength = webcontent.length; - } - - // XML-Loop: - for (var i = 0; i < xmllength; i++) { - // Table colors: - colorcounter++; - if (colorcounter == "1") { - colorcur = color1; - } - else if (colorcounter == "2") { - colorcounter="0"; - colorcur = color2; - } - - // Table data: - if (tView == "table") { - lstData += writeItemList_style_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data, vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, descs[i].firstChild.data, colorcur); - } - else if (tView == "submit") { - lstData += write_compsubmit_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data, vendo[i].firstChild.data, colorcur); - } - else if (tView == "bar") { - lstData += write_bar_entry(items[i].getAttributeNode("id").value, items[i].firstChild.data); - } - else if (tView == "submit_vendor") { - lstData += write_vendorsubmit_entry(vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, vendurl[i].firstChild.data, colorcur); - } - else if (tView == "rosweb") { - lstData += write_rosweb_entry(webcontent[i].getAttributeNode("id").value, webcontent[i].firstChild.data); - } - - } - - // Table footer: - if (tView == "table") { - lstData += writeItemList_style_footer(); - } - else if (tView == "submit") { - lstData += writeItemList_style_footer(); - lstData += "<p>Click on an application in the list above or <a href=\"javascript://\" onclick=\"WizPag2()\">submit new application</a> to the database.</p>"; - } - else if (tView == "submit_vendor") { - lstData += writeItemList_style_footer(); - lstData += "<p>Click on a vendor name in the search result list above, choose a vendor from the <b><a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a></b> or <b><a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a></b> to the database.</p>"; - } - - if (tResults == "submitresult") { - enableButtonWizPageNext2(1); - } - - // HTML output: - document.getElementById(tResults).innerHTML = lstData; - } - else { - // No related database entries found: - if (tView == "table") { - document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p>"; - } - else if (tView == "bar") { - document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; - } - else if (tView == "submit") { - document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p><p><b><a href=\"javascript://\" onclick=\"WizPag2()\">Submit new application</a></b> to the database.</p>"; - enableButtonWizPageNext2(2); - } - else if (tView == "submit_vendor") { - document.getElementById(tResults).innerHTML = "<p>Your search - " + tSearch + " - did not match any database entries.</p><p>Choose a vendor from the <b><a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a></b> or <b><a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a></b> to the database.</p>"; - } - else if (tView == "rosweb") { - document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; - } - } - - // reset mouse cursor - setCursor('auto'); - - // reset loading picture: - document.getElementById(tPicAnimation).style.display = "none"; - - } - else { - alert('There was a problem with the request:\n' + http_request.statusText); - } - } - - } - ---> Removed:
branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js
(removed) @@ -1,144 +1,0 @@ -/* Smooth scrolling - Changes links that link to other parts of this page to scroll - smoothly to those links rather than jump to them directly, which - can be a little disorienting. - - sil,
http://www.kryogenix.org/
- - v1.0 2003-11-11 - v1.1 2005-06-16 wrap it up in an object -*/ - -var ss = { - fixAllLinks: function() { - // Get a list of all links in the page - var allLinks = document.getElementsByTagName('a'); - // Walk through the list - for (var i=0;i<allLinks.length;i++) { - var lnk = allLinks[i]; - if ((lnk.href && lnk.href.indexOf('#') != -1) && - ( (lnk.pathname == location.pathname) || - ('/'+lnk.pathname == location.pathname) ) && - (lnk.search == location.search)) { - // If the link is internal to the page (begins in #) - // then attach the smoothScroll function as an onclick - // event handler - ss.addEvent(lnk,'click',ss.smoothScroll); - } - } - }, - - smoothScroll: function(e) { - // This is an event handler; get the clicked on element, - // in a cross-browser fashion - if (window.event) { - target = window.event.srcElement; - } else if (e) { - target = e.target; - } else return; - - // Make sure that the target is an element, not a text node - // within an element - if (target.nodeName.toLowerCase() != 'a') { - target = target.parentNode; - } - - // Paranoia; check this is an A tag - if (target.nodeName.toLowerCase() != 'a') return; - - // Find the <a name> tag corresponding to this href - // First strip off the hash (first character) - anchor = target.hash.substr(1); - // Now loop all A tags until we find one with that name - var allLinks = document.getElementsByTagName('a'); - var destinationLink = null; - for (var i=0;i<allLinks.length;i++) { - var lnk = allLinks[i]; - if (lnk.name && (lnk.name == anchor)) { - destinationLink = lnk; - break; - } - } - - // If we didn't find a destination, give up and let the browser do - // its thing - if (!destinationLink) return true; - - // Find the destination's position - var destx = destinationLink.offsetLeft; - var desty = destinationLink.offsetTop; - var thisNode = destinationLink; - while (thisNode.offsetParent && - (thisNode.offsetParent != document.body)) { - thisNode = thisNode.offsetParent; - destx += thisNode.offsetLeft; - desty += thisNode.offsetTop; - } - - // Stop any current scrolling - clearInterval(ss.INTERVAL); - - cypos = ss.getCurrentYPos(); - - ss_stepsize = parseInt((desty-cypos)/ss.STEPS); - ss.INTERVAL = -setInterval('ss.scrollWindow('+ss_stepsize+','+desty+',"'+anchor+'")',10); - - // And stop the actual click happening - if (window.event) { - window.event.cancelBubble = true; - window.event.returnValue = false; - } - if (e && e.preventDefault && e.stopPropagation) { - e.preventDefault(); - e.stopPropagation(); - } - }, - - scrollWindow: function(scramount,dest,anchor) { - wascypos = ss.getCurrentYPos(); - isAbove = (wascypos < dest); - window.scrollTo(0,wascypos + scramount); - iscypos = ss.getCurrentYPos(); - isAboveNow = (iscypos < dest); - if ((isAbove != isAboveNow) || (wascypos == iscypos)) { - // if we've just scrolled past the destination, or - // we haven't moved from the last scroll (i.e., we're at the - // bottom of the page) then scroll exactly to the link - window.scrollTo(0,dest); - // cancel the repeating timer - clearInterval(ss.INTERVAL); - // and jump to the link directly so the URL's right - location.hash = anchor; - } - }, - - getCurrentYPos: function() { - if (document.body && document.body.scrollTop) - return document.body.scrollTop; - if (document.documentElement && document.documentElement.scrollTop) - return document.documentElement.scrollTop; - if (window.pageYOffset) - return window.pageYOffset; - return 0; - }, - - addEvent: function(elm, evType, fn, useCapture) { - // addEvent and removeEvent - // cross-browser event handling for IE5+, NS6 and Mozilla - // By Scott Andrew - if (elm.addEventListener){ - elm.addEventListener(evType, fn, useCapture); - return true; - } else if (elm.attachEvent){ - var r = elm.attachEvent("on"+evType, fn); - return r; - } else { - alert("Handler could not be removed"); - } - } -} - -ss.STEPS = 25; - -ss.addEvent(window,"load",ss.fixAllLinks); Removed:
branches/danny-web/reactos.org/htdocs/compat/style.css
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co…
============================================================================== ---
branches/danny-web/reactos.org/htdocs/compat/style.css
[iso-8859-1] (original) +++
branches/danny-web/reactos.org/htdocs/compat/style.css
(removed) @@ -1,383 +1,0 @@ -body { - font-family: Verdana; - 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; -} - -hr { - margin: 5px 0 5px 0; - color: #8D8D8D; -} - -address { - font-size: 9px; -} - -address p { - margin: 0; -} -address a { - font-size: 9px; - text-decoration:none; -} -address a:hover { - font-size: 9px; - text-decoration:underline; -} - - - -h1, .contentSmallTitle { - display: block; - line-height: normal; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - padding: 0px 0px 1px 10px; - margin-top: 0; -} -h1 a { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:none; -} -h1 a:hover { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:underline; -} - -h2 { - font-size: 22px; - color: #5984C3; - font-weight: bold; - margin-top: 15px; -} - -h3 { - font-size: 18px; - color: #5984C3; - font-weight: bold; - margin-top: 10px; -} - -h4 { - font-size: 16px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h5 { - font-size: 14px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h6 { - font-size: 12px; - color: #5984C3; - font-weight: bold; -} - -a { - font-size: 12px; - color: #006090; -} - -a:hover { - background-color: #DDEEFF; - color: #000000; -} - -/* set by the generator */ -a.extern { - background: url('
http://localhost/reactos.org/wiki/stylesheets/monobook/external.png
') no-repeat center right; - padding-right: 14px; -} - -#content, .contentSmall { - padding-right: 3px; - font-size: 12px; - text-align: justify; -} - -#content li { - list-style-image: url('
http://localhost/reactos.org/images/bullet.png
') -} - -#top { - margin: 0; - background: url('
http://localhost/reactos.org/support/images/logo_rsdb.jpg
') no-repeat scroll 35px 0; - padding: 103px 0 26px 0; - color: #FFFFFF; - text-align: right; -} - -#top a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} - -#top a:hover { - color: #000000; - background-color: #FFCC33; -} - -#topMenu { - font-size: 13px; - margin-left: 300px; - background-color: #5984C3; -} - -#topMenu p { - text-align: left; - margin: 0; -} - -#leftNav { - padding: 0px 10px 10px 7px; -} - -#rightNav { - padding: 0px 3px 0px 5px; - width: 270px; - line-height: 150%; -} - -#rightNav img { - border: 1px solid #000000; - height: 200px; - width: 266px; -} - -#leftNav ol { - margin: 0; - padding: 0; - list-style-type: none; - background-color: #EEEEEE; - border-top: #3F3849 0px solid; - border-right: #3F3849 1px solid; - border-left: #3F3849 1px solid; -} - -#leftNav ol li { - font-size: 13px; - font-weight: bold; - border-bottom: #3f3849 1px solid; -} - -#leftNav ol li a { - display: block; - width: 145px; - padding: 2px 4px 2px 4px; - - color: #3F3849; - text-decoration: none; - background-color: #EEEEEE; -} - -#leftNav ol li a:hover { - color: #000000; - background-color: #FFCC33; -} - -#leftNav ol li a.extern { - background: none; - padding-right: 0px; -} - -#leftNav .navTitle { - padding-left: 12px; - border-top: #3F3849 1px solid; - border-right: #3F3849 1px solid; - border-bottom: #3F3849 1px solid; - border-left: #3F3849 1px solid; - - font-weight: bold; - font-size: 14px; - color: #FFFFFF; - background-color: #5984c3; -} - -#leftNav .navBox { - text-align: center; - padding: 2px; - background-color: #EEEEEE; - border-right: 1px solid #3F3849; - border-bottom: 1px solid #3F3849; - border-left: 1px solid #3F3849; - font-size: 13px; -} - - -#bugzillaContent { - font-size: 12px; -} - -#bugzillaContent table { - font-size: 12px; -} - - - -#sectionMenu { - margin: 0; - font-size: 13px; - background-color: #5984C3; -} -#sectionMenu a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} -#sectionMenu a:hover { - color: #000000; - background-color: #FFCC33; -} - - -/* Maintainer Bar */ - -table.maintainer { - background-color: #ddddee; - padding:4px 8px; - border:1px solid #ccccdd; - text-align: Center; -} - -table.maintainer td { - background-color: #ddddee; - font-family: Verdana; - font-size: 15px; -} - -table.maintainer a { - font-size: 15px; -} - -table.maintainer a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Admin Bar */ - -table.admin { - background-color: #FEE3CB; - padding:4px 8px; - border:1px solid #FBBB95; - text-align: Center; -} - -table.admin td { - background-color: #FEE3CB; - font-family: Verdana; - font-size: 15px; -} - -table.admin a { - font-size: 15px; -} - -table.admin a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - -/* Message Bar */ - -table.message { - background-color: #FFCC00; - padding:4px 8px; - border: 1px solid #FF6600; - text-align: Center; -} - -table.message td { - background-color: #FFCC00; - font-family: Verdana; - font-size: 15px; -} - -table.message a { - font-size: 15px; -} - -table.message a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Forum Bar */ - -table.forumbar { - background-color: #99CCCC; - padding:4px 8px; - border: 1px solid #5984C3; - text-align: Center; -} - -table.forumbar td { - background-color: #DDEEFF; - font-family: Verdana; - font-size: 15px; -} - -table.forumbar a { - font-size: 15px; -} - -table.forumbar a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -.button -{ - background-color: #5984C3; color: white; - font-family: "verdana bitstream vera sans", verdana, sans-serif; font-size: 13px; - border-width:1px; border-style:solid; border-color: #C0C0C0; - font-weight: bold; padding: 0; -} - - - -UL.simple { - PADDING-RIGHT: 0px; - PADDING-LEFT: 20px; - PADDING-BOTTOM: 0px; - PADDING-TOP: 0px; - MARGIN: 0px 0px 1em; - LIST-STYLE-TYPE: none; - FONT-SIZE: 12px; -} -SPAN.simple { - font-size: 15px; - font-weight: bold; -} - - -
15 years, 9 months
1
0
0
0
[dgoette] 40251: branch compatability database for overhaul
by dgoette@svn.reactos.org
Author: dgoette Date: Thu Mar 26 13:58:15 2009 New Revision: 40251 URL:
http://svn.reactos.org/svn/reactos?rev=40251&view=rev
Log: branch compatability database for overhaul Added:
branches/danny-web/reactos.org/htdocs/compat/
- copied from r40250,
branches/danny-web/reactos.org/htdocs/support/
15 years, 9 months
1
0
0
0
[janderwald] 40250: - Remove dead code - Silence a few debug prints - Implement Dispatch_FastRead, Dispatch_fnFastDeviceIoControl - Change _InterlockedXXX to InterlockedXXX - Store IPortPinWaveCyclic pins in an array and close pin on a new create request (fixes a memory leak) - Complete the close irp when the stream has really been closed
by janderwald@svn.reactos.org
Author: janderwald Date: Thu Mar 26 12:59:45 2009 New Revision: 40250 URL:
http://svn.reactos.org/svn/reactos?rev=40250&view=rev
Log: - Remove dead code - Silence a few debug prints - Implement Dispatch_FastRead, Dispatch_fnFastDeviceIoControl - Change _InterlockedXXX to InterlockedXXX - Store IPortPinWaveCyclic pins in an array and close pin on a new create request (fixes a memory leak) - Complete the close irp when the stream has really been closed Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -50,15 +50,6 @@ DPRINT1("PcInitializeAdapterDriver\n"); -#if 0 - /* Set default stub - is this a good idea? */ - DPRINT1("Setting IRP stub\n"); - for ( i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i ++ ) - { - DriverObject->MajorFunction[i] = IrpStub; - } -#endif - /* Our IRP handlers */ DPRINT1("Setting IRP handlers\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = PcDispatchIrp; @@ -195,8 +186,6 @@ return STATUS_UNSUCCESSFUL; } - - return status; } @@ -241,6 +230,17 @@ /* the provided port driver doesnt support ISubdevice */ return STATUS_INVALID_PARAMETER; } + + /* get the subdevice descriptor */ + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get subdevice descriptor %x\n", Status); + SubDevice->lpVtbl->Release(SubDevice); + return STATUS_UNSUCCESSFUL; + } + + /* add an create item to the device header */ Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { @@ -249,17 +249,16 @@ DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } + + /* increment reference count */ SubDevice->lpVtbl->AddRef(SubDevice); - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &SubDeviceDescriptor); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get subdevice descriptor %x\n", Status); - SubDevice->lpVtbl->Release(SubDevice); - } - for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { + //FIXME + // Use a reference string such as Wave0001 / Topology0001 + // + Status = IoRegisterDeviceInterface(DeviceExt->PhysicalDeviceObject, &SubDeviceDescriptor->Interfaces[Index], NULL, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -49,7 +49,7 @@ Status = IoInitializeTimer(pDeviceObject, pTimerRoutine, pContext); if (!NT_SUCCESS(Status)) { - DPRINT("IoInitializeTimer failed with %x\n", Status); + DPRINT1("IoInitializeTimer failed with %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -94,8 +94,6 @@ return Status; } - - /* * @implemented */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -6,20 +6,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - //DPRINT1("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->DeviceIoControl(IrpTarget, DeviceObject, Irp); } @@ -29,20 +23,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnRead called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Read(IrpTarget, DeviceObject, Irp); } @@ -52,20 +40,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Write(IrpTarget, DeviceObject, Irp); } @@ -75,20 +57,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Flush(IrpTarget, DeviceObject, Irp); } @@ -98,24 +74,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnClose called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - ASSERT(CreateItem != NULL); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack != NULL); - ASSERT(IoStack->FileObject != NULL); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - - //DPRINT1("IrpTarget %p\n", IrpTarget); - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Close(IrpTarget, DeviceObject, Irp); } @@ -125,20 +91,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->QuerySecurity(IrpTarget, DeviceObject, Irp); } @@ -148,20 +108,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->SetSecurity(IrpTarget, DeviceObject, Irp); } @@ -178,10 +132,13 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); - - - return FALSE; + IIrpTarget * IrpTarget; + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)FileObject->FsContext2; + + /* let IrpTarget handle request */ + return IrpTarget->lpVtbl->FastDeviceIoControl(IrpTarget, FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); } @@ -197,10 +154,13 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); - - return FALSE; - + IIrpTarget * IrpTarget; + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)FileObject->FsContext2; + + /* let IrpTarget handle request */ + return IrpTarget->lpVtbl->FastRead(IrpTarget, FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } BOOLEAN @@ -216,10 +176,10 @@ PDEVICE_OBJECT DeviceObject) { IIrpTarget * IrpTarget; - //DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); - + + /* access IrpTarget */ IrpTarget = (IIrpTarget *)FileObject->FsContext2; - + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->FastWrite(IrpTarget, FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -112,9 +112,6 @@ DPRINT1("IDmaChannelSlave_AllocateBuffer free common buffer first \n"); return STATUS_UNSUCCESSFUL; } - - //FIXME - // retry with different size on failure This->Buffer = This->pAdapter->DmaOperations->AllocateCommonBuffer(This->pAdapter, BufferSize, &This->Address, FALSE); if (!This->Buffer) @@ -400,7 +397,7 @@ This->DmaStarted = FALSE; - return 0; + return STATUS_SUCCESS; } NTSTATUS @@ -493,7 +490,7 @@ IDmaChannelSlaveImpl * This; - DPRINT1("OutDmaChannel %p OuterUnknown %p PoolType %p DeviceDescription %p DeviceObject %p\n", + DPRINT("OutDmaChannel %p OuterUnknown %p PoolType %p DeviceDescription %p DeviceObject %p\n", OutDmaChannel, OuterUnknown, PoolType, DeviceDescription, DeviceObject); This = AllocateItem(PoolType, sizeof(IDmaChannelSlaveImpl), TAG_PORTCLASS); @@ -509,8 +506,6 @@ { DeviceDescription->InterfaceType = BusType; } - - DPRINT1("Calling IoGetDmaAdapter\n"); Adapter = IoGetDmaAdapter(DeviceExt->PhysicalDeviceObject, DeviceDescription, &MapRegisters); if (!Adapter) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -15,7 +15,7 @@ DPRINT("IDrmPort2_AddRef: This %p\n", This); - return _InterlockedIncrement(&This->ref); + return InterlockedIncrement(&This->ref); } ULONG @@ -25,7 +25,7 @@ { IDrmPort2Impl * This = (IDrmPort2Impl*)iface; - _InterlockedDecrement(&This->ref); + InterlockedDecrement(&This->ref); if (This->ref == 0) { @@ -51,13 +51,12 @@ IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = (PVOID)&This->lpVtbl; - _InterlockedIncrement(&This->ref); + InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } StringFromCLSID(refiid, Buffer); DPRINT1("IDrmPort2_QueryInterface no interface!!! iface %S\n", Buffer); - KeBugCheckEx(0, 0, 0, 0, 0); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -7,7 +7,8 @@ LONG ref; IPortWaveCyclic* Port; - IPortPinWaveCyclic * Pin; + IPortPinWaveCyclic ** Pins; + SUBDEVICE_DESCRIPTOR * Descriptor; }IPortFilterWaveCyclicImpl; @@ -69,7 +70,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -83,55 +84,58 @@ IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { - ISubdevice * ISubDevice; NTSTATUS Status; IPortPinWaveCyclic * Pin; - SUBDEVICE_DESCRIPTOR * Descriptor; PKSPIN_CONNECT ConnectDetails; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; ASSERT(This->Port); + ASSERT(This->Descriptor); + ASSERT(This->Pins); DPRINT("IPortFilterWaveCyclic_fnNewIrpTarget entered\n"); - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + /* let's verify the connection request */ + Status = PcValidateConnectRequest(Irp, &This->Descriptor->Factory, &ConnectDetails); if (!NT_SUCCESS(Status)) + { return STATUS_UNSUCCESSFUL; - - Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - if (!NT_SUCCESS(Status)) - return STATUS_UNSUCCESSFUL; - - Status = PcValidateConnectRequest(Irp, &Descriptor->Factory, &ConnectDetails); - if (!NT_SUCCESS(Status)) - { - ISubDevice->lpVtbl->Release(ISubDevice); - return STATUS_UNSUCCESSFUL; - } - - ISubDevice->lpVtbl->Release(ISubDevice); - + } + + if (This->Pins[ConnectDetails->PinId] && This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount) + { + /* release existing instance */ + This->Pins[ConnectDetails->PinId]->lpVtbl->Close(This->Pins[ConnectDetails->PinId], DeviceObject, NULL); + } + + /* now create the pin */ Status = NewPortPinWaveCyclic(&Pin); if (!NT_SUCCESS(Status)) { return Status; } - Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId]); + /* initialize the pin */ + Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &This->Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId]); if (!NT_SUCCESS(Status)) { Pin->lpVtbl->Release(Pin); return Status; } - /* store pin handle */ - This->Pin = Pin; + /* release existing pin */ + if (This->Pins[ConnectDetails->PinId]) + { + This->Pins[ConnectDetails->PinId]->lpVtbl->Release(This->Pins[ConnectDetails->PinId]); + } + /* store pin */ + This->Pins[ConnectDetails->PinId] = Pin; /* store result */ *OutTarget = (IIrpTarget*)Pin; /* increment current instance count */ - Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount++; + This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount++; return Status; } @@ -207,7 +211,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -216,10 +220,18 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("IPortFilterWaveCyclic_fnClose entered\n"); - - //FIXME - //close all pin instances + ULONG Index; + IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + if (This->Pins[Index]) + { + This->Pins[Index]->lpVtbl->Close(This->Pins[Index], DeviceObject, NULL); + } + + } + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -271,7 +283,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - + UNIMPLEMENTED return STATUS_SUCCESS; } @@ -291,6 +303,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { + UNIMPLEMENTED return STATUS_SUCCESS; } @@ -310,6 +323,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { + UNIMPLEMENTED return STATUS_SUCCESS; } @@ -323,12 +337,38 @@ IN IPortFilterWaveCyclic* iface, IN IPortWaveCyclic* Port) { + ISubdevice * ISubDevice; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; This->Port = Port; + /* get our private interface */ + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + /* get the subdevice descriptor */ + Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); + + /* release subdevice interface */ + ISubDevice->lpVtbl->Release(ISubDevice); + + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + /* save descriptor */ + This->Descriptor = Descriptor; + + /* allocate pin array */ + This->Pins = AllocateItem(NonPagedPool, Descriptor->Factory.PinDescriptorCount * sizeof(IPortPinWaveCyclic*), TAG_PORTCLASS); + + if (!This->Pins) + return STATUS_UNSUCCESSFUL; + /* increment reference count */ - iface->lpVtbl->AddRef(iface); + Port->lpVtbl->AddRef(Port); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -178,8 +178,6 @@ ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); (void)InterlockedIncrement((volatile long*)&This->NumMappings); - - if (Irp) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -30,6 +30,7 @@ ULONG DelayedRequestInProgress; ULONG FrameSize; BOOL Capture; + PIRP CloseIrp; }IPortPinWaveCyclicImpl; @@ -242,7 +243,7 @@ Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT1("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, This->CommonBufferSize, BufferSize); + DPRINT("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, This->CommonBufferSize, BufferSize); if (Position < This->CommonBufferOffset) { @@ -616,29 +617,25 @@ IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { - PMINIPORTWAVECYCLICSTREAM Stream = (PMINIPORTWAVECYCLICSTREAM)Context; - - DPRINT("CloseStreamRoutine %p\n", Stream); - Stream->lpVtbl->Release(Stream); -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -IPortPinWaveCyclic_fnClose( - IN IPortPinWaveCyclic* iface, - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ + PMINIPORTWAVECYCLICSTREAM Stream; + NTSTATUS Status; ISubdevice *ISubDevice; - NTSTATUS Status; - SUBDEVICE_DESCRIPTOR * Descriptor; - PIO_WORKITEM WorkItem; - - IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - DPRINT1("IPortPinWaveCyclic_fnClose\n"); + PSUBDEVICE_DESCRIPTOR Descriptor; + + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)Context; + + if (This->Stream) + { + if (This->State != KSSTATE_STOP) + { + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); + KeStallExecutionProcessor(10); + } + } + + This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); + This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); + This->DmaChannel->lpVtbl->Release(This->DmaChannel); Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); if (NT_SUCCESS(Status)) @@ -648,39 +645,73 @@ { ISubDevice->lpVtbl->Release(ISubDevice); Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; - DPRINT1("InstanceCount %u\n", Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount); } } + if (This->Format) + { + ExFreePool(This->Format); + This->Format = NULL; + } + + if (This->IrpQueue) + { + This->IrpQueue->lpVtbl->Release(This->IrpQueue); + } if (This->Stream) { - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - } - - This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); - This->DmaChannel->lpVtbl->Release(This->DmaChannel); - - if (This->Format) - ExFreePool(This->Format); - - This->IrpQueue->lpVtbl->Release(This->IrpQueue); - + Stream = This->Stream; + This->Stream = NULL; + + if (This->CloseIrp) + { + This->CloseIrp->IoStatus.Information = 0; + This->CloseIrp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(This->CloseIrp, IO_NO_INCREMENT); + } + Stream->lpVtbl->Release(Stream); + /* this line is never reached */ + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnClose( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_WORKITEM WorkItem; + + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; if (This->Stream) { WorkItem = IoAllocateWorkItem(DeviceObject); if (WorkItem) { - IoQueueWorkItem(WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This->Stream); + if (Irp) + { + This->CloseIrp = Irp; + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + } + IoQueueWorkItem(WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + return STATUS_PENDING; } } - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - + if (Irp) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -598,7 +598,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSUFFICIENT_RESOURCES; } - DPRINT1("Queueing IRP %p\n", Irp); + DPRINT1("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_PENDING; IoMarkIrpPending(Irp);
15 years, 9 months
1
0
0
0
[jmorlan] 40249: - Add another heap freelist for small blocks, making mingw32-make about 100 times faster at loading makefile.auto
by jmorlan@svn.reactos.org
Author: jmorlan Date: Thu Mar 26 09:32:14 2009 New Revision: 40249 URL:
http://svn.reactos.org/svn/reactos?rev=40249&view=rev
Log: - Add another heap freelist for small blocks, making mingw32-make about 100 times faster at loading makefile.auto Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=40249&r…
============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Mar 26 09:32:14 2009 @@ -105,12 +105,12 @@ /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) -#define HEAP_NB_FREE_LISTS 4 /* Number of free lists */ +#define HEAP_NB_FREE_LISTS 5 /* Number of free lists */ /* Max size of the blocks on the free lists */ static const DWORD HEAP_freeListSizes[HEAP_NB_FREE_LISTS] = { - 0x20, 0x80, 0x200, ~0UL + 0x10, 0x20, 0x80, 0x200, ~0UL }; typedef struct
15 years, 9 months
1
0
0
0
[jmorlan] 40248: - Fix a buffer overflow in cmd - Make "CMD /C" clean up before exiting to get rid of spurious "memory leak" debug messages
by jmorlan@svn.reactos.org
Author: jmorlan Date: Thu Mar 26 09:31:46 2009 New Revision: 40248 URL:
http://svn.reactos.org/svn/reactos?rev=40248&view=rev
Log: - Fix a buffer overflow in cmd - Make "CMD /C" clean up before exiting to get rid of spurious "memory leak" debug messages Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4…
============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Mar 26 09:31:46 2009 @@ -335,7 +335,7 @@ need rewrite some code to use cmd_realloc when it need instead of add 512bytes extra */ - first = cmd_alloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); + first = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (first == NULL) { error_out_of_memory(); @@ -343,7 +343,7 @@ return FALSE; } - rest = cmd_alloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); + rest = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (rest == NULL) { cmd_free (first); @@ -1540,7 +1540,7 @@ { PARSED_COMMAND *Cmd; - do + while (!bCanExit || !bExit) { Cmd = ParseCommand(NULL); if (!Cmd) @@ -1549,7 +1549,6 @@ ExecuteCommand(Cmd); FreeCommand(Cmd); } - while (!bCanExit || !bExit); return nErrorLevel; } @@ -1891,7 +1890,7 @@ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); ParseCommandLine(commandline); if (option != _T('K')) - cmd_exit(nErrorLevel); + bExit = TRUE; } }
15 years, 9 months
1
0
0
0
[tkreuzer] 40247: Fix compilation of freeldr. (a number of ULONG / ULONG_PTR issues, remove LoadReactOSSetup2 for non-x86 builds
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Mar 26 07:57:19 2009 New Revision: 40247 URL:
http://svn.reactos.org/svn/reactos?rev=40247&view=rev
Log: Fix compilation of freeldr. (a number of ULONG / ULONG_PTR issues, remove LoadReactOSSetup2 for non-x86 builds Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -124,8 +124,10 @@ } else if (_stricmp(SettingValue, "ReactOSSetup2") == 0) { +#ifdef __i386__ // WinLdr-style boot LoadReactOSSetup2(); +#endif } #endif #ifdef __i386__ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -18,6 +18,8 @@ <file>setupldr.c</file> </directory> <directory name="windows"> - <file>setupldr2.c</file> + <if property="ARCH" value="i386"> + <file>setupldr2.c</file> + </if> </directory> </module> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -406,7 +406,7 @@ if (SizeOfRawData < VirtualSize) { DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); - RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); + RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG_PTR)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); } SectionHeader++; @@ -421,7 +421,7 @@ /* Relocate the image, if it needs it */ - if (NtHeaders->OptionalHeader.ImageBase != (ULONG)VirtualBase) + if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) { DPRINTM(DPRINT_PELOADER, "Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); @@ -528,7 +528,7 @@ /* AddressOfData in thunk entry will become a virtual address (from relative) */ //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); ThunkData->u1.AddressOfData = - (ULONG)RVA(ImageBase, ThunkData->u1.AddressOfData); + (ULONG_PTR)RVA(ImageBase, ThunkData->u1.AddressOfData); //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); } @@ -630,11 +630,11 @@ FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); /* Save a pointer to the function */ - ThunkData->u1.Function = (ULONG)RVA(DllBase, FunctionTable[Ordinal]); + ThunkData->u1.Function = (ULONG_PTR)RVA(DllBase, FunctionTable[Ordinal]); /* Is it a forwarder? (function pointer isn't within the export directory) */ - if (((ULONG)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG)ExportDirectory) && - ((ULONG)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG)ExportDirectory + ExportSize))) + if (((ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG_PTR)ExportDirectory + ExportSize))) { PLDR_DATA_TABLE_ENTRY DataTableEntry; CHAR ForwardDllName[255]; @@ -685,7 +685,7 @@ ImportByName->Hint = 0; /* And finally point ThunkData's AddressOfData to that structure */ - RefThunkData.u1.AddressOfData = (ULONG)ImportByName; + RefThunkData.u1.AddressOfData = (ULONG_PTR)ImportByName; /* And recursively call ourselves */ Status = WinLdrpBindImportName( Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -432,7 +432,7 @@ CHAR BootOptions[256]; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; - ULONG SectionId; + ULONG_PTR SectionId; ULONG BootDevice; PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; KERNEL_ENTRY_POINT KiSystemStartup;
15 years, 9 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
49
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
Results per page:
10
25
50
100
200