Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[fireball] 40331: - NtGdiSetDIBitsToDeviceInternal: use bitmap's palette if it exists instead of always using system palette. Based on a patch by Evgeniy Boltik from bug 4326. See issue #4326 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 2 21:25:56 2009 New Revision: 40331 URL: http://svn.reactos.org/svn/reactos?rev=40331&view=rev Log: - NtGdiSetDIBitsToDeviceInternal: use bitmap's palette if it exists instead of always using system palette. Based on a patch by Evgeniy Boltik from bug 4326. See issue #4326 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Apr 2 21:25:56 2009 @@ -437,6 +437,7 @@ PDC pDC; HBITMAP hSourceBitmap = NULL; SURFOBJ *pDestSurf, *pSourceSurf = NULL; + SURFACE *pSurf; RECTL rcDest; POINTL ptSource; INT DIBWidth; @@ -476,13 +477,18 @@ return 0; } + /* Use destination palette obtained from the DC by default */ + DDBPalette = pDC->ppdev->DevInfo.hpalDefault; + + /* Try to use hDIBPalette if it exists */ + pSurf = SURFACE_LockSurface(pDC->rosdc.hBitmap); + if (pSurf && pSurf->hDIBPalette) + { + DDBPalette = pSurf->hDIBPalette; + SURFACE_UnlockSurface(pSurf); + } + pDestSurf = EngLockSurface((HSURF)pDC->rosdc.hBitmap); - if (!pDestSurf) - { - /* FIXME: SetLastError ? */ - DC_UnlockDc(pDC); - return 0; - } rcDest.left = XDest; rcDest.top = YDest; @@ -521,8 +527,8 @@ goto Exit; } - /* Obtain destination palette from the DC */ - pDCPalette = PALETTE_LockPalette(pDC->ppdev->DevInfo.hpalDefault); + /* Obtain destination palette */ + pDCPalette = PALETTE_LockPalette(DDBPalette); if (!pDCPalette) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -531,7 +537,6 @@ } DDBPaletteType = pDCPalette->Mode; - DDBPalette = pDC->ppdev->DevInfo.hpalDefault; PALETTE_UnlockPalette(pDCPalette); DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType);

15 years, 9 months

[dgoette] 40330: finish: converting database calls to pdo

by dgoette＠svn.reactos.org

15 years, 9 months

[fireball] 40329: - Simplify code. Inspired by Evgeniy Boltik's patch. See issue #4326 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 2 20:34:11 2009 New Revision: 40329 URL: http://svn.reactos.org/svn/reactos?rev=40329&view=rev Log: - Simplify code. Inspired by Evgeniy Boltik's patch. See issue #4326 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Thu Apr 2 20:34:11 2009 @@ -233,6 +233,7 @@ BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo) { + ULONG Color; LONG i, j, sx, sy = BltInfo->SourcePoint.y; switch ( BltInfo->SourceSurface->iBitmapFormat ) @@ -247,12 +248,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -265,12 +262,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -283,12 +276,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -301,12 +290,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -319,12 +304,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++;

15 years, 9 months

