Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 40365: - Simplified code for CD, PUSHD, and POPD commands and also fixed some bugs.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Apr 5 05:50:24 2009 New Revision: 40365 URL: http://svn.reactos.org/svn/reactos?rev=40365&view=rev Log: - Simplified code for CD, PUSHD, and POPD commands and also fixed some bugs. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/dirstack.c trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -1653,10 +1653,6 @@ SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); -#ifdef INCLUDE_CMD_CHDIR - InitLastPath (); -#endif - for (ptr = cmdLine; *ptr; ptr++) { if (*ptr == _T('/')) @@ -1791,10 +1787,6 @@ DestroyDirectoryStack (); #endif -#ifdef INCLUDE_CMD_CHDIR - FreeLastPath (); -#endif - #ifdef FEATURE_HISTORY CleanHistory(); #endif Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -329,7 +329,7 @@ /* Prototypes for MISC.C */ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size); -BOOL SetRootPath(TCHAR *InPath); +BOOL SetRootPath(TCHAR *oldpath,TCHAR *InPath); TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry); Modified: trunk/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dirstack.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/dirstack.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dirstack.c [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -22,7 +22,7 @@ { struct tagDIRENTRY *prev; struct tagDIRENTRY *next; - LPTSTR pszPath; + TCHAR szPath[1]; } DIRENTRY, *LPDIRENTRY; @@ -34,11 +34,7 @@ static INT PushDirectory (LPTSTR pszPath) { - LPDIRENTRY lpDir; - - nErrorLevel = 0; - - lpDir = (LPDIRENTRY)cmd_alloc (sizeof (DIRENTRY)); + LPDIRENTRY lpDir = cmd_alloc(FIELD_OFFSET(DIRENTRY, szPath[_tcslen(pszPath) + 1])); if (!lpDir) { error_out_of_memory (); @@ -46,67 +42,34 @@ } lpDir->prev = NULL; + lpDir->next = lpStackTop; if (lpStackTop == NULL) - { - lpDir->next = NULL; lpStackBottom = lpDir; - } else - { - lpDir->next = lpStackTop; lpStackTop->prev = lpDir; - } lpStackTop = lpDir; - lpDir->pszPath = (LPTSTR)cmd_alloc ((_tcslen(pszPath)+1)*sizeof(TCHAR)); - if (!lpDir->pszPath) - { - cmd_free (lpDir); - error_out_of_memory (); - return -1; - } - - _tcscpy (lpDir->pszPath, pszPath); + _tcscpy(lpDir->szPath, pszPath); nStackDepth++; - return 0; + return nErrorLevel = 0; } static VOID PopDirectory (VOID) { - LPDIRENTRY lpDir; - - nErrorLevel = 0; - - if (nStackDepth == 0) - return; - - lpDir = lpStackTop; + LPDIRENTRY lpDir = lpStackTop; lpStackTop = lpDir->next; if (lpStackTop != NULL) lpStackTop->prev = NULL; else lpStackBottom = NULL; - cmd_free (lpDir->pszPath); cmd_free (lpDir); nStackDepth--; -} - - -static VOID -GetDirectoryStackTop (LPTSTR pszPath) -{ - nErrorLevel = 0; - - if (lpStackTop) - _tcsncpy (pszPath, lpStackTop->pszPath, MAX_PATH); - else - *pszPath = _T('\0'); } @@ -143,8 +106,6 @@ INT CommandPushd (LPTSTR rest) { TCHAR curPath[MAX_PATH]; - TCHAR newPath[MAX_PATH]; - BOOL bChangePath = FALSE; if (!_tcsncmp (rest, _T("/?"), 2)) { @@ -152,22 +113,15 @@ return 0; } - nErrorLevel = 0; + GetCurrentDirectory (MAX_PATH, curPath); if (rest[0] != _T('\0')) { - GetFullPathName (rest, MAX_PATH, newPath, NULL); - bChangePath = IsValidPathName (newPath); + if (!SetRootPath(NULL, rest)) + return 1; } - GetCurrentDirectory (MAX_PATH, curPath); - if (PushDirectory (curPath)) - return 0; - - if (bChangePath) - _tchdir(newPath); - - return 0; + return PushDirectory(curPath); } @@ -176,25 +130,20 @@ */ INT CommandPopd (LPTSTR rest) { - TCHAR szPath[MAX_PATH]; - + INT ret = 0; if (!_tcsncmp(rest, _T("/?"), 2)) { ConOutResPuts(STRING_DIRSTACK_HELP2); return 0; } - nErrorLevel = 0; + if (nStackDepth == 0) + return 1; - if (GetDirectoryStackDepth () == 0) - return 0; - - GetDirectoryStackTop (szPath); + ret = _tchdir(lpStackTop->szPath) != 0; PopDirectory (); - _tchdir(szPath); - - return 0; + return ret; } @@ -223,8 +172,7 @@ while (lpDir != NULL) { - ConOutPuts (lpDir->pszPath); - + ConOutPuts(lpDir->szPath); lpDir = lpDir->prev; } Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -140,21 +140,6 @@ #include <precomp.h> #ifdef INCLUDE_CMD_CHDIR - -static LPTSTR lpLastPath; - - -VOID InitLastPath (VOID) -{ - lpLastPath = NULL; -} - - -VOID FreeLastPath (VOID) -{ - if (lpLastPath) - cmd_free (lpLastPath); -} /* help functions for getting current path from drive without changing drive. Return code 0 = ok, 1 = fail. @@ -166,12 +151,8 @@ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) { - INT retcode = 1; - - if (_tcslen(InPath)>1) + if (InPath[0] && InPath[1] == _T(':')) { - if (InPath[1]==_T(':')) - { INT t=0; if ((InPath[0] >= _T('0')) && (InPath[0] <= _T('9'))) @@ -190,76 +171,41 @@ t = (InPath[0] - _T('A')) +1; } - if (_tgetdcwd(t,OutPath,size) != NULL) - { - return 0; - } - } - } - - /* fail */ - if (_tcslen(InPath)>1) - { - if (InPath[1]==_T(':')) - return 1; + return _tgetdcwd(t,OutPath,size) == NULL; } /* Get current directory */ - retcode = GetCurrentDirectory(size,OutPath); - if (retcode==0) - return 1; - - return 0; -} - - -BOOL SetRootPath(TCHAR *InPath) -{ - TCHAR oldpath[MAX_PATH]; + return !GetCurrentDirectory(size,OutPath); +} + + +BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) +{ TCHAR OutPath[MAX_PATH]; TCHAR OutPathTemp[MAX_PATH]; - TCHAR OutPathTemp2[MAX_PATH]; - BOOL fail; - - - /* Get The current directory path and save it */ - fail = GetCurrentDirectory(MAX_PATH,oldpath); - if (!fail) - return 1; - - /* Get current drive directory path if C: was only pass down*/ - - if (_tcsncicmp(&InPath[1],_T(":\\"),2)!=0) - { - if (!GetRootPath(InPath,OutPathTemp,MAX_PATH)) - _tcscpy(OutPathTemp,InPath); - } - else - { - _tcscpy(OutPathTemp,InPath); - } - - _tcsupr(OutPathTemp); + /* The use of both of these together will correct the case of a path where as one alone or GetFullPath will not. Exameple: c:\windows\SYSTEM32 => C:\WINDOWS\system32 */ - GetFullPathName(OutPathTemp, MAX_PATH, OutPathTemp2, NULL); - GetPathCase(OutPathTemp2, OutPath); - - fail = SetCurrentDirectory(OutPath); - if (!fail) - return 1; - - - - SetCurrentDirectory(OutPath); - GetCurrentDirectory(MAX_PATH,OutPath); - _tchdir(OutPath); - - if (_tcsncicmp(OutPath,oldpath,2)!=0) - SetCurrentDirectory(oldpath); - - return 0; + if (GetFullPathName(InPath, MAX_PATH, OutPathTemp, NULL)) + { + GetPathCase(OutPathTemp, OutPath); + + /* Use _tchdir, since unlike SetCurrentDirectory it updates + * the current-directory-on-drive environment variables. */ + if (_tchdir(OutPath) != 0) + { + ConErrFormatMessage(GetLastError()); + nErrorLevel = 1; + return FALSE; + } + + /* Keep original drive in ordinary CD/CHDIR (without /D switch). */ + if (oldpath != NULL && _tcsncicmp(OutPath, oldpath, 2) != 0) + SetCurrentDirectory(oldpath); + } + + return TRUE; } @@ -269,16 +215,8 @@ */ INT cmd_chdir (LPTSTR param) { - - WIN32_FIND_DATA f; - HANDLE hFile; + TCHAR szCurrent[MAX_PATH]; BOOL bChangeDrive = FALSE; - TCHAR szPath[MAX_PATH]; - TCHAR szFinalPath[MAX_PATH]; - TCHAR * tmpPath; - TCHAR szCurrent[MAX_PATH]; - INT i; - /* Filter out special cases first */ @@ -289,131 +227,45 @@ return 0; } - /* Set Error Level to Success */ + /* Remove " */ + StripQuotes(param); + + /* Set Error Level to Success */ nErrorLevel = 0; + + /* Print Current Directory on a disk */ + if (_tcslen(param) == 2 && param[1] == _T(':')) + { + if (GetRootPath(param, szCurrent, MAX_PATH)) + { + error_invalid_drive(); + return 1; + } + ConOutPuts(szCurrent); + return 0; + } + + /* Get Current Directory */ + GetCurrentDirectory(MAX_PATH, szCurrent); + if (param[0] == _T('\0')) + { + ConOutPuts(szCurrent); + return 0; + } /* Input String Contains /D Switch */ if (!_tcsncicmp(param, _T("/D"), 2)) { bChangeDrive = TRUE; - tmpPath = _tcsstr(param,_T(" ")); - if(!tmpPath) - { - /* Didnt find an directories */ - ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; - return 1; - } - tmpPath++; - _tcscpy(szPath,tmpPath); - } - else - { - _tcscpy(szPath,param); - } - - /* Print Current Directory on a disk */ - if (_tcslen(szPath) == 2 && szPath[1] == _T(':')) - { - if(GetRootPath(szPath,szCurrent,MAX_PATH)) - { - nErrorLevel = 1; - return 1; - } - ConOutPuts(szCurrent); - return 0; - } - - /* Get Current Directory */ - GetRootPath(_T("."),szCurrent,MAX_PATH); - - /* Remove " */ - i = 0; - while(i < (INT)_tcslen(szPath)) - { - if(szPath[i] == _T('\"')) - memmove(&szPath[i],&szPath[i + 1], _tcslen(&szPath[i]) * sizeof(TCHAR)); - else - i++; - } - - tmpPath = szPath; - while (_istspace (*tmpPath)) - tmpPath++; - _tcscpy(szPath,tmpPath); - - if (szPath[0] == _T('\0')) - { - ConOutPuts(szCurrent); - return 0; - } - - - /* change to full path if relative path was given */ - GetFullPathName(szPath,MAX_PATH,szFinalPath,NULL); - - if(szFinalPath[_tcslen(szFinalPath) - 1] == _T('\\') && _tcslen(szFinalPath) > 3) - szFinalPath[_tcslen(szFinalPath) - 1] = _T('\0'); - - /* Handle Root Directory Alone*/ - if (_tcslen(szFinalPath) == 3 && szFinalPath[1] == _T(':')) - { - if(!SetRootPath(szFinalPath)) - { - /* Change prompt if it is one the same drive or /D */ - if(bChangeDrive || !_tcsncicmp(szFinalPath,szCurrent,1)) - SetCurrentDirectory(szFinalPath); - return 0; - } - /* Didnt find an directories */ - ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; + param += 2; + while (_istspace(*param)) + param++; + } + + if (!SetRootPath(bChangeDrive ? NULL : szCurrent, param)) return 1; - } - - /* Get a list of all the files */ - hFile = FindFirstFile (szFinalPath, &f); - - do - { - if(hFile == INVALID_HANDLE_VALUE) - { - ConErrFormatMessage (GetLastError(), szFinalPath); - nErrorLevel = 1; - return 1; - } - - /* Strip the paths back to the folder they are in */ - for(i = (_tcslen(szFinalPath) - 1); i > -1; i--) - if(szFinalPath[i] != _T('\\')) - szFinalPath[i] = _T('\0'); - else - break; - - _tcscat(szFinalPath,f.cFileName); - - if ((f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) - { - if(!SetRootPath(szFinalPath)) - { - /* Change for /D */ - if(bChangeDrive) - { - _tcsupr(szFinalPath); - GetPathCase(szFinalPath, szPath); - SetCurrentDirectory(szPath); - } - return 0; - } - - } - }while(FindNextFile (hFile, &f)); - - /* Didnt find an directories */ - ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; - return 1; + return 0; } #endif

16 years, 3 months

[dgoette] 40364: * use compatDB's home site as general home site * get home site into class structure * get conditions into class structure * remove some unused files

by dgoette＠svn.reactos.org

Author: dgoette Date: Sun Apr 5 03:49:40 2009 New Revision: 40364 URL: http://svn.reactos.org/svn/reactos?rev=40364&view=rev Log: * use compatDB's home site as general home site * get home site into class structure * get conditions into class structure * remove some unused files Added: branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php (contents, props changed) - copied, changed from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php (contents, props changed) - copied, changed from r40336, branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php branches/danny-web/reactos.org/htdocs/compat/inc/home.php Modified: branches/danny-web/reactos.org/htdocs/compat/index.php branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp.php (removed) @@ -1,80 +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/comp/comp_home.php"); - break; - // Browse Database - 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; - case "rank": // Rank - include("inc/tree/tree_rank.php"); - break; - - case "search": // Search - if ($RSDB_SET_group != "") { - $RSDB_SET_sec="name"; - include("inc/tree/tree_name.php"); - } - else { - include("inc/comp/comp_search.php"); - } - break; - - case "submit": // Category - include("inc/comp/comp_item_submit.php"); - break; - case "stats": // Statistics - echo 'depracted'; - break; - case "help": // Vendor/Company - include("inc/comp/comp_help.php"); - break; - } - -?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php (removed) @@ -1,219 +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(" "); - } - - echo $RSDB_intern_code_view_name; ?> -<script language="JavaScript" type="text/JavaScript"> - -</script> -<style type="text/css"> - -</style><body onLoad="MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg','media/icons/buttons/button_comp_category_m.jpg','media/icons/buttons/button_comp_name_m.jpg','media/icons/buttons/button_comp_vendor_m.jpg','media/icons/buttons/button_comp_rank_m.jpg','media/icons/buttons/button_comp_submit_m.jpg')"> -<a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> -</h1> -<p>ReactOS Software and Hardware Compatibility Database</p> - -<h1>Compatibility Database - Overview </h1> -<h2>Compatibility Database - Overview</h2> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="100%" valign="top"> -<p><font size="2">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility - with ReactOS.</font></p> -<div id="StartList" align="center" style="display: none"> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompCategory','','media/icons/buttons/button_comp_category_m.jpg',1)"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompName','','media/icons/buttons/button_comp_name_m.jpg',1)"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompVendor','','media/icons/buttons/button_comp_vendor_m.jpg',1)"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompRank','','media/icons/buttons/button_comp_rank_m.jpg',1)"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('SubApp','','media/icons/buttons/button_comp_submit_m.jpg',1)"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <table width="231" height="49" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> - <table width="100%" border="0"> - <tr> - <td width="110"> </td> - <td><input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="loadItemList(this.value,'table','comp','ajaxload','sresult')" onKeyUp="loadItemList(this.value,'table','comp','ajaxload','sresult')" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /><img id="ajaxload" src="images/ajax_loading.gif" style="display: none"> - <script language="JavaScript" type="text/JavaScript"> -  - </script> - <?php - //include("inc/comp/sub/search_box.php"); - ?> - </td> - </tr> - </table> - </td> - </tr> - </table> -</div> -<div align="center"> - <noscript> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=false"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=false"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=false"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>search&ajax=false"><img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0"></a><br> - </noscript> -</div> -</td> - <td align="right" valign="top"><img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400"></td> - </tr> -</table> -<div id="sresult" style="display: none"></div> -<h3>Features</h3> -<p>Some of the <strong>features of the Compatibility Database</strong> are:</p> -<ul> - <li>Browse through the database in several different ways (by <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0">category</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all">name</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all">vendor</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank">ranks</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>search">search</a>).</li> - <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> - <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> - <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> - <li>Ability to sign up to be an application maintainer.<br /> -</li> -</ul> -<h3>Recent submissions<font color="#B5E196"></font></h3> -<p>There are <a href="<?php echo $RSDB_intern_link_db_sec; ?>stats"><b> - <?php - - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); - $stmt->execute(); - $result_count_cat = $stmt->fetch(); - echo $result_count_cat[0]; - - -?> applications and drivers</b></a> currently in the database.</p> - -<div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> -<br /> -<table width="500" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> - <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> - <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> - </tr> - <?php - $cellcolor1="#E2E2E2"; - $cellcolor2="#EEEEEE"; - $cellcolorcounter="0"; - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); - $stmt->execute(); - while($result_date_entry_records = $stmt->fetch(PDO::FETCH_ASSOC)) { -?> - <tr bgcolor="<?php - $cellcolorcounter++; - if ($cellcolorcounter == "1") { - echo $cellcolor1; - $farbe = $cellcolor1; - } - elseif ($cellcolorcounter == "2") { - $cellcolorcounter="0"; - echo $cellcolor2; - $farbe = $cellcolor2; - } - ?>"> - <td><div align="center"><font size="1" face="Arial, Helvetica, sans-serif"> - <?php - echo $result_date_entry_records['test_user_submit_timestamp']; - - ?> - </font></div></td> - <td><font size="2" face="Arial, Helvetica, sans-serif">   - <?php - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); - $stmt->bindParam('comp_id',$result_date_entry_records['test_comp_id'],PDO::PARAM_STR); - $stmt->execute(); - $result_date_vendor = $stmt->fetch(PDO::PARAM_STR); - echo "<b><a href=\"". $RSDB_intern_link_item_comp.$result_date_vendor['comp_id'] ."&item2=tests\">".$result_date_vendor['comp_name']."</a></b>"; - - ?> - </font></td> - <td><div align="left"><font size="2" face="Arial, Helvetica, sans-serif">  - <?php - echo Star::drawSmall($result_date_entry_records['test_result_function'], 1, 5, ""); - ?> - </font></div></td> - </tr> - <?php - } -?> -</table> -</div> -<?php - if ($RSDB_intern_user_id <= 0) { -?> - <p><font size="2">Some of the features of the ReactOS Compatibility Database require that you have a <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=register">myReactOS account</a> and are <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=login">logged in</a>.</font></p> -<?php - } -?> -<script language="JavaScript" type="text/JavaScript"> - -</script> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php (removed) @@ -1,244 +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(" "); - } - -?> <div class="navTitle">Search</div> - <div class="navBox"><form method="get" action="#" style="padding:0;margin:0"> - <div style="text-align:center;"> - - <input name="q" value="" size="12" maxlength="80" class="searchInput" type="text" /><input name="domains" value="http://www.reactos.org" type="hidden" /><input name="sitesearch" value="http://www.reactos.org" type="hidden" /> - <input name="btnG" value="Go" type="submit" class="button" /> - - - </div></form> - </div> - <ol> - <div id="outputItemListShort" style="display: none"></div> - </ol> -<p></p> -<script type="text/javascript" language="javascript"> - -</script> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php (removed) @@ -1,241 +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(" "); - } - -?><input name="searchinput" type="text" id="searchinput" tabindex="0" onblur="loadItemList(this.value)" onkeyup="loadItemList(this.value)" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /><img id="ajaxload" src="images/ajax_loading.gif" style="display: none"> -<?php /* -<p><label for="searchinput" accesskey="s">Search: </label></p><input name="bSearch" type="button" disabled="true" id="bSearch" value="Search" style="display: inline" /> -<noscript> -Sorry, currently the search function is only usable with ECMAScript enabled! The noscript methode will be available soon! -</noscript> */ ?> -<script type="text/javascript" language="javascript"> - -</script> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php (removed) @@ -1,41 +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> > Submit Conditions</h1> -<h2>Submit Conditions</h2> -<p><font size="2">The ReactOS administrator and moderator team of the ReactOS homepage will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message/comment/entry/etc. Therefore you acknowledge that all posts/comment/entry/etc. made to the ReactOS homepage express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts/comment/entry/etc. by these people) and hence will not be held liable. </font></p> -<p><font size="2">You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderator team of the ReactOS homepage have the right to remove, edit, move or close any topic/entry/etc. at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderator team cannot be held responsible for any hacking attempt that may lead to the data being compromised. </font></p> -<p> <font size="2"><strong>By submitting anything to the "ReactOS Support Database" you agree that you have read the "Submit Conditions" text above and to be bound by these conditions.</strong></font></p> Removed: 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 (removed) @@ -1,50 +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><?php echo $RSDB_langres['RSDB_name']; ?></h1> -<p><?php echo $RSDB_langres['CONTENT_description']; ?></p> -<h1><?php echo $RSDB_langres['TEXT_overview']; ?></h1> -<h2><img src="media/pictures/supportdb.jpg" alt="ReactOS Support Database" align="right" height="130" width="290"><?php echo $RSDB_langres['TEXT_about']; ?></h2> - -<p><?php echo $RSDB_langres['CONTENT_about_short']; ?> <a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><?php echo $RSDB_langres['TEXT_more']; ?></a> </p> -<h2><?php echo $RSDB_langres['TEXT_sections']; ?></h2> -<h3><?php echo $RSDB_langres['TEXT_compdb']; ?></h3> -<p> - <?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> - -<p> </p> - 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] Sun Apr 5 03:49:40 2009 @@ -250,43 +250,68 @@ // echo "<hr />db: ".$RSDB_SET_page.", sec: ".$RSDB_SET_sec."<hr />"; switch ($RSDB_SET_page) { - case "home": // Frontpage - //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - $rpm_page_title="Support Database - Overview"; - include("inc/header.php"); // Head - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); // Layout-Structure - create_structure($rpm_page); - include("inc/home.php"); // Content - include("inc/footer.php"); // Body - break; - case "about": // RSDB About Page - new About(); - break; - case "conditions": // RSDB Submit Conditions Page - $rpm_page_title="Support Database - Submit Conditions"; - include("inc/header.php"); // Head - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); // Layout-Structure - create_structure($rpm_page); - include("inc/conditions.php"); // Content - include("inc/footer.php"); // Body - break; - default: - case "db": // developer interface - //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - $rpm_page_title="Support Database - Compatibility"; - $RSDB_intern_section_script = "inc/comp.php"; - - include("inc/header.php"); - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); - create_structure($rpm_page); - - include($RSDB_intern_section_script); - - include("inc/footer.php"); - + + // Frontpage + case 'home': + new Home(); + break; + + // RSDB About Page + case 'about': + new About(); + break; + + // RSDB Submit Conditions Page + case 'conditions': + new Conditions(); + break; + + case 'comp': + switch ($RSDB_SET_sec) { + + // Browse Database + case "category": + include("inc/tree/tree_category.php"); + break; + + // Name + case "name": + include("inc/tree/tree_name.php"); + break; + + // Vendor/Company + case "vendor": + include("inc/tree/tree_vendor.php"); + break; + + // Rank + case "rank": + include("inc/tree/tree_rank.php"); + break; + + // Search + case "search": + if ($RSDB_SET_group != "") { + $RSDB_SET_sec="name"; + include("inc/tree/tree_name.php"); + } + else { + include("inc/comp/comp_search.php"); + } + break; + + // Category + case "submit": + include("inc/comp/comp_item_submit.php"); + break; + + // Vendor/Company + case "help": + include("inc/comp/comp_help.php"); + break; + } + + default: break; case "dat": // export data switch ($RSDB_SET_export) { Modified: branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -27,9 +27,10 @@ protected function body( ) { global $RSDB_langres; + global $RSDB_intern_index_php; echo ' - <h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > '.$RSDB_langres['TEXT_about_rsdb'].'</h1> + <h1><a href="'.$RSDB_intern_index_php.'?page=about">ReactOS Compatability Database</a> > '.$RSDB_langres['TEXT_about_rsdb'].'</h1> <h2>'.$RSDB_langres['TEXT_about_rsdb'].'</h2> <p>'.$RSDB_langres['CONTENT_about_rsdb'].'</p> <p>'.$RSDB_langres['CONTENT_about_webteam'].'</p> Copied: branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php (from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -18,24 +18,36 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ + +class Conditions extends HTML +{ - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > Submit Conditions</h1> -<h2>Submit Conditions</h2> -<p><font size="2">The ReactOS administrator and moderator team of the ReactOS homepage will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message/comment/entry/etc. Therefore you acknowledge that all posts/comment/entry/etc. made to the ReactOS homepage express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts/comment/entry/etc. by these people) and hence will not be held liable. </font></p> -<p><font size="2">You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderator team of the ReactOS homepage have the right to remove, edit, move or close any topic/entry/etc. at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderator team cannot be held responsible for any hacking attempt that may lead to the data being compromised. </font></p> -<p> <font size="2"><strong>By submitting anything to the "ReactOS Support Database" you agree that you have read the "Submit Conditions" text above and to be bound by these conditions.</strong></font></p> + protected function body( ) + { + global $RSDB_intern_index_php; + + echo ' + <h1> + <a href="'.$RSDB_intern_index_php.'?page=about">ReactOS Compatability Database</a> + > Submit Conditions + </h1> + <h2>Submit Conditions</h2> + <p style="font-size:2;"> + The ReactOS administrator and moderator team of the ReactOS homepage will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message/comment/entry/etc. Therefore you acknowledge that all posts/comment/entry/etc. made to the ReactOS homepage express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts/comment/entry/etc. by these people) and hence will not be held liable. + </p> + <p style="font-size:2;"> + You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderator team of the ReactOS homepage have the right to remove, edit, move or close any topic/entry/etc. at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderator team cannot be held responsible for any hacking attempt that may lead to the data being compromised. + </p> + <p> + <strong> + By submitting anything to the "ReactOS Support Database" you agree that you have read the "Submit Conditions" text above and to be bound by these conditions. + </strong> + </p>'; + } // end of member function body + + + +} // end of Conditions + Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php ------------------------------------------------------------------------------ svn:mergeinfo = Copied: branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php (from r40336, branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -18,202 +18,212 @@ 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(" "); - } - - echo $RSDB_intern_code_view_name; ?> -<script language="JavaScript" type="text/JavaScript"> - -</script> -<style type="text/css"> - -</style><body onLoad="MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg','media/icons/buttons/button_comp_category_m.jpg','media/icons/buttons/button_comp_name_m.jpg','media/icons/buttons/button_comp_vendor_m.jpg','media/icons/buttons/button_comp_rank_m.jpg','media/icons/buttons/button_comp_submit_m.jpg')"> -<a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> -</h1> -<p>ReactOS Software and Hardware Compatibility Database</p> - -<h1>Compatibility Database - Overview </h1> -<h2>Compatibility Database - Overview</h2> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="100%" valign="top"> -<p><font size="2">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility - with ReactOS.</font></p> -<div id="StartList" align="center" style="display: none"> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompCategory','','media/icons/buttons/button_comp_category_m.jpg',1)"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompName','','media/icons/buttons/button_comp_name_m.jpg',1)"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompVendor','','media/icons/buttons/button_comp_vendor_m.jpg',1)"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompRank','','media/icons/buttons/button_comp_rank_m.jpg',1)"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('SubApp','','media/icons/buttons/button_comp_submit_m.jpg',1)"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <table width="231" height="49" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> - <table width="100%" border="0"> + +class Home extends HTML +{ + + + + protected function body( ) + { + global $RSDB_intern_code_view_name; + global $RSDB_intern_index_php; + global $RSDB_intern_link_db_sec; + global $RSDB_intern_user_id; + global $RSDB_intern_loginsystem_fullpath; + global $RSDB_intern_link_item_comp; + + echo ' + <script type="text/JavaScript"> +  + </script> + <style type="text/css"> +  + </style> + <body onLoad="'."MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg', 'media/icons/buttons/button_comp_category_m.jpg', 'media/icons/buttons/button_comp_name_m.jpg', 'media/icons/buttons/button_comp_vendor_m.jpg', 'media/icons/buttons/button_comp_rank_m.jpg', 'media/icons/buttons/button_comp_submit_m.jpg');".'"> + + <h1>Compatibility Database - Overview</h1> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="110"> </td> - <td><input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="loadItemList(this.value,'table','comp','ajaxload','sresult')" onKeyUp="loadItemList(this.value,'table','comp','ajaxload','sresult')" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /><img id="ajaxload" src="images/ajax_loading.gif" style="display: none"> - <script language="JavaScript" type="text/JavaScript"> -  - </script> - <?php - //include("inc/comp/sub/search_box.php"); - ?> - </td> + <td width="100%" valign="top"> + <p style="font-size:2;">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility with ReactOS.</p> + <div id="StartList" style="display: none;text-align:center;"> + <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompCategory', '', 'media/icons/buttons/button_comp_category_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompName', '', 'media/icons/buttons/button_comp_name_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompVendor', '', 'media/icons/buttons/button_comp_vendor_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompRank', '', 'media/icons/buttons/button_comp_rank_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('SubApp', '', 'media/icons/buttons/button_comp_submit_m.jpg', 1)".'"> + <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> + </a> + <br /> + <table width="231" height="49" border="0" cellpadding="0" cellspacing="0" style="margin: 0px auto;"> + <tr> + <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> + <table width="100%" border="0"> + <tr> + <td width="110"> </td> + <td> + <input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" onKeyUp="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /> + <img id="ajaxload" src="images/ajax_loading.gif" style="display: none" /> + <script language="JavaScript" type="text/JavaScript"> +  + </script> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> + <div style="text-align:center;"> + <noscript> + <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=false"> + <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=false"> + <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=false"> + <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=false"> + <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=false"> + <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'search&ajax=false"> + <img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0" /> + </a> + <br /> + </noscript> + </div> + </td> + <td style="text-align:right;vertical-align:top;"> + <img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400" /> + </td> </tr> </table> - </td> - </tr> - </table> -</div> -<div align="center"> - <noscript> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=false"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=false"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=false"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>search&ajax=false"><img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0"></a><br> - </noscript> -</div> -</td> - <td align="right" valign="top"><img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400"></td> - </tr> -</table> -<div id="sresult" style="display: none"></div> -<h3>Features</h3> -<p>Some of the <strong>features of the Compatibility Database</strong> are:</p> -<ul> - <li>Browse through the database in several different ways (by <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0">category</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all">name</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all">vendor</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank">ranks</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>search">search</a>).</li> - <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> - <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> - <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> - <li>Ability to sign up to be an application maintainer.<br /> -</li> -</ul> -<h3>Recent submissions<font color="#B5E196"></font></h3> -<p>There are <a href="<?php echo $RSDB_intern_link_db_sec; ?>stats"><b> - <?php - - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); - $stmt->execute(); - $result_count_cat = $stmt->fetch(); - echo $result_count_cat[0]; - - -?> applications and drivers</b></a> currently in the database.</p> - -<div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> -<br /> -<table width="500" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> - <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> - <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> - </tr> - <?php - $cellcolor1="#E2E2E2"; - $cellcolor2="#EEEEEE"; - $cellcolorcounter="0"; - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); - $stmt->execute(); - while($result_date_entry_records = $stmt->fetch(PDO::FETCH_ASSOC)) { -?> - <tr bgcolor="<?php - $cellcolorcounter++; - if ($cellcolorcounter == "1") { - echo $cellcolor1; - $farbe = $cellcolor1; - } - elseif ($cellcolorcounter == "2") { - $cellcolorcounter="0"; - echo $cellcolor2; - $farbe = $cellcolor2; - } - ?>"> - <td><div align="center"><font size="1" face="Arial, Helvetica, sans-serif"> - <?php - echo $result_date_entry_records['test_user_submit_timestamp']; - - ?> - </font></div></td> - <td><font size="2" face="Arial, Helvetica, sans-serif">   - <?php - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); - $stmt->bindParam('comp_id',$result_date_entry_records['test_comp_id'],PDO::PARAM_STR); + <div id="sresult" style="display: none"></div> + <h3>Features</h3> + <p>Some of the <strong>features of the Compatibility Database</strong> are:</p> + <ul> + <li>Browse through the database in several different ways (by <a href="'.$RSDB_intern_link_db_sec.'category&cat=0">category</a>, <a href="'.$RSDB_intern_link_db_sec.'name&letter=all">name</a>, <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all">vendor</a>, <a href="'.$RSDB_intern_link_db_sec.'rank">ranks</a>, <a href="'.$RSDB_intern_link_db_sec.'search">search</a>).</li> + <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> + <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> + <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> + <li>Ability to sign up to be an application maintainer.<br /></li> + </ul> + <h3>Recent submissions</h3>'; + + // get number of entries + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); $stmt->execute(); - $result_date_vendor = $stmt->fetch(PDO::PARAM_STR); - echo "<b><a href=\"". $RSDB_intern_link_item_comp.$result_date_vendor['comp_id'] ."&item2=tests\">".$result_date_vendor['comp_name']."</a></b>"; - - ?> - </font></td> - <td><div align="left"><font size="2" face="Arial, Helvetica, sans-serif">  - <?php - echo Star::drawSmall($result_date_entry_records['test_result_function'], 1, 5, ""); - ?> - </font></div></td> - </tr> - <?php - } -?> -</table> -</div> -<?php - if ($RSDB_intern_user_id <= 0) { -?> - <p><font size="2">Some of the features of the ReactOS Compatibility Database require that you have a <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=register">myReactOS account</a> and are <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=login">logged in</a>.</font></p> -<?php - } -?> -<script language="JavaScript" type="text/JavaScript"> - -</script> + echo ' + <p>There are <a href="'.$RSDB_intern_link_db_sec.'stats"><strong>'.$stmt->fetchColumn().' applications and drivers</strong></a> currently in the database.</p> + <div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> + <br /> + <table width="500" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> + <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> + <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> + </tr>'; + + //@MOVEME to css + $cellcolor1='#E2E2E2'; + $cellcolor2='#EEEEEE'; + $cellcolorcounter=0; + + // show latest tests + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); + $stmt->execute(); + while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) { + + // get programm name to the test + $stmt_comp=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); + $stmt_comp->bindParam('comp_id',$entry['test_comp_id'],PDO::PARAM_STR); + $stmt_comp->execute(); + $comp = $stmt_comp->fetchOnce(PDO::FETCH_ASSOC); + + $cellcolorcounter++; + echo ' + <tr style="background-color:'.($cellcolorcounter%2 ? $cellcolor1 : $cellcolor2).';"> + <td style="text-align: center;font-size:1;">'.$entry['test_user_submit_timestamp'].'</td> + <td style="font-size:2;"> <strong><a href="'.$RSDB_intern_link_item_comp.$comp['comp_id'].'&item2=tests">'.$comp['comp_name'].'</a></strong></td> + <td style="font-size:2;"> '.Star::drawSmall($entry['test_result_function'], 1, 5, '').'</td> + </tr>'; + } + + echo ' + </table> + </div>'; + + // print some login blah to guest users + if ($RSDB_intern_user_id <= 0) { + echo '<p style="font-size:2;">Some of the features of the ReactOS Compatibility Database require that you have a <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=register">myReactOS account</a> and are <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=login">logged in</a>.</p>'; + } + + echo ' + <script type="text/JavaScript"> +  + </script>'; + } // end of member function body + + + +} // end of Home Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[fireball] 40363: Evgeniy Boltik <bstsoft@narod.ru> - Enable and use mask support in UserDrawIconEx, fully compatible with Windows, based on tests in bug 4336. - Remove IntSet[Text/Bk]Color hacks from UserDrawIconEx, no longer required due to fix in CreateCompatibleDC. - Change a few comments in the code of UserDrawIconEx. See issue #4336 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Apr 4 22:52:14 2009 New Revision: 40363 URL: http://svn.reactos.org/svn/reactos?rev=40363&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Enable and use mask support in UserDrawIconEx, fully compatible with Windows, based on tests in bug 4336. - Remove IntSet[Text/Bk]Color hacks from UserDrawIconEx, no longer required due to fix in CreateCompatibleDC. - Change a few comments in the code of UserDrawIconEx. See issue #4336 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Apr 4 22:52:14 2009 @@ -1388,8 +1388,6 @@ return FALSE; } - -/* FIXME: ReactOS specific hack */ BOOL UserDrawIconEx( HDC hDc, @@ -1405,7 +1403,6 @@ BOOL Ret = FALSE; HBITMAP hbmMask, hbmColor; BITMAP bmpMask, bmpColor; - COLORREF oldFg, oldBg; BOOL DoFlickerFree; SIZE IconSize; @@ -1413,8 +1410,10 @@ HGDIOBJ hOldOffBrush = 0; HGDIOBJ hOldOffBmp = 0; HBITMAP hbmOff = 0; - HDC hdcMem = 0; - HGDIOBJ hOldMem; + HDC hdcMask = 0; + HGDIOBJ hOldMask = NULL; + HDC hdcImage = 0; + HGDIOBJ hOldImage = NULL; BOOL bAlpha = FALSE; hbmMask = pIcon->IconInfo.hbmMask; @@ -1452,7 +1451,8 @@ PFN_DIB_GetPixel fnSource_GetPixel = NULL; INT x, y; - //Find alpha into icon + /* In order to correctly display 32 bit icons Windows first scans the image, + because information about transparency is not stored in any image's headers */ psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); if (psurfOff) { @@ -1549,60 +1549,62 @@ else hdcOff = hDc; - hdcMem = NtGdiCreateCompatibleDC(hDc); - if (!hdcMem) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - goto cleanup; - } - - oldFg = IntGdiSetTextColor(hdcOff, RGB(0, 0, 0)); - oldBg = IntGdiSetBkColor(hdcOff, RGB(255, 255, 255)); - - if (diFlags & DI_MASK) - { - hOldMem = NtGdiSelectBitmap(hdcMem, hbmMask); - if (!hOldMem) + if (diFlags & DI_IMAGE) + { + hdcImage = NtGdiCreateCompatibleDC(hDc); + if (!hdcImage) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + hOldImage = NtGdiSelectBitmap(hdcImage, (hbmColor ? hbmColor : hbmMask)); + if (!hOldImage) { DPRINT("NtGdiSelectBitmap() failed!\n"); goto cleanup; } - - NtGdiStretchBlt(hdcOff, - (DoFlickerFree || bAlpha ? 0 : xLeft), - (DoFlickerFree || bAlpha ? 0 : yTop), - cxWidth, - cyHeight, - hdcMem, - 0, - 0, - IconSize.cx, - IconSize.cy, - ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), - 0); - - NtGdiSelectBitmap(hdcMem, hOldMem); - } - - if(diFlags & DI_IMAGE) - { - hOldMem = NtGdiSelectBitmap(hdcMem, (hbmColor ? hbmColor : hbmMask)); - - NtGdiStretchBlt(hdcOff, - (DoFlickerFree || bAlpha ? 0 : xLeft), - (DoFlickerFree || bAlpha ? 0 : yTop), - cxWidth, - cyHeight, - hdcMem, - 0, - (hbmColor ? 0 : IconSize.cy), - IconSize.cx, - IconSize.cy, - ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), - 0); - - NtGdiSelectBitmap(hdcMem, hOldMem); - } + } + + /* If DI_IMAGE flag is specified and hbmMask exists, then always use mask for drawing */ + if (diFlags & DI_MASK || (diFlags & DI_IMAGE && hbmMask)) + { + hdcMask = NtGdiCreateCompatibleDC(hDc); + if (!hdcMask) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + + hOldMask = NtGdiSelectBitmap(hdcMask, hbmMask); + if (!hOldMask) + { + DPRINT("NtGdiSelectBitmap() failed!\n"); + goto cleanup; + } + } + + if (hdcMask || hdcImage) + { + GreStretchBltMask(hdcOff, + (DoFlickerFree || bAlpha) ? 0 : xLeft, + (DoFlickerFree || bAlpha) ? 0 : yTop, + cxWidth, + cyHeight, + hdcImage ? hdcImage : hdcMask, + 0, + ((diFlags & DI_MASK && !(diFlags & DI_IMAGE)) || + (diFlags & DI_IMAGE && hbmColor) ? 0 : IconSize.cy), + IconSize.cx, + IconSize.cy, + SRCCOPY, + 0, + hdcImage ? hdcMask : NULL); + } + + if (hOldMask) NtGdiSelectBitmap(hdcMask, hOldMask); + if (hOldImage) NtGdiSelectBitmap(hdcImage, hOldImage); + if (hdcImage) NtGdiDeleteObjectApp(hdcImage); + if (hdcMask) NtGdiDeleteObjectApp(hdcMask); if (bAlpha) { @@ -1673,9 +1675,6 @@ cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); } - IntGdiSetTextColor(hdcOff, oldFg); - IntGdiSetBkColor(hdcOff, oldBg); - Ret = TRUE; cleanup: @@ -1687,7 +1686,6 @@ if(hdcOff) NtGdiDeleteObjectApp(hdcOff); } - if(hdcMem) NtGdiDeleteObjectApp(hdcMem); return Ret; }