[gedmurphy] 40328: Pretend to open folders in a new window... I say pretend because it doesn't actually work as it should it just maximizes them, but it gives the illusion that it does and that's good enough for now as it's not worth fixing.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Apr 2 19:06:04 2009 New Revision: 40328 URL: http://svn.reactos.org/svn/reactos?rev=40328&view=rev Log: Pretend to open folders in a new window... I say pretend because it doesn't actually work as it should it just maximizes them, but it gives the illusion that it does and that's good enough for now as it's not worth fixing. Modified: trunk/reactos/base/shell/explorer/explorer-cfg-template.xml Modified: trunk/reactos/base/shell/explorer/explorer-cfg-template.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cfg-template.xml [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cfg-template.xml [iso-8859-1] Thu Apr 2 19:06:04 2009 @@ -2,7 +2,7 @@ <explorer-cfg> <general> <look-and-feel name="classic"/> - <explorer mdi="true" separate-folders="true"/> + <explorer mdi="true" separate-folders="false"/> <language name="EN"/> </general>

15 years, 9 months

[gedmurphy] 40327: Stop mithering me and just open the MDI shell browser by default.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Apr 2 18:59:18 2009 New Revision: 40327 URL: http://svn.reactos.org/svn/reactos?rev=40327&view=rev Log: Stop mithering me and just open the MDI shell browser by default. Modified: trunk/reactos/base/shell/explorer/explorer.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Thu Apr 2 18:59:18 2009 @@ -723,16 +723,7 @@ g_Globals._prescan_nodes = false; - XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); - XS_String mdiStr = XMLString(explorer_options, "mdi"); - - // If there isn't yet the "mdi" setting in the configuration, display the MDI/SDI dialog. - if (mdiStr.empty()) - Dialog::DoModal(IDD_MDI_SDI, WINDOW_CREATOR(MdiSdiDlg), g_Globals._hwndDesktop); - - // Now read the MDI attribute again and interpret it as boolean value. - cmd._mdi = XMLBool(explorer_options, "mdi", true); - + cmd._mdi = true; cmd._cmdShow = cmdShow; // parse command line options, which may overwrite the MDI flag

15 years, 9 months

[dgoette] 40326: remove parts of the supportDB that are not part of the compatDB

by dgoette＠svn.reactos.org

Author: dgoette Date: Thu Apr 2 13:03:34 2009 New Revision: 40326 URL: http://svn.reactos.org/svn/reactos?rev=40326&view=rev Log: remove parts of the supportDB that are not part of the compatDB Removed: branches/danny-web/reactos.org/htdocs/compat/inc/devnet/ branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php branches/danny-web/reactos.org/htdocs/compat/inc/media/ branches/danny-web/reactos.org/htdocs/compat/inc/media.php branches/danny-web/reactos.org/htdocs/compat/inc/pack/ branches/danny-web/reactos.org/htdocs/compat/inc/pack.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php Modified: 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_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_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/sub/tree_category_com… branches/danny-web/reactos.org/htdocs/compat/inc/home.php branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php branches/danny-web/reactos.org/htdocs/compat/inc/structure.php branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php branches/danny-web/reactos.org/htdocs/compat/index.php branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -43,7 +43,7 @@ echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); ?> <p>Bugzilla integration is still on the TODO list ... </p> 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -42,7 +42,7 @@ if ($result_page['comp_id']) { echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_id = :group_id"); $stmt->bindParam('group_id',$result_page['comp_groupid'],PDO::PARAM_STR); 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -44,7 +44,7 @@ echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo "<br />"; echo forum_bar(); 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -49,7 +49,7 @@ } else { - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo "<h3>Submit Screenshot</h3>"; 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -42,7 +42,7 @@ if ($result_page['comp_id']) { echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -44,7 +44,7 @@ echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo test_bar(); ?> 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -50,7 +50,7 @@ } else { - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo "<h3>Submit a Report - Step 3</h3>"; 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… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -40,7 +40,7 @@ $result_page = $stmt->fetch(PDO::FETCH_ASSOC); - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -52,12 +52,7 @@ if ($result_count_cat[0]) { - if ($RSDB_intern_code_view_shortname == "devnet") { - $RSDB_TEMP_sortby = "cat_order"; - } - else { $RSDB_TEMP_sortby = "cat_name"; - } Removed: branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php (removed) @@ -1,54 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > - -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/devnet/devnet_home.php"); - break; - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - } - -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/home.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/home.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -46,17 +46,5 @@ <?php echo $RSDB_langres['CONTENT_compdb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_comp; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> </p> -<h3><?php echo $RSDB_langres['TEXT_packdb']; ?></h3> -<p> - <?php echo $RSDB_langres['CONTENT_packdb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_pack; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> - -<h3><?php echo $RSDB_langres['TEXT_devnet']; ?></h3> -<p> <?php echo $RSDB_langres['CONTENT_devnet_description']; ?> - <a href="<?php echo $RSDB_intern_link_db_view_devnet; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> -<h3><?php echo $RSDB_langres['TEXT_mediadb']; ?></h3> -<p><?php echo $RSDB_langres['CONTENT_mediadb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_media; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> <p> </p> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -58,13 +58,6 @@ $RSDB_langres['TEXT_compdb'] = 'Compatibility Database'; $RSDB_langres['TEXT_compdb_short'] = 'Compatibility'; - $RSDB_langres['TEXT_packdb'] = 'Package Database'; - $RSDB_langres['TEXT_packdb_short'] = 'Packages'; - $RSDB_langres['TEXT_devnet'] = 'Developer Network'; - $RSDB_langres['TEXT_devnet_short'] = 'Dev Network'; - $RSDB_langres['TEXT_devnet_long'] = 'ReactOS Developer Network'; - $RSDB_langres['TEXT_mediadb'] = 'Media Database'; - $RSDB_langres['TEXT_mediadb_short'] = 'Media'; $RSDB_langres['TEXT_about_rsdb'] = 'About the ReactOS Support Database'; $RSDB_langres['TEXT_credits'] = 'Credits'; @@ -78,14 +71,6 @@ $RSDB_langres['CONTENT_about_short'] = 'The ReactOS Support Database is a free service of the ReactOS Foundation.'; $RSDB_langres['CONTENT_compdb_description'] = 'ReactOS Software and Hardware Compatibility Database.'; - $RSDB_langres['CONTENT_packdb_description'] = 'ReactOS Package Database, the official online database for the ReactOS Package Manager.'; - $RSDB_langres['CONTENT_devnet_description'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals.<br /><br /> - The ReactOS Developer Network (RosDevNet or RDN) Library is the essential reference - for developers, with technical programming information, including sample code, - documentation, technical articles, the ReactOS Developer Knowledge Base, and - anything else you might need to develop solutions for ReactOS (or compatible).'; - $RSDB_langres['CONTENT_devnet_description_short'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals'; - $RSDB_langres['CONTENT_mediadb_description'] = 'ReactOS Media Database, ReactOS related media files stored in a huge database.'; $RSDB_langres['CONTENT_about_rsdb'] = 'The ReactOS Support Database (application and driver compatibility, application packages, developer network and media files) is a free service of the ReactOS Modified: branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -58,13 +58,6 @@ $RSDB_langres['TEXT_compdb'] = 'Compatibility Database'; $RSDB_langres['TEXT_compdb_short'] = 'Compatibility'; - $RSDB_langres['TEXT_packdb'] = 'Package Database'; - $RSDB_langres['TEXT_packdb_short'] = 'Packages'; - $RSDB_langres['TEXT_devnet'] = 'Developer Network'; - $RSDB_langres['TEXT_devnet_short'] = 'Dev Network'; - $RSDB_langres['TEXT_devnet_long'] = 'ReactOS Developer Network'; - $RSDB_langres['TEXT_mediadb'] = 'Media Database'; - $RSDB_langres['TEXT_mediadb_short'] = 'Media'; $RSDB_langres['TEXT_about_rsdb'] = 'About the ReactOS Support Database'; $RSDB_langres['TEXT_credits'] = 'Credits'; @@ -78,14 +71,6 @@ $RSDB_langres['CONTENT_about_short'] = 'The ReactOS Support Database is a free service of the ReactOS Foundation.'; $RSDB_langres['CONTENT_compdb_description'] = 'ReactOS Software and Hardware Compatibility Database.'; - $RSDB_langres['CONTENT_packdb_description'] = 'ReactOS Package Database, the official online database for the ReactOS Package Manager.'; - $RSDB_langres['CONTENT_devnet_description'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals.<br /><br /> - The ReactOS Developer Network (RosDevNet or RDN) Library is the essential reference - for developers, with technical programming information, including sample code, - documentation, technical articles, the ReactOS Developer Knowledge Base, and - anything else you might need to develop solutions for ReactOS (or compatible).'; - $RSDB_langres['CONTENT_devnet_description_short'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals'; - $RSDB_langres['CONTENT_mediadb_description'] = 'ReactOS Media Database, ReactOS related media files stored in a huge database.'; $RSDB_langres['CONTENT_about_rsdb'] = 'The ReactOS Support Database (application and driver compatibility, application packages, developer network and media files) is a free service of the ReactOS Removed: branches/danny-web/reactos.org/htdocs/compat/inc/media.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/media.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/media.php (removed) @@ -1,54 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > - -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/media/media_home.php"); - break; - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - } - -?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/pack.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/pack.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/pack.php (removed) @@ -1,57 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > - -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/pack/pack_home.php"); - break; - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - case "vendor": // Vendor/Company - include("inc/tree/tree_vendor.php"); - break; - } - -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/structure.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/structure.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/structure.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -72,24 +72,10 @@ </ol></div> <p></p> <?php - if ($RSDB_SET_view == "comp" || $RSDB_SET_view == "pack" || $RSDB_SET_view == "devnet" || $RSDB_SET_view == "media") { + if ($RSDB_SET_view == "comp") { ?> <div class="navTitle"><?php - if ($RSDB_SET_view == "comp") { echo "Compatibility"; - } - if ($RSDB_SET_view == "") { - echo "Compatibility"; - } - if ($RSDB_SET_view == "pack") { - echo "Packages"; - } - if ($RSDB_SET_view == "devnet") { - echo "Dev Network"; - } - if ($RSDB_SET_view == "media") { - echo "Media"; - } ?></div> <ol> <li><a href="<?php echo $RSDB_intern_link_view_EX."home".$RSDB_URI_slash; ?>">Overview</a></li> @@ -100,12 +86,12 @@ <li><a href="<?php echo $RSDB_intern_link_category_EX."0".$RSDB_URI_slash; ?>"> - By Category</a></li> <li><a href="<?php echo $RSDB_intern_link_name_letter_EX."all".$RSDB_URI_slash; ?>"> - By Name</a></li> <?php - if ($RSDB_SET_view == "comp" || $RSDB_SET_view == "pack") { + if ($RSDB_SET_view == "comp") { ?> <li><a href="<?php echo $RSDB_intern_link_vendor_letter_EX."all".$RSDB_URI_slash; ?>"> - By Vendor</a></li> <?php } - if ($RSDB_SET_view == "comp" || $RSDB_SET_view == "pack") { + if ($RSDB_SET_view == "comp") { ?> <li><a href="<?php echo $RSDB_intern_link_rank_EX."rank".$RSDB_URI_slash; ?>"> - By Rank</a></li> <?php Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -45,7 +45,7 @@ // echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; -// include('inc/tree/tree_item_menubar.php'); +// include("inc/comp/comp_item_menubar.php"); echo "<h3>Submit a forum post</h3>"; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -53,7 +53,7 @@ include("inc/comp/comp_itemver_submit.php"); } else { - include("inc/tree/tree_group.php"); + include("inc/comp/comp_group.php"); } } else { @@ -66,7 +66,7 @@ include("inc/tree/tree_category_tree.php"); break; } - include("inc/tree/tree_category_grouplist.php"); + include("inc/tree/tree_category_grouplist_1.php"); } } Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -49,12 +49,7 @@ if ($result_count_cat[0]) { - if ($RSDB_intern_code_view_shortname == "devnet") { - $RSDB_TEMP_sortby = "cat_order"; - } - else { $RSDB_TEMP_sortby = "cat_name"; - } ?> <table width="100%" border="0" cellpadding="1" cellspacing="1"> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… (removed) @@ -1,52 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: - include("inc/tree/tree_category_grouplist_1.php"); - break; - case "pack": // Packages - include("inc/tree/tree_category_grouplist_1.php"); - break; - case "devnet": // Developer Network - include("inc/tree/tree_category_grouplist_2.php"); - break; - case "media": // Media - include("inc/tree/tree_category_grouplist_2.php"); - break; - } -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -45,17 +45,8 @@ <tr bgcolor="#5984C3"> <td width="20%" title="Item"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong><?php - switch ($RSDB_SET_view) { - case "comp": // Compatibility + echo "Application"; - break; - case "pack": // Packages - echo "Package"; - break; - default: - echo "Name"; - break; - } ?></strong></font></div></td> <td width="15%" title="Company/Vendor/Project"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Vendor</strong></font></div></td> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… (removed) @@ -1,128 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - -$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . ""); -$stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); -$stmt->execute(); -$result_count_groups = $stmt->fetch(PDO::FETCH_NUM); -if ($result_count_groups[0]) { - -?> - <table width="100%" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="20%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Name</strong></font></div></td> - <td width="50%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> - <td width="10%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Pages</strong></font></div></td> - <td width="20%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Rating Ø </strong></font></div></td> - </tr> - <?php - - $stmt=CDBConnecion::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_order ASC"); - $stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); - $stmt->execute(); - - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; - $zaehler="0"; - - while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages - ?> - <tr> - <td valign="top" bgcolor="<?php - $zaehler++; - if ($zaehler == "1") { - echo $farbe1; - $farbe = $farbe1; - } - elseif ($zaehler == "2") { - $zaehler="0"; - echo $farbe2; - $farbe = $farbe2; - } - ?>" > <div align="left"><font size="2" face="Arial, Helvetica, sans-serif"><a href="<?php echo $RSDB_intern_link_group.$result_page['grpentr_id']; ?>"><?php echo $result_page['grpentr_name']; ?></a></font></div></td> - <td valign="top" bgcolor="<?php echo $farbe; ?>"><font size="2"><?php - - if (strlen(htmlentities($result_page['grpentr_description'], ENT_QUOTES)) <= 30) { - echo $result_page['grpentr_description']; - } - else { - echo substr(htmlentities($result_page['grpentr_description'], ENT_QUOTES), 0, 30)."..."; - } - - ?></font></td> - <td valign="top" bgcolor="<?php echo $farbe; ?>"><div align="center"><font size="2"> - <?php - - $counter_stars_install_sum = 0; - $counter_stars_function_sum = 0; - $counter_stars_user_sum = 0; - - $counter_items = 0; - - $stmt_item=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_".$RSDB_intern_code_view_shortname." WHERE ".$RSDB_intern_code_view_shortname."_groupid = :group_id AND ".$RSDB_intern_code_view_shortname."_visible` = '1' ORDER BY ".$RSDB_intern_code_view_shortname."_groupid DESC"); - $stmt_item->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); - $stmt_item->execute(); - while($result_group_sum_items = $stmt_item->fetch(PDO::FETCH_ASSOC)) { - $counter_items++; - $stmt_tests=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM ".$RSDB_intern_code_view_shortname."_item_".$RSDB_intern_code_view_shortname."_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id ORDER BY test_comp_id ASC"); - $stmt_tests->bindParam('comp_id',$result_group_sum_items[$RSDB_intern_code_view_shortname.'_id'],PDO::PARAM_STR); - $stmt_tests->execute(); - $tmp=$stmt_tests->fetch(PDO::FETCH_ASSOC); - - $counter_stars_install_sum += $tmp['install_sum']; - $counter_stars_function_sum += $tmp['function_sum']; - $counter_stars_user_sum += $tmp['user_sum']; - } - echo $counter_items; - - ?> - </font></div></td> - <td valign="top" bgcolor="<?php echo $farbe; ?>"><div align="left"><font size="2"> - <?php - - echo draw_stars_small($counter_stars_function_sum, $counter_stars_user_sum, 5, "") . " (".$counter_stars_user_sum.")"; - - ?> - </font></div></td> - </tr> - <?php - } // end while - ?> - </table> -<?php -} -?> - Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -51,12 +51,7 @@ if ($result_count_cat[0]) { - if ($RSDB_intern_code_view_shortname == "devnet") { - $RSDB_TEMP_sortby = "cat_order"; - } - else { $RSDB_TEMP_sortby = "cat_name"; - } ?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php (removed) @@ -1,52 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: - include("inc/comp/comp_group.php"); - break; - case "pack": // Packages - include("inc/pack/pack_group.php"); - break; - case "devnet": // Developer Network - include("inc/devnet/devnet_group.php"); - break; - case "media": // Media - include("inc/media/media_group.php"); - break; - } -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -37,7 +37,7 @@ -// echo "Comp: ".$RSDB_intern_trigger_comp." | Pack:".$RSDB_intern_trigger_pack." | DevNet:".$RSDB_intern_trigger_devnet." | Media:".$RSDB_intern_trigger_media; +// echo "Comp: ".$RSDB_intern_trigger_comp."; // echo "<br>".$RSDB_intern_code_db_rsdb_categories; $RSDB_viewpage = true; @@ -185,21 +185,7 @@ $result_current_group = $stmt->fetch(PDO::PARAM_STR); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_item2_id_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group[$RSDB_intern_code_view_shortname .'_name']; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: echo " ["."ReactOS ".show_osversion($result_current_group['comp_osversion'])."]"; - break; - case "pack": // Packages - echo " [".$result_current_group['pack_rosversion']."]"; - break; - case "devnet": // Developer Network - echo " [rev. ".$result_current_group['devnet_version']."]"; - break; - case "media": // Media - echo " [".$result_current_group['media_version']."]"; - break; - } echo "</a>"; } @@ -295,21 +281,7 @@ $result_current_group = $stmt->fetch(PDO::FETCH_ASSOC); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_item_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group[$RSDB_intern_code_view_shortname .'_name']; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: echo " ["."ReactOS ".show_osversion($result_current_group['comp_osversion'])."]"; - break; - case "pack": // Packages - echo " [".$result_current_group['pack_rosversion']."]"; - break; - case "devnet": // Developer Network - echo " [rev. ".$result_current_group['devnet_version']."]"; - break; - case "media": // Media - echo " [".$result_current_group['media_version']."]"; - break; - } echo "</a>"; } @@ -596,22 +568,5 @@ } - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: //msg_bar("Compatibility"); - break; - case "pack": // Packages - msg_bar("The Package Section is under heavy construction!"); - echo "<br />"; - break; - case "devnet": // Developer Network - msg_bar("The Dev Network Section is under heavy construction!"); - echo "<br />"; - break; - case "media": // Media - msg_bar("The Media Section is under heavy construction!"); - echo "<br />"; - break; - } ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -35,9 +35,6 @@ - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: switch ($RSDB_SET_item2) { case "details": // Details default: @@ -85,16 +82,5 @@ include('inc/comp/comp_item_tips.php'); break; } - break; - case "pack": // Packages - include('inc/pack/pack_item.php'); - break; - case "devnet": // Developer Network - include('inc/devnet/devnet_item.php'); - break; - case "media": // Media - include('inc/media/media_item.php'); - break; - } ?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php (removed) @@ -1,52 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: - include("inc/comp/comp_item_menubar.php"); - break; - case "pack": // Packages - include("inc/pack/pack_item_menubar.php"); - break; - case "devnet": // Developer Network - //include("inc/devnet/devnet_item_menubar.php"); - break; - case "media": // Media - //include("inc/media/media_item_menubar.php"); - break; - } -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -48,9 +48,6 @@ if ($RSDB_SET_cat != "" && $RSDB_SET_item =="" && $RSDB_SET_group =="") { if ($RSDB_SET_cat == 0) { $result_count_group['cat_comp']=1; - $result_count_group['cat_pack']=1; - $result_count_group['cat_devnet']=1; - $result_count_group['cat_media']=1; } else { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1'"); @@ -63,21 +60,9 @@ else { if ($RSDB_SET_item != "") { $result_count_group['item_comp']=0; - $result_count_group['item_pack']=0; - $result_count_group['item_devnet']=0; - $result_count_group['item_media']=0; if ($RSDB_SET_view == "comp") { $result_count_group['item_comp']=1; - } - if ($RSDB_SET_view == "pack") { - $result_count_group['item_pack']=1; - } - if ($RSDB_SET_view == "devnet") { - $result_count_group['item_devnet']=1; - } - if ($RSDB_SET_view == "media") { - $result_count_group['item_media']=1; } $RSDB_compare_string = 'item'; } @@ -95,27 +80,6 @@ else { echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_compdb_short'] .' </font>'; } - echo ' <font color="#ffffff">|</font> '; - if ($result_count_group[$RSDB_compare_string."_pack"] == "1") { - echo '<a href="'. $RSDB_intern_link_db_view2 .'pack">'. $RSDB_langres['TEXT_packdb_short'] .'</a>'; - } - else { - echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_packdb_short'] .' </font>'; - } - echo ' <font color="#ffffff">|</font> '; - if ($result_count_group[$RSDB_compare_string."_devnet"] == "1") { - echo '<a href="'. $RSDB_intern_link_db_view2 .'devnet">'. $RSDB_langres['TEXT_devnet_short'] .'</a>'; - } - else { - echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_devnet_short'] .' </font>'; - } - echo ' <font color="#ffffff">|</font> '; - if ($result_count_group[$RSDB_compare_string."_media"] == "1") { - echo '<a href="'. $RSDB_intern_link_db_view2 .'media">'. $RSDB_langres['TEXT_mediadb_short'] .'</a>'; - } - else { - echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_mediadb_short'] .' </font>'; - } ?></div></td> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -54,7 +54,7 @@ include("inc/comp/comp_itemver_submit.php"); } else { - include("inc/tree/tree_group.php"); + include("inc/comp/comp_group.php"); } } else { Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -65,17 +65,7 @@ <td width="20%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif" ><strong><?php - switch ($RSDB_SET_view) { - case "comp": // Compatibility echo "Application"; - break; - case "pack": // Packages - echo "Package"; - break; - default: - echo "Name"; - break; - } ?></strong></font></div></td> <td width="12%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif" ><strong>Vendor</strong></font></div></td> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -145,17 +145,7 @@ <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong> <?php - switch ($RSDB_SET_view) { - case "comp": // Compatibility echo "Application"; - break; - case "pack": // Packages - echo "Package"; - break; - default: - echo "Name"; - break; - } ?> </strong></font></div></td> Modified: branches/danny-web/reactos.org/htdocs/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -296,26 +296,9 @@ default: case "db": // developer interface //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_SET_view = "comp"; $rpm_page_title="Support Database - Compatibility"; $RSDB_intern_section_script = "inc/comp.php"; - break; - case "pack": // Packages - $rpm_page_title="Support Database - Packages"; - $RSDB_intern_section_script = "inc/pack.php"; - break; - case "devnet": // Developer Network - $rpm_page_title="Support Database - Developer Network"; - $RSDB_intern_section_script = "inc/devnet.php"; - break; - case "media": // Media - $rpm_page_title="Support Database - Media"; - $RSDB_intern_section_script = "inc/media.php"; - break; - } include("inc/header.php"); create_head($rpm_page_title, $rpm_logo, $RSDB_langres); Modified: branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -168,9 +168,6 @@ // Views $RSDB_intern_link_db_view_comp = $RSDB_intern_link_db_view."comp"; - $RSDB_intern_link_db_view_pack = $RSDB_intern_link_db_view."pack"; - $RSDB_intern_link_db_view_devnet = $RSDB_intern_link_db_view."devnet"; - $RSDB_intern_link_db_view_media = $RSDB_intern_link_db_view."media"; // Category $RSDB_intern_link_category_all = $RSDB_intern_link_db_sec.$RSDB_SET_sec."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2; @@ -337,100 +334,29 @@ // Views $RSDB_intern_trigger_comp = "0"; - $RSDB_intern_trigger_pack = "0"; - $RSDB_intern_trigger_devnet = "0"; - $RSDB_intern_trigger_media = "0"; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_trigger_comp = "1"; - break; - case "pack": // Packages - $RSDB_intern_trigger_pack = "1"; - break; - case "devnet": // Developer Network - $RSDB_intern_trigger_devnet = "1"; - break; - case "media": // Media - $RSDB_intern_trigger_media = "1"; - break; - } // Code Snips: // *********** // Views - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_code_view_name = $RSDB_langres['TEXT_compdb_short']; $RSDB_intern_code_view_shortname = "comp"; $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_compdb_description']; - break; - case "pack": // Packages - $RSDB_intern_code_view_name = $RSDB_langres['TEXT_packdb_short']; - $RSDB_intern_code_view_shortname = "pack"; - $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_packdb_description']; - break; - case "devnet": // Developer Network - $RSDB_intern_code_view_name = $RSDB_langres['TEXT_devnet_long']; - $RSDB_intern_code_view_shortname = "devnet"; - $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_devnet_description_short']; - break; - case "media": // Media - $RSDB_intern_code_view_name = $RSDB_langres['TEXT_mediadb_short']; - $RSDB_intern_code_view_shortname = "media"; - $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_mediadb_description']; - break; - } // Database // rsdb_categories $RSDB_intern_code_db_rsdb_categories_comp = ""; - $RSDB_intern_code_db_rsdb_categories_pack = ""; - $RSDB_intern_code_db_rsdb_categories_devnet = ""; - $RSDB_intern_code_db_rsdb_categories_media = ""; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_code_db_rsdb_categories_comp = " AND `cat_comp` = '" . $RSDB_intern_trigger_comp . "' "; - break; - case "pack": // Packages - $RSDB_intern_code_db_rsdb_categories_pack = " AND `cat_pack` = '" . $RSDB_intern_trigger_pack . "' "; - break; - case "devnet": // Developer Network - $RSDB_intern_code_db_rsdb_categories_devnet = " AND `cat_devnet` = '" . $RSDB_intern_trigger_devnet . "' "; - break; - case "media": // Media - $RSDB_intern_code_db_rsdb_categories_media = " AND `cat_media` = '" . $RSDB_intern_trigger_media . "' "; - break; - } - $RSDB_intern_code_db_rsdb_categories = $RSDB_intern_code_db_rsdb_categories_comp.$RSDB_intern_code_db_rsdb_categories_pack.$RSDB_intern_code_db_rsdb_categories_devnet.$RSDB_intern_code_db_rsdb_categories_media; + $RSDB_intern_code_db_rsdb_categories = $RSDB_intern_code_db_rsdb_categories_comp; // Code: " . $RSDB_intern_code_db_rsdb_categories . " // rsdb_groups $RSDB_intern_code_db_rsdb_groups_comp = ""; - $RSDB_intern_code_db_rsdb_groups_pack = ""; - $RSDB_intern_code_db_rsdb_groups_devnet = ""; - $RSDB_intern_code_db_rsdb_groups_media = ""; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_code_db_rsdb_groups_comp = " AND `grpentr_comp` = '" . $RSDB_intern_trigger_comp . "' "; - break; - case "pack": // Packages - $RSDB_intern_code_db_rsdb_groups_pack = " AND `grpentr_pack` = '" . $RSDB_intern_trigger_pack . "' "; - break; - case "devnet": // Developer Network - $RSDB_intern_code_db_rsdb_groups_devnet = " AND `grpentr_devnet` = '" . $RSDB_intern_trigger_devnet . "' "; - break; - case "media": // Media - $RSDB_intern_code_db_rsdb_groups_media = " AND `grpentr_media` = '" . $RSDB_intern_trigger_media . "' "; - break; - } - $RSDB_intern_code_db_rsdb_groups = $RSDB_intern_code_db_rsdb_groups_comp.$RSDB_intern_code_db_rsdb_groups_pack.$RSDB_intern_code_db_rsdb_groups_devnet.$RSDB_intern_code_db_rsdb_groups_media; + $RSDB_intern_code_db_rsdb_groups = $RSDB_intern_code_db_rsdb_groups_comp; // Code: " . $RSDB_intern_code_db_rsdb_groups . " ?>

15 years, 9 months

[dgorbachev] 40325: Japanese translations by Tomoya Kitagawa. Bug #4328.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Apr 2 10:20:50 2009 New Revision: 40325 URL: http://svn.reactos.org/svn/reactos?rev=40325&view=rev Log: Japanese translations by Tomoya Kitagawa. Bug #4328. Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=403… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=4… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=40… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=403… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

15 years, 9 months

[tkreuzer] 40324: Fix switching from long mode to real mode, by jumping into a compatibility segment first. This wasn't needed by qemu, but other emulators didn't like it. Now it boots on Virtualbox, too and VMWare shows at least the blue loading screen before crashing.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 2 09:11:02 2009 New Revision: 40324 URL: http://svn.reactos.org/svn/reactos?rev=40324&view=rev Log: Fix switching from long mode to real mode, by jumping into a compatibility segment first. This wasn't needed by qemu, but other emulators didn't like it. Now it boots on Virtualbox, too and VMWare shows at least the blue loading screen before crashing. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Thu Apr 2 09:11:02 2009 @@ -48,13 +48,28 @@ .code64 + /* Checkpoint */ +// mov ax, LMODE_DS +// mov ds, ax +// mov word ptr ds:[0xb8000], 0x0e00 + '1' + /* GO! */ xor rcx, rcx call _BootMain + /* Checkpoint */ +// mov ax, LMODE_DS +// mov ds, ax +// mov word ptr ds:[0xb8002], 0x0e00 + '2' + /* Return into real mode */ call x86_64_SwitchToReal .code16 + + /* Checkpoint */ +// mov ax, 0xb800 +// mov fs, ax +// mov word ptr fs:[0xA0], 0x0e00 + '0' // int 0x19 @@ -203,25 +218,40 @@ /* Save 64-bit stack pointer */ mov stack64, rsp - /* Step 1 - deactivate long mode, by disabling paging */ - mov rax, cr0 - and rax, 0x000000007fffffff //~0x80000000 - mov cr0, rax +// mov ax, LMODE_DS +// mov ds, ax +// mov word ptr ds:[0xb8004], 0x0e00 + '3' + + /* Step 1 - jump to compatibility segment */ + ljmp jumpvector + +jumpvector: + .long SwitchToReal1 + .word CMODE_CS + +SwitchToReal1: +.code32 + +// mov word ptr ds:[0xb8006], 0x0e00 + '4' + + /* Step 2 - deactivate long mode, by disabling paging */ + mov eax, cr0 + and eax, 0x000000007fffffff //~0x80000000 + mov cr0, eax /* Step 2 - disable long mode in EFER MSR */ - mov rcx, 0xC0000080 // Specify EFER MSR - rdmsr - and eax, ~0x00000100 // Disable EFER.LME - wrmsr - - .code32 - /* jmp to 16-bit segment to set the limit correctly */ +// mov ecx, 0xC0000080 // Specify EFER MSR +// rdmsr +// and eax, ~0x00000100 // Disable EFER.LME +// wrmsr + + /* Step 3 - jump to 16-bit segment to set the limit correctly */ jmp RMODE_CS: offset SwitchToReal2 SwitchToReal2: .code16 - /* Step 3 - Disable Protected Mode */ + /* Step 4 - Disable Protected Mode */ mov eax, cr0 and eax, ~0x00000001 mov cr0, eax @@ -230,6 +260,11 @@ jmp 0:offset BeReal BeReal: + /* Checkpoint */ +// mov ax, 0xb800 +// mov fs, ax +// mov word ptr fs:[0x0C], 0x0e00 + '7' + /* Restore segment registers */ mov ax, 0 mov ds, ax @@ -238,7 +273,7 @@ mov gs, ax mov ss, ax - /* Rstore 16 bit stack */ + /* Restore 16 bit stack */ mov sp, stack16 // lidt rmode_idtptr /* Load IDTR with real mode value */ @@ -266,17 +301,19 @@ code64ret: .quad 0 +.p2align 2 gdt: .quad 0x0000000000000000 /* 00: NULL descriptor */ .quad 0x0000000000000000 /* 08: */ .quad 0x0020980000000000 /* 10: long mode cs */ - .quad 0x0000900000000000 /* 18: long mode ds */ + .quad 0x00cff3000000ffff /* 18: long mode ds */ .word 0xFFFF, 0x0000, 0x9E00, 0x0000 /* 16-bit real mode CS */ .word 0xFFFF, 0x0000, 0x9200, 0x0000 /* 16-bit real mode DS */ + .quad 0x00CF9B000000FFFF /* 30: compat mode cs */ /* GDT table pointer */ gdtptr: - .word 0x2f /* Limit */ + .word 0x37 /* Limit */ .long gdt /* Base Address */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Thu Apr 2 09:11:02 2009 @@ -28,6 +28,7 @@ #define LMODE_DS 0x18 #define RMODE_CS 0x20 /* RMode code selector, base 0 limit 64k */ #define RMODE_DS 0x28 /* RMode data selector, base 0 limit 64k */ +#define CMODE_CS 0x30 #define VA_MASK 0x0000FFFFFFFFFFFFUL

15 years, 9 months

[arty] 40323: We don't need the user buffer after launching the TDI irp actually, so free it immediately and fix the heap leak. We also never pend datagram sends to userland. Clean up some cruft where we erroneously set the wrong irp's status.

by arty＠svn.reactos.org

Author: arty Date: Thu Apr 2 06:35:41 2009 New Revision: 40323 URL: http://svn.reactos.org/svn/reactos?rev=40323&view=rev Log: We don't need the user buffer after launching the TDI irp actually, so free it immediately and fix the heap leak. We also never pend datagram sends to userland. Clean up some cruft where we erroneously set the wrong irp's status. Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Thu Apr 2 06:35:41 2009 @@ -41,8 +41,6 @@ ASSERT_IRQL(APC_LEVEL); if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; return STATUS_FILE_CLOSED; } @@ -50,8 +48,6 @@ /* Request is not in flight any longer */ if( FCB->State == SOCKET_STATE_CLOSED ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_FILE_CLOSED; } @@ -172,8 +168,6 @@ Irp->IoStatus.Information)); if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; return STATUS_FILE_CLOSED; } @@ -184,8 +178,6 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); if( FCB->State == SOCKET_STATE_CLOSED ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_FILE_CLOSED; } @@ -202,6 +194,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; + ULONG Information; UINT TotalBytesCopied = 0, i, CopySize = 0, SpaceAvail = 0, TotalBytesEncountered = 0; @@ -255,8 +248,11 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, - SendReq->BufferArray[0].len ); + /* Even if we were pended, we're done with the user buffer at this + * point. */ + Information = SendReq->BufferArray[0].len; + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); } if( !(SendReq = LockRequest( Irp, IrpSp )) ) @@ -370,6 +366,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO_UDP SendReq; + ULONG Information; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -427,7 +424,10 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - return UnlockAndMaybeComplete - ( FCB, Status, Irp, SendReq->BufferArray[0].len ); + /* Even if we were pended, we're done with the user buffer at this + * point. */ + Information = SendReq->BufferArray[0].len; + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); }

15 years, 9 months

[arty] 40322: FORMATTING only.

by arty＠svn.reactos.org

Author: arty Date: Thu Apr 2 05:04:07 2009 New Revision: 40322 URL: http://svn.reactos.org/svn/reactos?rev=40322&view=rev Log: FORMATTING only. Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Thu Apr 2 05:04:07 2009 @@ -72,11 +72,11 @@ if ((Status == STATUS_PENDING) && (Event != NULL)) { AFD_DbgPrint(MAX_TRACE, ("Waiting on transport.\n")); KeWaitForSingleObject( - Event, - Executive, - KernelMode, - FALSE, - NULL); + Event, + Executive, + KernelMode, + FALSE, + NULL); Status = Iosb->Status; } @@ -135,12 +135,12 @@ (PVOID*)Object, /* Pointer to object */ NULL); /* Handle information */ if (!NT_SUCCESS(Status)) { - AFD_DbgPrint(MIN_TRACE, ("ObReferenceObjectByHandle() failed with status (0x%X).\n", Status)); - ZwClose(*Handle); - *Handle = NULL; + AFD_DbgPrint(MIN_TRACE, ("ObReferenceObjectByHandle() failed with status (0x%X).\n", Status)); + ZwClose(*Handle); + *Handle = NULL; } else { - AFD_DbgPrint(MAX_TRACE, ("Got handle (0x%X) Object (0x%X)\n", - *Handle, *Object)); + AFD_DbgPrint(MAX_TRACE, ("Got handle (0x%X) Object (0x%X)\n", + *Handle, *Object)); } } else { AFD_DbgPrint(MIN_TRACE, ("ZwCreateFile() failed with status (0x%X)\n", Status)); @@ -156,7 +156,7 @@ PFILE_OBJECT FileObject) { AFD_DbgPrint(MAX_TRACE, ("Called. Handle (0x%X) FileObject (0x%X)\n", - Handle, FileObject)); + Handle, FileObject)); if (Handle) ZwClose(Handle); @@ -184,47 +184,47 @@ * Status of operation */ { - PFILE_FULL_EA_INFORMATION EaInfo; - NTSTATUS Status; - ULONG EaLength; - PTRANSPORT_ADDRESS Address; - - AFD_DbgPrint(MAX_TRACE, ("Called. DeviceName (%wZ) Name (0x%X)\n", - DeviceName, Name)); - - /* EaName must be 0-terminated, even though TDI_TRANSPORT_ADDRESS_LENGTH does *not* include the 0 */ - EaLength = sizeof(FILE_FULL_EA_INFORMATION) + - TDI_TRANSPORT_ADDRESS_LENGTH + - TaLengthOfTransportAddress( Name ) + 1; - EaInfo = (PFILE_FULL_EA_INFORMATION)ExAllocatePool(NonPagedPool, EaLength); - if (!EaInfo) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(EaInfo, EaLength); - EaInfo->EaNameLength = TDI_TRANSPORT_ADDRESS_LENGTH; - /* Don't copy the terminating 0; we have already zeroed it */ - RtlCopyMemory(EaInfo->EaName, - TdiTransportAddress, - TDI_TRANSPORT_ADDRESS_LENGTH); - EaInfo->EaValueLength = sizeof(TA_IP_ADDRESS); - Address = - (PTRANSPORT_ADDRESS)(EaInfo->EaName + TDI_TRANSPORT_ADDRESS_LENGTH + 1); /* 0-terminated */ - TaCopyTransportAddressInPlace( Address, Name ); - - Status = TdiOpenDevice(DeviceName, - EaLength, - EaInfo, - AddressHandle, - AddressObject); - ExFreePool(EaInfo); - return Status; + PFILE_FULL_EA_INFORMATION EaInfo; + NTSTATUS Status; + ULONG EaLength; + PTRANSPORT_ADDRESS Address; + + AFD_DbgPrint(MAX_TRACE, ("Called. DeviceName (%wZ) Name (0x%X)\n", + DeviceName, Name)); + + /* EaName must be 0-terminated, even though TDI_TRANSPORT_ADDRESS_LENGTH does *not* include the 0 */ + EaLength = sizeof(FILE_FULL_EA_INFORMATION) + + TDI_TRANSPORT_ADDRESS_LENGTH + + TaLengthOfTransportAddress( Name ) + 1; + EaInfo = (PFILE_FULL_EA_INFORMATION)ExAllocatePool(NonPagedPool, EaLength); + if (!EaInfo) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(EaInfo, EaLength); + EaInfo->EaNameLength = TDI_TRANSPORT_ADDRESS_LENGTH; + /* Don't copy the terminating 0; we have already zeroed it */ + RtlCopyMemory(EaInfo->EaName, + TdiTransportAddress, + TDI_TRANSPORT_ADDRESS_LENGTH); + EaInfo->EaValueLength = sizeof(TA_IP_ADDRESS); + Address = + (PTRANSPORT_ADDRESS)(EaInfo->EaName + TDI_TRANSPORT_ADDRESS_LENGTH + 1); /* 0-terminated */ + TaCopyTransportAddressInPlace( Address, Name ); + + Status = TdiOpenDevice(DeviceName, + EaLength, + EaInfo, + AddressHandle, + AddressObject); + ExFreePool(EaInfo); + return Status; } NTSTATUS TdiOpenConnectionEndpointFile( - PUNICODE_STRING DeviceName, - PHANDLE ConnectionHandle, - PFILE_OBJECT *ConnectionObject) + PUNICODE_STRING DeviceName, + PHANDLE ConnectionHandle, + PFILE_OBJECT *ConnectionObject) /* * FUNCTION: Opens a connection endpoint file object * ARGUMENTS: @@ -235,39 +235,39 @@ * Status of operation */ { - PFILE_FULL_EA_INFORMATION EaInfo; - PVOID *ContextArea; - NTSTATUS Status; - ULONG EaLength; - - AFD_DbgPrint(MAX_TRACE, ("Called. DeviceName (%wZ)\n", DeviceName)); + PFILE_FULL_EA_INFORMATION EaInfo; + PVOID *ContextArea; + NTSTATUS Status; + ULONG EaLength; + + AFD_DbgPrint(MAX_TRACE, ("Called. DeviceName (%wZ)\n", DeviceName)); /* EaName must be 0-terminated, even though TDI_TRANSPORT_ADDRESS_LENGTH does *not* include the 0 */ - EaLength = sizeof(FILE_FULL_EA_INFORMATION) + - TDI_CONNECTION_CONTEXT_LENGTH + - sizeof(PVOID) + 1; - - EaInfo = (PFILE_FULL_EA_INFORMATION)ExAllocatePool(NonPagedPool, EaLength); - if (!EaInfo) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(EaInfo, EaLength); - EaInfo->EaNameLength = TDI_CONNECTION_CONTEXT_LENGTH; - /* Don't copy the terminating 0; we have already zeroed it */ - RtlCopyMemory(EaInfo->EaName, - TdiConnectionContext, - TDI_CONNECTION_CONTEXT_LENGTH); - EaInfo->EaValueLength = sizeof(PVOID); - ContextArea = (PVOID*)(EaInfo->EaName + TDI_CONNECTION_CONTEXT_LENGTH + 1); /* 0-terminated */ - /* FIXME: Allocate context area */ - *ContextArea = NULL; - Status = TdiOpenDevice(DeviceName, - EaLength, - EaInfo, - ConnectionHandle, - ConnectionObject); - ExFreePool(EaInfo); - return Status; + EaLength = sizeof(FILE_FULL_EA_INFORMATION) + + TDI_CONNECTION_CONTEXT_LENGTH + + sizeof(PVOID) + 1; + + EaInfo = (PFILE_FULL_EA_INFORMATION)ExAllocatePool(NonPagedPool, EaLength); + if (!EaInfo) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(EaInfo, EaLength); + EaInfo->EaNameLength = TDI_CONNECTION_CONTEXT_LENGTH; + /* Don't copy the terminating 0; we have already zeroed it */ + RtlCopyMemory(EaInfo->EaName, + TdiConnectionContext, + TDI_CONNECTION_CONTEXT_LENGTH); + EaInfo->EaValueLength = sizeof(PVOID); + ContextArea = (PVOID*)(EaInfo->EaName + TDI_CONNECTION_CONTEXT_LENGTH + 1); /* 0-terminated */ + /* FIXME: Allocate context area */ + *ContextArea = NULL; + Status = TdiOpenDevice(DeviceName, + EaLength, + EaInfo, + ConnectionHandle, + ConnectionObject); + ExFreePool(EaInfo); + return Status; } @@ -287,51 +287,51 @@ * Status of operation */ { - PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; - - AFD_DbgPrint(MAX_TRACE, ("Called\n")); - - if (!ConnectionObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); - *Irp = NULL; - return STATUS_INVALID_PARAMETER; - } - - DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); - if (!DeviceObject) { + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + + AFD_DbgPrint(MAX_TRACE, ("Called\n")); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } + + DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); *Irp = NULL; return STATUS_INVALID_PARAMETER; - } - - *Irp = TdiBuildInternalDeviceControlIrp(TDI_CONNECT, /* Sub function */ - DeviceObject, /* Device object */ - ConnectionObject, /* File object */ - NULL, /* Event */ - Iosb); /* Status */ - if (!*Irp) { - return STATUS_INSUFFICIENT_RESOURCES; - } - - TdiBuildConnect(*Irp, /* IRP */ - DeviceObject, /* Device object */ - ConnectionObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion routine context */ - NULL, /* Time */ - RemoteAddress, /* Request connection information */ - RemoteAddress); /* Return connection information */ - - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); - - return Status; + } + + *Irp = TdiBuildInternalDeviceControlIrp(TDI_CONNECT, /* Sub function */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + NULL, /* Event */ + Iosb); /* Status */ + if (!*Irp) { + return STATUS_INSUFFICIENT_RESOURCES; + } + + TdiBuildConnect(*Irp, /* IRP */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion routine context */ + NULL, /* Time */ + RemoteAddress, /* Request connection information */ + RemoteAddress); /* Return connection information */ + + Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + + return Status; } NTSTATUS TdiAssociateAddressFile( - HANDLE AddressHandle, - PFILE_OBJECT ConnectionObject) + HANDLE AddressHandle, + PFILE_OBJECT ConnectionObject) /* * FUNCTION: Associates a connection endpoint to an address file object * ARGUMENTS: @@ -341,46 +341,46 @@ * Status of operation */ { - PDEVICE_OBJECT DeviceObject; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject (0x%X)\n", - AddressHandle, ConnectionObject)); - - if (!ConnectionObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); - return STATUS_INVALID_PARAMETER; - } - - DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); - if (!DeviceObject) { + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + KEVENT Event; + PIRP Irp; + + AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject (0x%X)\n", + AddressHandle, ConnectionObject)); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } + + DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); return STATUS_INVALID_PARAMETER; - } - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - Irp = TdiBuildInternalDeviceControlIrp(TDI_ASSOCIATE_ADDRESS, /* Sub function */ - DeviceObject, /* Device object */ - ConnectionObject, /* File object */ - &Event, /* Event */ - &Iosb); /* Status */ - if (!Irp) - return STATUS_INSUFFICIENT_RESOURCES; - - TdiBuildAssociateAddress(Irp, - DeviceObject, - ConnectionObject, - NULL, - NULL, - AddressHandle); - - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = TdiBuildInternalDeviceControlIrp(TDI_ASSOCIATE_ADDRESS, /* Sub function */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + &Event, /* Event */ + &Iosb); /* Status */ + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; + + TdiBuildAssociateAddress(Irp, + DeviceObject, + ConnectionObject, + NULL, + NULL, + AddressHandle); + + Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); + + return Status; } @@ -402,44 +402,44 @@ * May return STATUS_PENDING */ { - PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; - - AFD_DbgPrint(MAX_TRACE, ("Called\n")); - - if (!ConnectionObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); - *Irp = NULL; - return STATUS_INVALID_PARAMETER; - } - - DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); - if (!DeviceObject) { + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + + AFD_DbgPrint(MAX_TRACE, ("Called\n")); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } + + DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); *Irp = NULL; return STATUS_INVALID_PARAMETER; - } - - *Irp = TdiBuildInternalDeviceControlIrp(TDI_LISTEN, /* Sub function */ - DeviceObject, /* Device object */ - ConnectionObject, /* File object */ - NULL, /* Event */ - Iosb); /* Status */ - if (*Irp == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - TdiBuildListen(*Irp, /* IRP */ - DeviceObject, /* Device object */ - ConnectionObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion routine context */ - 0, /* Flags */ - *RequestConnectionInfo, /* Request connection information */ - *ReturnConnectionInfo); /* Return connection information */ - - Status = TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); - - return Status; + } + + *Irp = TdiBuildInternalDeviceControlIrp(TDI_LISTEN, /* Sub function */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + NULL, /* Event */ + Iosb); /* Status */ + if (*Irp == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + TdiBuildListen(*Irp, /* IRP */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion routine context */ + 0, /* Flags */ + *RequestConnectionInfo, /* Request connection information */ + *ReturnConnectionInfo); /* Return connection information */ + + Status = TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); + + return Status; } @@ -461,49 +461,49 @@ * Specify NULL for Handler to stop calling event handler */ { - PDEVICE_OBJECT DeviceObject; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - AFD_DbgPrint(MAX_TRACE, ("Called\n")); - - if (!FileObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); - return STATUS_INVALID_PARAMETER; - } - - DeviceObject = IoGetRelatedDeviceObject(FileObject); - if (!DeviceObject) { + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + KEVENT Event; + PIRP Irp; + + AFD_DbgPrint(MAX_TRACE, ("Called\n")); + + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } + + DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); return STATUS_INVALID_PARAMETER; - } - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - Irp = TdiBuildInternalDeviceControlIrp(TDI_SET_EVENT_HANDLER, /* Sub function */ - DeviceObject, /* Device object */ - FileObject, /* File object */ - &Event, /* Event */ - &Iosb); /* Status */ - if (!Irp) - return STATUS_INSUFFICIENT_RESOURCES; - - - - TdiBuildSetEventHandler(Irp, - DeviceObject, - FileObject, - NULL, - NULL, - EventType, - Handler, - Context); - - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = TdiBuildInternalDeviceControlIrp(TDI_SET_EVENT_HANDLER, /* Sub function */ + DeviceObject, /* Device object */ + FileObject, /* File object */ + &Event, /* Event */ + &Iosb); /* Status */ + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; + + + + TdiBuildSetEventHandler(Irp, + DeviceObject, + FileObject, + NULL, + NULL, + EventType, + Handler, + Context); + + Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); + + return Status; } @@ -535,8 +535,8 @@ PIRP Irp; if (!FileObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; } DeviceObject = IoGetRelatedDeviceObject(FileObject); @@ -589,8 +589,8 @@ PIRP Irp; if (!FileObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; } DeviceObject = IoGetRelatedDeviceObject(FileObject); @@ -607,17 +607,17 @@ &Event, /* Event */ &Iosb); /* Status */ if (!Irp) { - return STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } TdiBuildQueryInformation( - Irp, - DeviceObject, - FileObject, - NULL, - NULL, - QueryType, - MdlBuffer); + Irp, + DeviceObject, + FileObject, + NULL, + NULL, + QueryType, + MdlBuffer); Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); @@ -777,8 +777,8 @@ if (SnmpInfo.NumAddr != 1) { /* Skip loopback address */ - PIPADDR_ENTRY IpAddressEntry = (PIPADDR_ENTRY) - ((PCHAR)IpAddress) + sizeof(IPADDR_ENTRY); + PIPADDR_ENTRY IpAddressEntry = (PIPADDR_ENTRY) + ((PCHAR)IpAddress) + sizeof(IPADDR_ENTRY); *Address = DN2H(IpAddressEntry->Addr); } else { /* Select the first address returned */ @@ -815,9 +815,9 @@ PMDL Mdl; if (!TransportObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); - *Irp = NULL; - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; } DeviceObject = IoGetRelatedDeviceObject(TransportObject); @@ -828,11 +828,11 @@ } *Irp = TdiBuildInternalDeviceControlIrp - ( TDI_SEND, /* Sub function */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - NULL, /* Event */ - Iosb ); /* Status */ + ( TDI_SEND, /* Sub function */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + NULL, /* Event */ + Iosb ); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -857,7 +857,7 @@ MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); @@ -866,13 +866,13 @@ AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); TdiBuildSend(*Irp, /* I/O Request Packet */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion context */ - Mdl, /* Data buffer */ - Flags, /* Flags */ - BufferLength); /* Length of data */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion context */ + Mdl, /* Data buffer */ + Flags, /* Flags */ + BufferLength); /* Length of data */ Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion @@ -896,9 +896,9 @@ PMDL Mdl; if (!TransportObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); - *Irp = NULL; - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; } DeviceObject = IoGetRelatedDeviceObject(TransportObject); @@ -909,11 +909,11 @@ } *Irp = TdiBuildInternalDeviceControlIrp - ( TDI_RECEIVE, /* Sub function */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - NULL, /* Event */ - Iosb ); /* Status */ + ( TDI_RECEIVE, /* Sub function */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + NULL, /* Event */ + Iosb ); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -940,22 +940,22 @@ AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); - *Irp = NULL; - _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + *Irp = NULL; + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); TdiBuildReceive(*Irp, /* I/O Request Packet */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion context */ - Mdl, /* Data buffer */ - Flags, /* Flags */ - BufferLength); /* Length of data */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion context */ + Mdl, /* Data buffer */ + Flags, /* Flags */ + BufferLength); /* Length of data */ Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); @@ -963,7 +963,7 @@ routine. */ AFD_DbgPrint(MID_TRACE,("Status %x Information %d\n", - Status, Iosb->Information)); + Status, Iosb->Information)); return Status; } @@ -996,9 +996,9 @@ PMDL Mdl; if (!TransportObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n")); - *Irp = NULL; - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; } DeviceObject = IoGetRelatedDeviceObject(TransportObject); @@ -1009,11 +1009,11 @@ } *Irp = TdiBuildInternalDeviceControlIrp - ( TDI_RECEIVE_DATAGRAM, /* Sub function */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - NULL, /* Event */ - Iosb ); /* Status */ + ( TDI_RECEIVE_DATAGRAM, /* Sub function */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + NULL, /* Event */ + Iosb ); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1038,7 +1038,7 @@ MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); @@ -1047,16 +1047,16 @@ AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); TdiBuildReceiveDatagram - (*Irp, /* I/O Request Packet */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion context */ - Mdl, /* Data buffer */ - BufferLength, - Addr, - Addr, - Flags); /* Length of data */ + (*Irp, /* I/O Request Packet */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion context */ + Mdl, /* Data buffer */ + BufferLength, + Addr, + Addr, + Flags); /* Length of data */ Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion @@ -1092,9 +1092,9 @@ PMDL Mdl; if (!TransportObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); - *Irp = NULL; - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1107,11 +1107,11 @@ } *Irp = TdiBuildInternalDeviceControlIrp - ( TDI_SEND_DATAGRAM, /* Sub function */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - NULL, /* Event */ - Iosb ); /* Status */ + ( TDI_SEND_DATAGRAM, /* Sub function */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + NULL, /* Event */ + Iosb ); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1137,7 +1137,7 @@ MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); @@ -1146,14 +1146,14 @@ AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); TdiBuildSendDatagram - (*Irp, /* I/O Request Packet */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion context */ - Mdl, /* Data buffer */ - BufferLength, /* Bytes to send */ - Addr); /* Address */ + (*Irp, /* I/O Request Packet */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion context */ + Mdl, /* Data buffer */ + BufferLength, /* Bytes to send */ + Addr); /* Address */ Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the send completion @@ -1179,8 +1179,8 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); if (!TransportObject) { - AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); - return STATUS_INVALID_PARAMETER; + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + return STATUS_INVALID_PARAMETER; } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1192,11 +1192,11 @@ } Irp = TdiBuildInternalDeviceControlIrp - ( TDI_SEND_DATAGRAM, /* Sub function */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - &Event, /* Event */ - Iosb ); /* Status */ + ( TDI_SEND_DATAGRAM, /* Sub function */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + &Event, /* Event */ + Iosb ); /* Status */ if (!Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1204,15 +1204,15 @@ } TdiBuildDisconnect - (Irp, /* I/O Request Packet */ - DeviceObject, /* Device object */ - TransportObject, /* File object */ - CompletionRoutine, /* Completion routine */ - CompletionContext, /* Completion context */ - Time, /* Time */ - Flags, /* Disconnect flags */ - RequestConnectionInfo, /* Indication of who to disconnect */ - ReturnConnectionInfo); /* Indication of who disconnected */ + (Irp, /* I/O Request Packet */ + DeviceObject, /* Device object */ + TransportObject, /* File object */ + CompletionRoutine, /* Completion routine */ + CompletionContext, /* Completion context */ + Time, /* Time */ + Flags, /* Disconnect flags */ + RequestConnectionInfo, /* Indication of who to disconnect */ + ReturnConnectionInfo); /* Indication of who disconnected */ Status = TdiCall(Irp, DeviceObject, &Event, Iosb);

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009