16 years, 3 months

[fireball] 40362: Evgeniy Boltik <bstsoft@narod.ru> - Fix copypaste mistake in EngStretchBltROP. - Fix check in EngStretchBltROP, it should check original InputRect, not the clipped one. - Fix improper variable type in DIB_XXBPP_StretchBlt: PatternX and PatternY could be negative. See issue #4336 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Apr 4 22:24:24 2009 New Revision: 40362 URL: http://svn.reactos.org/svn/reactos?rev=40362&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Fix copypaste mistake in EngStretchBltROP. - Fix check in EngStretchBltROP, it should check original InputRect, not the clipped one. - Fix improper variable type in DIB_XXBPP_StretchBlt: PatternX and PatternY could be negative. See issue #4336 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Sat Apr 4 22:24:24 2009 @@ -50,7 +50,7 @@ PFN_DIB_GetPixel fnPattern_GetPixel = NULL; PFN_DIB_GetPixel fnMask_GetPixel = NULL; - ULONG PatternX = 0, PatternY = 0; + LONG PatternX = 0, PatternY = 0; BOOL UsesSource = ROP4_USES_SOURCE(ROP); BOOL UsesPattern = ROP4_USES_PATTERN(ROP); Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Apr 4 22:24:24 2009 @@ -938,8 +938,8 @@ } if (OutputRect.bottom < OutputRect.top) { - OutputRect.left = prclDest->right; - OutputRect.right = prclDest->left; + OutputRect.top = prclDest->bottom; + OutputRect.bottom = prclDest->top; } InputRect = *prclSrc; @@ -1198,8 +1198,8 @@ } InputRect = *SourceRect; - if (InputClippedRect.right < InputClippedRect.left || - InputClippedRect.bottom < InputClippedRect.top) + if (InputRect.right < InputRect.left || + InputRect.bottom < InputRect.top) { /* Everything clipped away, nothing to do */ return TRUE;

16 years, 3 months

[jmorlan] 40361: - Check for cmd's AutoRun registry value in HKEY_CURRENT_USER as well as HKEY_LOCAL_MACHINE. - Allow AutoRun commands to be longer than MAX_PATH.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Apr 4 21:51:55 2009 New Revision: 40361 URL: http://svn.reactos.org/svn/reactos?rev=40361&view=rev Log: - Check for cmd's AutoRun registry value in HKEY_CURRENT_USER as well as HKEY_LOCAL_MACHINE. - Allow AutoRun commands to be longer than MAX_PATH. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Apr 4 21:51:55 2009 @@ -1525,13 +1525,13 @@ #endif static VOID -ExecuteAutoRunFile (VOID) -{ - TCHAR autorun[MAX_PATH]; - DWORD len = MAX_PATH; +ExecuteAutoRunFile(HKEY hkeyRoot) +{ + TCHAR autorun[2048]; + DWORD len = sizeof autorun; HKEY hkey; - if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + if (RegOpenKeyEx(hkeyRoot, _T("SOFTWARE\\Microsoft\\Command Processor"), 0, KEY_READ, @@ -1547,9 +1547,8 @@ if (*autorun) ParseCommandLine(autorun); } + RegCloseKey(hkey); } - - RegCloseKey(hkey); } /* Get the command that comes after a /C or /K switch */ @@ -1756,7 +1755,10 @@ AddBreakHandler (); if (AutoRun) - ExecuteAutoRunFile(); + { + ExecuteAutoRunFile(HKEY_LOCAL_MACHINE); + ExecuteAutoRunFile(HKEY_CURRENT_USER); + } if (*ptr) {

16 years, 3 months

[janderwald] 40360: - Re-use WorkItem - Fixes leaking a workitem for each pin creation request

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Apr 4 20:04:25 2009 New Revision: 40360 URL: http://svn.reactos.org/svn/reactos?rev=40360&view=rev Log: - Re-use WorkItem - Fixes leaking a workitem for each pin creation request Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Sat Apr 4 20:04:25 2009 @@ -10,9 +10,6 @@ */ #include "private.h" -#include <devguid.h> -#include <initguid.h> -#include <ksmedia.h> /* This is called from DriverEntry so that PortCls can take care of some @@ -152,6 +149,9 @@ /* clear initializing flag */ fdo->Flags &= ~ DO_DEVICE_INITIALIZING; + /* allocate work item */ + portcls_ext->WorkItem = IoAllocateWorkItem(fdo); + /* allocate the device header */ status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, MaxObjects, portcls_ext->CreateItems); /* did we succeed */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sat Apr 4 20:04:25 2009 @@ -500,7 +500,6 @@ IIrpTarget *Filter; PKSOBJECT_CREATE_ITEM CreateItem; PPIN_WORKER_CONTEXT Context; - PIO_WORKITEM WorkItem; DPRINT("PcCreateItemDispatch called DeviceObject %p\n", DeviceObject); @@ -599,20 +598,11 @@ Context->Filter = Filter; Context->Irp = Irp; - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkItem) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - FreeItem(Context, TAG_PORTCLASS); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } DPRINT("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_PENDING; IoMarkIrpPending(Irp); - IoQueueWorkItem(WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); + IoQueueWorkItem(DeviceExt->WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); return STATUS_PENDING; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Apr 4 20:04:25 2009 @@ -156,7 +156,7 @@ ULONG MaxSubDevices; KSOBJECT_CREATE_ITEM * CreateItems; - + PIO_WORKITEM WorkItem; IResourceList* resources; LIST_ENTRY SubDeviceList; LIST_ENTRY PhysicalConnectionList;

16 years, 3 months

[cgutman] 40359: - Don't pass the address type to IPInitializePacket because it is set later - Fix packet corruption caused by using uninitialized data

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Apr 4 05:22:33 2009 New Revision: 40359 URL: http://svn.reactos.org/svn/reactos?rev=40359&view=rev Log: - Don't pass the address type to IPInitializePacket because it is set later - Fix packet corruption caused by using uninitialized data Modified: trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Apr 4 05:22:33 2009 @@ -74,13 +74,12 @@ GetDataPtr( IPPacket->NdisPacket, MaxLLHeaderSize, (PCHAR *)&IPPacket->Header, &IPPacket->ContigSize ); - IPPacket->Data = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; - TI_DbgPrint(DEBUG_ICMP, ("Size (%d). Data at (0x%X).\n", Size, Data)); TI_DbgPrint(DEBUG_ICMP, ("NdisPacket at (0x%X).\n", NdisPacket)); IPPacket->HeaderSize = sizeof(IPv4_HEADER); IPPacket->TotalSize = Size - MaxLLHeaderSize; + IPPacket->Data = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; TI_DbgPrint(DEBUG_ICMP, ("Copying Address: %x -> %x\n", &IPPacket->DstAddr, Destination)); Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Apr 4 05:22:33 2009 @@ -46,8 +46,7 @@ return; } - /* FIXME: IPv4 only */ - IPInitializePacket(&IPPacket, IP_ADDRESS_V4); + IPInitializePacket(&IPPacket, 0); NdisGetFirstBufferFromPacket(XmitPacket, &NdisBuffer,

16 years, 3 months

[cgutman] 40358: - Validate the buffer size before copying to it

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Apr 4 04:41:42 2009 New Revision: 40358 URL: http://svn.reactos.org/svn/reactos?rev=40358&view=rev Log: - Validate the buffer size before copying to it Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Apr 4 04:41:42 2009 @@ -126,6 +126,12 @@ ("Target Buffer: %x, Source Buffer: %x, Size %d\n", Current->Buffer, DataBuffer, DataSize)); + if (DataSize > Current->BufferSize) + { + Current->Complete(Current->Context, STATUS_BUFFER_TOO_SMALL, DataSize); + return; + } + /* Copy the data into buffer provided by the user */ RtlCopyMemory( Current->Buffer, DataBuffer,

16 years, 3 months

[cgutman] 40357: - Remove the rest of the code that sets the wrong IRP's status

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Apr 4 04:36:43 2009 New Revision: 40357 URL: http://svn.reactos.org/svn/reactos?rev=40357&view=rev Log: - Remove the rest of the code that sets the wrong IRP's status Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -84,11 +84,8 @@ /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); @@ -136,8 +133,6 @@ Status = MakeSocketIntoConnection( FCB ); if( !NT_SUCCESS(Status) ) { - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return Status; } @@ -156,12 +151,6 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - } - - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; } SocketStateUnlock( FCB ); Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -98,11 +98,8 @@ PLIST_ENTRY NextIrpEntry, QeltEntry; PIRP NextIrp; - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->ListenIrp.InFlightRequest = NULL; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -260,8 +260,6 @@ return STATUS_FILE_CLOSED; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_INVALID_PARAMETER; } @@ -464,11 +462,8 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->ReceiveIrp.InFlightRequest = NULL; @@ -514,8 +509,6 @@ } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; if( DatagramRecv ) ExFreePool( DatagramRecv ); SocketStateUnlock( FCB ); return Status; 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] Sat Apr 4 04:36:43 2009 @@ -40,9 +40,8 @@ ASSERT_IRQL(APC_LEVEL); - if( !SocketAcquireStateLock( FCB ) ) { + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ @@ -179,9 +178,8 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); - if( !SocketAcquireStateLock( FCB ) ) { + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */

16 years, 3 months

[cgutman] 40356: - Initialize packets before using them - Part 2 of 2

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Apr 4 04:24:20 2009 New Revision: 40356 URL: http://svn.reactos.org/svn/reactos?rev=40356&view=rev Log: - Initialize packets before using them - Part 2 of 2 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Apr 4 04:24:20 2009 @@ -254,6 +254,8 @@ Adapter = WorkItem->Adapter; BytesTransferred = WorkItem->BytesTransferred; + IPInitializePacket(&IPPacket, 0); + IPPacket.NdisPacket = Packet; NdisGetFirstBufferFromPacket(Packet, @@ -289,6 +291,7 @@ TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); ARPReceive(Adapter->Context, &IPPacket); default: + IPPacket.Free(&IPPacket); break; }

16 years, 3 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