Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[weiden] 19916: implemented enabling/disabling of devices

by weiden＠svn.reactos.com

implemented enabling/disabling of devices Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-05 20:12:32 UTC (rev 19915) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-05 20:23:23 UTC (rev 19916) @@ -34,13 +34,6 @@ typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); typedef BOOL (WINAPI *PDESTROYPROPERTYSHEETPAGE)(HPROPSHEETPAGE); -typedef enum -{ - DEA_DISABLE = 0, - DEA_ENABLE, - DEA_UNKNOWN -} DEVENABLEACTION; - typedef struct _DEVADVPROP_INFO { HWND hWndGeneralPage; @@ -83,14 +76,10 @@ { INT Index; UINT i; - struct + UINT Actions[] = { - UINT szId; - DEVENABLEACTION Action; - } Actions[] = - { - {IDS_ENABLEDEVICE, DEA_ENABLE}, - {IDS_DISABLEDEVICE, DEA_DISABLE}, + IDS_ENABLEDEVICE, + IDS_DISABLEDEVICE, }; for (i = 0; @@ -99,7 +88,7 @@ { /* fill in the device usage combo box */ if (LoadString(hDllInstance, - Actions[i].szId, + Actions[i], dap->szTemp, sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) { @@ -112,11 +101,11 @@ SendMessage(hComboBox, CB_SETITEMDATA, (WPARAM)Index, - (LPARAM)Actions[i].Action); + (LPARAM)Actions[i]); - switch (Actions[i].Action) + switch (Actions[i]) { - case DEA_ENABLE: + case IDS_ENABLEDEVICE: if (dap->DeviceEnabled) { SendMessage(hComboBox, @@ -126,7 +115,7 @@ } break; - case DEA_DISABLE: + case IDS_DISABLEDEVICE: if (!dap->DeviceEnabled) { SendMessage(hComboBox, @@ -145,11 +134,11 @@ } -static DEVENABLEACTION +static UINT GetSelectedUsageAction(IN HWND hComboBox) { INT Index; - DEVENABLEACTION Ret = DEA_UNKNOWN; + UINT Ret = 0; Index = (INT)SendMessage(hComboBox, CB_GETCURSEL, @@ -161,9 +150,9 @@ CB_GETITEMDATA, (WPARAM)Index, 0); - if (iRet != CB_ERR && iRet < (INT)DEA_UNKNOWN) + if (iRet != CB_ERR) { - Ret = (DEVENABLEACTION)iRet; + Ret = (UINT)iRet; } } @@ -171,44 +160,70 @@ } -static VOID +static BOOL ApplyGeneralSettings(IN HWND hwndDlg, IN PDEVADVPROP_INFO dap) { + BOOL Ret = FALSE; + if (dap->DeviceUsageChanged && dap->IsAdmin) { - DEVENABLEACTION SelectedUsageAction; + UINT SelectedUsageAction; + BOOL NeedReboot = FALSE; SelectedUsageAction = GetSelectedUsageAction(GetDlgItem(hwndDlg, IDC_DEVUSAGE)); - if (SelectedUsageAction != DEA_UNKNOWN) + switch (SelectedUsageAction) { - switch (SelectedUsageAction) - { - case DEA_ENABLE: - if (!dap->DeviceEnabled) - { - /* FIXME - enable device */ - } - break; + case IDS_ENABLEDEVICE: + if (!dap->DeviceEnabled) + { + Ret = EnableDevice(dap->DeviceInfoSet, + &dap->DeviceInfoData, + TRUE, + 0, + &NeedReboot); + } + break; - case DEA_DISABLE: - if (dap->DeviceEnabled) - { - /* FIXME - disable device */ - } - break; + case IDS_DISABLEDEVICE: + if (dap->DeviceEnabled) + { + Ret = EnableDevice(dap->DeviceInfoSet, + &dap->DeviceInfoData, + FALSE, + 0, + &NeedReboot); + } + break; - default: - break; + default: + break; + } + + if (Ret) + { + if (NeedReboot) + { + /* make PropertySheet() return PSM_REBOOTSYSTEM */ + PropSheet_RebootSystem(hwndDlg); } } + else + { + /* FIXME - display an error message */ + DPRINT1("Failed to enable/disable device! LastError: %d\n", + GetLastError()); + } } + else + Ret = !dap->DeviceUsageChanged; /* disable the apply button */ PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); dap->DeviceUsageChanged = FALSE; + return Ret; } _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-05 20:12:32 UTC (rev 19915) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-05 20:23:23 UTC (rev 19916) @@ -613,6 +613,71 @@ BOOL +EnableDevice(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, + IN BOOL bEnable, + IN DWORD HardwareProfile OPTIONAL, + OUT BOOL *bNeedReboot OPTIONAL) +{ + SP_PROPCHANGE_PARAMS pcp; + SP_DEVINSTALL_PARAMS dp; + DWORD LastErr; + BOOL Ret = FALSE; + + pcp.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + pcp.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; + pcp.HwProfile = HardwareProfile; + + if (bEnable) + { + /* try to enable/disable the device on the global profile */ + pcp.StateChange = DICS_ENABLE; + pcp.Scope = DICS_FLAG_GLOBAL; + + /* ignore errors */ + LastErr = GetLastError(); + if (SetupDiSetClassInstallParams(DeviceInfoSet, + DevInfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + DeviceInfoSet, + DevInfoData); + } + SetLastError(LastErr); + } + + /* try config-specific */ + pcp.StateChange = (bEnable ? DICS_ENABLE : DICS_DISABLE); + pcp.Scope = DICS_FLAG_CONFIGSPECIFIC; + + if (SetupDiSetClassInstallParams(DeviceInfoSet, + DevInfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS)) && + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + DeviceInfoSet, + DevInfoData)) + { + dp.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams(DeviceInfoSet, + DevInfoData, + &dp)) + { + if (bNeedReboot != NULL) + { + *bNeedReboot = ((dp.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) != 0); + } + + Ret = TRUE; + } + } + return Ret; +} + + +BOOL GetDeviceTypeString(IN PSP_DEVINFO_DATA DeviceInfoData, OUT LPWSTR szBuffer, IN DWORD BufferSize) _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-05 20:12:32 UTC (rev 19915) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-05 20:23:23 UTC (rev 19916) @@ -267,6 +267,13 @@ OUT BOOL *IsEnabled); BOOL +EnableDevice(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, + IN BOOL bEnable, + IN DWORD HardwareProfile OPTIONAL, + OUT BOOL *bNeedReboot OPTIONAL); + +BOOL GetDeviceTypeString(IN PSP_DEVINFO_DATA DeviceInfoData, OUT LPWSTR szBuffer, IN DWORD BufferSize);

18 years, 9 months

[frik85] 19915: RosCMS Update:

by frik85＠svn.reactos.com

RosCMS Update: * improve "Translation Interface", it's now usable! * Website status page (latest updates, translation overview) * start with the challenge to move the RosCMS colors to a separate file * improve user account interface pages Added: trunk/web/reactos.org/htdocs/roscms/colors.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php Added: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php Modified: trunk/web/reactos.org/htdocs/roscms/index.php _____ Added: trunk/web/reactos.org/htdocs/roscms/colors.php --- trunk/web/reactos.org/htdocs/roscms/colors.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/colors.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -0,0 +1,27 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 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. + */ + + + // RosCMS Colors: + $roscms_intern_color0="#5984C3"; // table head line + $roscms_intern_color1="#E2E2E2"; // table color1 + $roscms_intern_color2="#EEEEEE"; // table color2 + +?> \ No newline at end of file Property changes on: trunk/web/reactos.org/htdocs/roscms/colors.php ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -38,7 +38,23 @@ ?> -<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Content</span> +<div class="contentSmall"> <span class="contentSmallTitle"><?php + if ($rpm_page == "admin") { + echo "Admin Interface - Content"; + } + elseif ($rpm_page == "dev") { + echo "Dev Interface - Content"; + } + elseif ($rpm_page == "trans") { + echo "Translator Interface - Content"; + } + elseif ($rpm_page == "team") { + echo "Team Interface - Content"; + } + else { + echo $rpm_page." Interface - Content"; + } + ?></span> <ul> <li><strong>Content</strong></li> </ul> @@ -47,14 +63,14 @@ sort</a></p> <?php - if($roscms_intern_account_level>50) { + if($roscms_intern_usrgrp_admin == true) { $rpm_content_active=""; $rpm_content_active_set=""; if(array_key_exists("content_active", $_GET)) $rpm_content_active=$_GET["content_active"]; if(array_key_exists("content_active_set", $_GET)) $rpm_content_active_set=$_GET["content_active_set"]; if ($rpm_content_active != "" AND $rpm_content_active_set != "") { - $content_postc="UPDATE `content` SET `content_active` = '$rpm_content_active' WHERE `content_id` = '$rpm_content_active_set' LIMIT 1 ;"; + $content_postc="UPDATE `content` SET `content_active` = '$rpm_content_active' WHERE `content_id` = '". $rpm_content_active_set ."' LIMIT 1 ;"; $content_post_listc=mysql_query($content_postc); } } @@ -62,7 +78,7 @@ if ($rpm_lang_id == "") { if (($roscms_intern_usrgrp_trans == true || $roscms_intern_usrgrp_team == true) && ($rpm_page == "trans" || $rpm_page == "team")) { - $rpm_lang_id="en"; + $rpm_lang_id="nolang"; } else { $rpm_lang_id="all"; @@ -78,17 +94,23 @@ echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=all">All</ a>'; } echo ' | '; + } + if ($rpm_lang_id == "nolang") { echo '<b>International</b>'; - $ros_cms_intern_content_lang = "AND content_lang = 'all'"; + if ($roscms_intern_usrgrp_admin == true) { + $ros_cms_intern_content_lang = "AND content_lang = 'all'"; + } + if ($roscms_intern_usrgrp_dev == true && $rpm_page == "dev") { + $ros_cms_intern_content_lang = "AND content_lang = 'all'"; + } + if (($roscms_intern_usrgrp_team == true && $rpm_page == "team") || ($roscms_intern_usrgrp_trans == true && $rpm_page == "trans")) { + $ros_cms_intern_content_lang = "AND content_lang = 'all' AND content_type = 'default'"; + } } else { echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=nolang">In ternational</a>'; } - } - else { - echo '->'; - } // Languages $sql_lang="SELECT * FROM languages @@ -96,6 +118,11 @@ ORDER BY 'lang_level' DESC"; $sql_query_lang=mysql_query($sql_lang); while($myrow_lang=mysql_fetch_row($sql_query_lang)) { + if ($roscms_intern_usrgrp_dev != true || $roscms_intern_usrgrp_admin != true) { + if ($myrow_lang[0] == "en") { + continue; + } + } $roscms_sel_lang = $myrow_lang[0]; echo ' | '; if ($rpm_lang_id == $roscms_sel_lang) { @@ -285,8 +312,8 @@ die(""); } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; @@ -308,7 +335,7 @@ <div align="center"> <a name="<?php echo $result_content['content_id']; ?>"></a> <?php - if (($roscms_intern_usrgrp_trans == true || $roscms_intern_usrgrp_team == true) && ($rpm_page == "trans" || $rpm_page == "team") && $rpm_lang_id == "en") { ?> + if (($roscms_intern_usrgrp_trans == true || $roscms_intern_usrgrp_team == true) && ($rpm_page == "trans" || $rpm_page == "team") && $rpm_lang_id == "nolang") { ?> <a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=edit&opt=translate&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id.'&a mp;db_id='.$result_content['content_id']; ?>"><img src="images/tool.gif" alt="Translate" width="19" height="18" border="0"></a> <?php } else { ?> <a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=edit&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id.'&a mp;db_id='.$result_content['content_id']; ?>"><img src="images/view.gif" alt="View" width="19" height="18" border="0"></a> @@ -327,8 +354,10 @@ --> </script> <a href="javascript:DeleteContent()"><img src="images/delete.gif" alt="Delete" width="19" height="18" border="0"></a> + <?php } + if($roscms_intern_usrgrp_admin == true || $roscms_intern_usrgrp_team == true) {?> + <a href="<?php echo "?page=".$rpm_page."&sec=content&sec2=view&sort=version& filt=history&opt=".$result_content['content_name']."&langid=".$r esult_content['content_lang']; ?>"><img src="images/history.gif" alt="Filter: history" width="19" height="18" border="0"></a> <?php } ?> - <a href="<?php echo "?page=".$rpm_page."&sec=content&sec2=view&sort=version& filt=history&opt=".$result_content['content_name']."&langid=".$r esult_content['content_lang']; ?>"><img src="images/history.gif" alt="Filter: history" width="19" height="18" border="0"></a> </div></td> <td width="3%" valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="center"> <?php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -18,7 +18,23 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ ?> -<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Content</span> +<div class="contentSmall"> <span class="contentSmallTitle"><?php + if ($rpm_page == "admin") { + echo "Admin Interface - Content"; + } + elseif ($rpm_page == "dev") { + echo "Dev Interface - Content"; + } + elseif ($rpm_page == "trans") { + echo "Translator Interface - Content"; + } + elseif ($rpm_page == "team") { + echo "Team Interface - Content"; + } + else { + echo $rpm_page." Interface - Content"; + } + ?></span> <?php if(!isset($_POST['content_rad_opt']) || $_POST['content_rad_opt'] == "preview") { ?> <ul> <li><strong><a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=view&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id."#" .$rpm_db_id ; ?>">Content</a></strong> @@ -34,7 +50,7 @@ WHERE content_id = '$rpm_db_id' ORDER BY 'content_lang' ASC") ; - $farbe="#E2E2E2"; + $farbe=$roscms_intern_color1; $result_content = mysql_fetch_array($query_content); $roscms_intern_editor_content = ""; @@ -182,10 +198,6 @@ ?> </font></td> </tr> - <tr> - <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Action</strong></font></div></td> - <td valign="top" bgcolor="#EEEEEE"></td> - </tr> </table> <p> <?php @@ -232,12 +244,12 @@ <p> </p> <?php } else { ?> - <input name="content_rad_opt" type="radio" value="insert" <?php if($roscms_intern_usrgrp_admin != true OR $roscms_intern_content_name == "") { echo "checked"; } ?>> + <input name="content_rad_opt" type="radio" value="insert" <?php if($roscms_intern_account_id != $result_content['content_usrname_id'] || date("Y-m-d") != $result_content['content_date']) { echo "checked"; } ?>> Save (new version)   <?php - if(($roscms_intern_usrgrp_admin == true || $roscms_intern_account_id == $result_content['content_usrname_id']) AND $roscms_intern_content_name != "" ) { - ?> - <input name="content_rad_opt" type="radio" value="update" <?php if($result_content['content_editor'] != "bbcode") { echo "checked"; } ?>> + if(($roscms_intern_usrgrp_admin == true || ($roscms_intern_account_id == $result_content['content_usrname_id'] && date("Y-m-d") == $result_content['content_date'])) AND $roscms_intern_content_name != "" ) { + ?> + <input name="content_rad_opt" type="radio" value="update" <?php if($roscms_intern_account_id == $result_content['content_usrname_id'] && date("Y-m-d") == $result_content['content_date']) { echo "checked"; } ?>> Update <?php } ?> <?php @@ -299,7 +311,7 @@ if (array_key_exists("txt_extra", $_POST)) $content_extra=$_POST['txt_extra']; if (array_key_exists("content_rad_opt", $_POST)) $content_savemode=$_POST['content_rad_opt']; - echo "<br>aa".$content_act; + //echo "<br>".$content_act; if ($content_langa == "") { $content_langa = "all"; } @@ -351,20 +363,24 @@ if ($content_savemode == "update") { + $content_description = date("Y-m-d H:i:s")." [".$roscms_intern_account_id."] "; + $content_posta="UPDATE `content` SET `content_name` = '". mysql_escape_string($content_contentid) ."', `content_lang` = '". mysql_escape_string($content_langa) ."', `content_editor` = '". mysql_escape_string($content_extra) ."', `content_text` = '". mysql_real_escape_string($content_data) ."', `content_visible` = '". mysql_escape_string($content_vis) ."', `content_active` = '". mysql_escape_string($content_act) ."', - `content_date` = CURDATE( ) , - `content_time` = CURTIME( ) + `content_description` = '". mysql_escape_string($content_description) ."' WHERE `content_id` = '$rpm_db_id' LIMIT 1 ;"; //`content_active` = '1', //`content_usrname_id` = '$roscms_intern_account_id', + //`content_date` = CURDATE( ) , + //`content_time` = CURTIME( ) $content_post_lista=mysql_query($content_posta); } elseif ($content_savemode == "translate") { + $content_version="1"; $content_postb="INSERT INTO `content` ( `content_id` , `content_name` , `content_lang` , `content_editor` , `content_text` , `content_version` , `content_active` , `content_visible` , `content_date` , `content_time` , `content_usrname_id`) VALUES ('', '". mysql_escape_string($content_contentid) ."', '". mysql_escape_string($content_langa) ."', '". mysql_escape_string($content_extra) ."', '". mysql_real_escape_string($content_data) ."', '1', '". mysql_escape_string($content_act) ."', '". mysql_escape_string($content_vis) ."', CURDATE( ), CURTIME( ), '". mysql_escape_string($roscms_intern_account_id) ."');"; $content_post_listb=mysql_query($content_postb); @@ -402,9 +418,24 @@ WHERE content_id = '$rpm_db_id'") ; $result_content = mysql_fetch_array($query_content); - echo "<p>The content '".$result_content['content_name']."' (id='".$rpm_db_id."') has been saved!</p>"; - echo "<p><a href=".$_SERVER['HTTP_REFERER'].">Back to the 'content edit' page</a></p>"; + if ($content_savemode == "update") { + echo "<p>The content '".$result_content['content_name']."' (id='".$rpm_db_id."') has been saved!</p>"; + echo "<p><a href=".$_SERVER['HTTP_REFERER'].">Back to the 'content edit' page</a></p>"; + } + else { + $query_content_new_revision_preview = mysql_query("SELECT * + FROM `content` + WHERE `content_name` LIKE '$content_contentid' + AND `content_lang` = '$content_langa' + AND `content_version` = ". $content_version ." + LIMIT 1;"); + $result_content_new_revision_preview = mysql_fetch_array($query_content_new_revision_preview); + + echo "<p>A new version of content '".$result_content_new_revision_preview['content_name']."' (old id='".$rpm_db_id."', new id='". $result_content_new_revision_preview["content_id"] ."') has been saved!</p>"; + echo "<p><a href='?page=". $rpm_page ."&sec=content&sec2=edit&sort=". $rpm_sort ."&filt=". $rpm_filt ."&langid=". $rpm_lang_id ."&db_id=". $result_content_new_revision_preview['content_id'] ."'>Go to the 'content edit' page (revision ". $result_content_new_revision_preview["content_id"] .")</a></p>"; + echo "<p><a href='".$_SERVER['HTTP_REFERER']."'>Back to the 'content edit' page (revision ". $result_content['content_id'] .")</a></p>"; + } echo "<p> </p><p><fieldset><legend>Preview</legend><br>".$result_content ['content_text']."</fieldset></p>"; } _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -296,8 +296,8 @@ ORDER BY '$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ; } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; @@ -315,7 +315,7 @@ echo $farbe2; $farbe = $farbe2; } - ?>" title="RosCMS action buttons:

* View content
* Delete content
* Locked"> + ?>"> <div align="center"><a href="?page=admin&sec=dyncontent&sec2=edit&<?php echo 'sec3='.$result_content['dyn_content_name'].'&sort='.$rpm_sort.'&amp ;filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id.' &db_id='.$result_content['dyn_id']; ?>"><img src="images/view.gif" alt="View" width="19" height="18" border="0"></a> <a href="<?php echo "?page=admin&sec=dyncontent&sec2=view&sort=version&filt= history&opt=".$result_content['dyn_content_id']."&filt2=".$rpm_f ilt2."&langid=".$result_content['dyn_content_lang']; ?>"><img src="images/history.gif" alt="Filter: history" width="19" height="18" border="0"></a> </div></td> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -38,7 +38,7 @@ WHERE dyn_id = '$rpm_db_id' ORDER BY 'dyn_content_lang' ASC") ; - $farbe="#E2E2E2"; + $farbe=$roscms_intern_color1; $result_content = mysql_fetch_array($query_content); $roscms_intern_editor_content = $result_content['dyn_content_text4']; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -263,8 +263,8 @@ ORDER BY '$ros_cms_intern_pages_sortby' $ros_cms_intern_pages_sort") ; } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -209,8 +209,8 @@ ORDER BY '$ros_cms_intern_inctext_sortby' $ros_cms_intern_inctext_sort") ; } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -37,8 +37,8 @@ FROM languages ORDER BY 'lang_name' ASC") ; - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -252,8 +252,8 @@ ORDER BY '$ros_cms_intern_pages_sortby' $ros_cms_intern_pages_sort") ; } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -32,7 +32,7 @@ WHERE page_id = '$rpm_db_id' ORDER BY 'page_language' ASC") ; - $farbe="#E2E2E2"; + $farbe=$roscms_intern_color1; $result_page = mysql_fetch_array($query_page); ?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -62,8 +62,8 @@ FROM roscms_security_log ORDER BY 'roscms_sec_log_id' DESC") ; - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -201,8 +201,8 @@ ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort") ; } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -113,8 +113,8 @@ ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort") ; } - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -41,8 +41,8 @@ FROM usergroups ORDER BY 'usrgroup_securitylevel' ASC ;") ; - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -53,8 +53,8 @@ FROM user_sessions ORDER BY 'usersession_timestamp_touch2' DESC ;") ; - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $farbe1=$roscms_intern_color1; + $farbe2=$roscms_intern_color2; $zaehler="0"; //$farbe="#CCCCC"; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -349,7 +349,12 @@ $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_gererator."?page=$rpm_pag e&sec=generator&sec2=view&site=".$roscms_pagename."&lang =".$myrow_lang[0]."&forma=".$w3cformat."&skin=".$rpm_skin,$data_ page); // correct link } else { - $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$ roscms_pagename.".".$fileformat,$data_page); // correct link + if ($result_page_link['pages_extention'] == "default") { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$ roscms_pagename.".".$fileformat,$data_page); // correct link + } + else { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$ roscms_pagename.".".$result_page_link['pages_extention'],$data_page); // correct link + } } //echo " HTML: [#link_".$result_page_link['page_name']."]<br>"; } @@ -363,7 +368,12 @@ $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_gererator."?page=$rpm_pag e&sec=generator&sec2=view&site=".$roscms_pagename."&lang =".$myrow_lang[0]."&forma=".$w3cformat."&skin=".$rpm_skin,$data_ page); // correct link } else { - $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/". $roscms_pagename.".".$fileformat,$data_page); // correct link + if ($result_page_link['pages_extention'] == "default") { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/". $roscms_pagename.".".$fileformat,$data_page); // correct link + } + else { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/". $roscms_pagename.".".$result_page_link['pages_extention'],$data_page); // correct link + } } //echo " XHTML: [#link_".$result_page_link['page_name']."]<br>"; } @@ -378,15 +388,21 @@ switch ($rpm_sec2) { case "genpage": // generate a single page case "output": - // create HTML file: - $filename_page_html = $roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file.".".$fi leformat; // create HTML file + // create HTML file: + if ($result_page['pages_extention'] == "default") { + $output_fileformat = $fileformat; + } + else { + $output_fileformat = $result_page['pages_extention']; + } + $filename_page_html = $roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file.".".$ou tput_fileformat; // create HTML file $fp = fopen($filename_page_html,"w"); flock($fp,2); fputs($fp,$data_page); // write content fputs($fp,"\n\n"); flock($fp,3); fclose($fp); - echo "<br>    *   \"".$roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file."." .$fileformat."\" generated"; + echo "<br>    *   \"".$roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file."." .$output_fileformat."\" generated"; $page_gen_id=$result_page['page_id']; $page_gen_timestamp=time(); $page_gen_timestamp_query="UPDATE `pages` SET `page_generate_usrid` = '$roscms_intern_account_id', `page_generate_timestamp` = '$page_gen_timestamp' WHERE `page_id` = '$page_gen_id' LIMIT 1 ;"; @@ -400,7 +416,7 @@ echo("   (" . $showtimea . " sec; #".$roscms_intern_page_counter.")"); $roscms_intern_page_counter++; break; - default: + default: case "view": echo $data_page; echo "\n\n"; _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -0,0 +1,72 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 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. + */ + + +// +// The format of this file is ---> $roscms_langres['message'] = 'text'; +// + + +// Language settings +$roscms_langres['charset'] = 'iso-8859-1'; +$roscms_langres['lang_code'] = 'ES'; + + +// main menu +$roscms_langres['Navigation'] = 'Navigation'; +$roscms_langres['Home'] = 'Home'; +$roscms_langres['Dev'] = 'Development'; +$roscms_langres['Community'] = 'Community'; +$roscms_langres['Support'] = 'Support'; +$roscms_langres['myReactOS'] = 'myReactOS'; + +// Login bar: +$roscms_langres['Account'] = 'Account'; +$roscms_langres['Login'] = 'Login'; +$roscms_langres['Logout'] = 'Logout'; +$roscms_langres['Global_Login_System'] = 'Global Login System'; +$roscms_langres['Register_Account'] = 'Register Account'; +$roscms_langres['Login_Nick'] = ' Nick: '; +$roscms_langres['LoginPwd'] = ' Pwd: '; + + +// myReactOS menu +$roscms_langres['User_Profil_Overview'] = 'User Profile Overview'; +$roscms_langres['User_Profil'] = 'User Profile'; +$roscms_langres['Overview'] = 'Overview'; +$roscms_langres['Login_System'] = 'Login System'; +$roscms_langres['Messages'] = 'Messages'; +$roscms_langres['Contacts'] = 'Contacts'; +$roscms_langres['Favorites'] = 'Favorites'; +$roscms_langres['Documentation'] = 'Documentation'; +$roscms_langres['Account_Edit'] = 'Settings'; +$roscms_langres['Accountlist'] = 'User List'; + + +// myReactOS Content +$roscms_langres['myReactOS_description'] = 'A powerful and easy to use interface to manage your ReactOS homepage account.'; +$roscms_langres['Account_Information'] = 'Account Information'; +$roscms_langres['Account_Information_description'] = 'A sum up of the account data ... <placeholder>'; + +// Right side bar: +$roscms_langres['Latest_Release'] = 'Latest Release'; +$roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; + +?> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php --- trunk/web/reactos.org/htdocs/roscms/inc/login.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/login.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -157,6 +157,30 @@ } } +// Account level: + +if ($roscms_intern_usrgrp_sadmin == true) { + $roscms_intern_account_level = 100; +} +else { + if ($roscms_intern_usrgrp_admin == true) { + $roscms_intern_account_level = 75; + } + else { + if ($roscms_intern_usrgrp_dev == true) { + $roscms_intern_account_level = 50; + } + else { + if ($roscms_intern_usrgrp_team == true || $roscms_intern_usrgrp_trans == true) { + $roscms_intern_account_level = 25; + } + else { + $roscms_intern_account_level = 0; + } + } + } +} + // user id $roscms_intern_account_id = $roscms_currentuser_id; $roscms_intern_login_check_username=$result_usr['user_name']; @@ -164,7 +188,6 @@ // quick hack to test RosCMS; the following vars will change soon $roscms_intern_login_check_usrgroup = "ros_sadmin"; $roscms_intern_account_group = "ros_sadmin"; -$roscms_intern_account_level = 100; $roscms_intern_login_check = "valid"; // valid login sequenze ?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php --- trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -23,7 +23,7 @@ <h2>Intro</h2> <p>Welcome to the Translator Interface!</p> <p>If you use the RosCMS the first time, please take some time and read this documentation. - If you have any question about RosCMS, join the #reactos-hp irc channel and/or + If you have any question about RosCMS, join the #reactos-web irc channel and/or ask one of the admins.</p> <h3>About RosCMS</h3> <p>The RosCMS has been written from scratch by Klemens Friedl (frik85). Some parts @@ -43,7 +43,7 @@ <li><em>To be continued! [...]</em></li> </ul> <p>If you do NOT follow the rules, a member of the admin group will delete your - translator group memebership and/or ban/kick your account!</p> + translator group membership and/or ban/kick your account!</p> <h2>General</h2> <p align="left">Use the "filter & sort" function to browse through _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -32,7 +32,7 @@ $query_contenta = mysql_query("SELECT * FROM users WHERE user_id = '".$roscms_intern_account_id."'") ; - $farbe="#E2E2E2"; + $farbe=$roscms_intern_color1; $result_contenta = mysql_fetch_array($query_contenta); _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php --- trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -36,6 +36,7 @@ ?> <h1>myReactOS - User Accounts </h1> +<p>myReactOS user accounts sorted by account name</p> <?php @@ -49,7 +50,7 @@ $roscms_SET_curpos = 0; } -$query_count_cat=mysql_query("SELECT * +$query_count_cat=mysql_query("SELECT COUNT('user_id') FROM `users` WHERE `user_account_enabled` = 'yes' AND `user_account_hidden` = 'no' @@ -60,7 +61,12 @@ $j=0; for ($i=0; $i < $result_count_cat[0]; $i += $roscms_intern_items_per_page) { $j++; - echo "<a href='?page=user&sec=accountlist&curpos=".$i."'>".$j."</a> "; + if ($roscms_SET_curpos == $i) { + echo "<b>".$j."</b> "; + } + else { + echo "<a href='?page=user&sec=accountlist&curpos=".$i."'>".$j."</a> "; + } } $j=0; echo "</p>"; @@ -68,16 +74,16 @@ ?> <table width="100%" border="0" cellpadding="1" cellspacing="1"> <tr bgcolor="#5984C3"> - <td> <div align="center"></div> - <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> - <td> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"></font></div> - <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Fullname</strong></font></div></td> - <td bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Occupation</strong></font></div> - <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"></font></div> + <td bgcolor="#5984C3"> <div align="center"></div> + <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> + <td> <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"></font></div> + <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"><strong>Fullname</strong></font></div></td> + <td bgcolor="#5984C3"> <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"><strong>Occupation</strong></font></div> + <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"></font></div> <div align="center"></div></td> - <td width="13%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong> + <td width="13%"> <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"><strong> Country</strong></font></div></td> - <td width="10%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Lang</strong></font></div></td> + <td width="10%"> <div align="center"><font color="<?php echo $roscms_intern_color0; ?>" face="Arial, Helvetica, sans-serif"><strong>Lang</strong></font></div></td> </tr> <?php @@ -88,10 +94,10 @@ ORDER BY `user_name` ASC LIMIT " . $roscms_SET_curpos . " , " . $roscms_intern_items_per_page . " ;") ; - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; + $color1=$roscms_intern_color1; + $color2=$roscms_intern_color2; $zaehler="0"; - //$farbe="#CCCCC"; + //$color="#CCCCC"; while($result_page = mysql_fetch_array($query_page)) { // users ?> @@ -99,13 +105,13 @@ <td valign="middle" bgcolor="<?php $zaehler++; if ($zaehler == "1") { - echo $farbe1; - $farbe = $farbe1; + echo $color1; + $color = $color1; } elseif ($zaehler == "2") { $zaehler="0"; - echo $farbe2; - $farbe = $farbe2; + echo $color2; + $color = $color2; } ?>"> <div align="center"></div> @@ -115,25 +121,25 @@ echo "<a href='?page=user&sec=profil&sec2=".$result_page['user_id']."'>".$result_ page['user_name']."</a>"; ?> </font></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>"> + <td valign="middle" bgcolor="<?php echo $color; ?>"> <div align="center"></div> <font face="Arial, Helvetica, sans-serif"> <?php echo $result_page['user_fullname']; ?> </font></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>"><font face="Arial, Helvetica, sans-serif"> + <td valign="middle" bgcolor="<?php echo $color; ?>"><font face="Arial, Helvetica, sans-serif"> <?php echo substr(htmlentities($result_page['user_occupation'], ENT_QUOTES), 0, 10); ?> </font> <div align="right"><font face="Arial, Helvetica, sans-serif"> </font></div> <div align="center"><font face="Arial, Helvetica, sans-serif"> </font></div></td> - <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> + <td width="13%" valign="middle" bgcolor="<?php echo $color; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> <?php echo $result_page['user_country'];; ?> </font></div></td> - <td width="10%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> + <td width="10%" valign="middle" bgcolor="<?php echo $color; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> <?php echo $result_page['user_language']; ?> _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php --- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-05 18:45:09 UTC (rev 19914) +++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-05 20:12:32 UTC (rev 19915) @@ -0,0 +1,284 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 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. + */ + +// To prevent hacking activity: +if ( !defined('ROSCMS_SYSTEM') ) +{ + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="roscms_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: webtransstatus"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); +} +?> +<h1><a href="http://www.reactos.org/?page=dev">ReactOS Development</a> > Website Status</h1> +<h2>Website Status</h2> +<h3>Website Content Updates</h3> +<table cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="200"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Title</strong></font></div></td> + <td width="250"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> + <td width="150"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Filename</strong></font></div></td> + <td width="150"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> + <td width="150"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Date & Time </strong></font></div></td> + </tr> + <?php + + $query_updates = mysql_query("SELECT * + FROM `content` + WHERE `content_active` = 1 + AND `content_visible` = 1 + AND `content_type` = 'default' + ORDER BY `content_id` DESC + LIMIT 0 , 10 ;") ; + $color=""; + $color1=$roscms_intern_color1; + $color2=$roscms_intern_color2; + $colorcounter="0"; + //$farbe="#CCCCC"; + + while($result_updates = mysql_fetch_array($query_updates)) { +?> + <tr> + <td valign="middle" bgcolor="<?php + $colorcounter++; + if ($colorcounter == "1") { + echo $color1; + $color = $color1; + } + elseif ($colorcounter == "2") { + $colorcounter="0"; + echo $color2; + $color = $color2; + } + ?>"><font face="Arial, Helvetica, sans-serif" size="2"><b> + <?php + + $query_count_title=mysql_query("SELECT COUNT('page_id') + FROM `pages` + WHERE `page_name` LIKE '".$result_updates['content_name']."' ;"); + $result_count_title = mysql_fetch_row($query_count_title); + + if ($result_updates['content_lang']=="all") { + $updates_lang = "en"; + } + else { + $updates_lang = $result_updates['content_lang']; + } + + + if ($result_count_title[0] == "0" || $result_count_title[0] == "") { + echo $result_updates['content_name']; + } + else { + $query_lang_page_name_update = mysql_query("SELECT * + FROM `pages` + WHERE `page_name` = '". $result_updates['content_name'] ."' + AND (`page_language` = 'all' OR `page_language` = 'en') + AND `page_active` = 1 + AND `page_visible` = 1 ;") ; + $result_lang_page_name_update = mysql_fetch_array($query_lang_page_name_update); + + echo $result_lang_page_name_update['page_title']; + + } + ?> + </b></font></td> + <td valign="middle" bgcolor="<?php echo $color; ?>"><font face="Arial, Helvetica, sans-serif" size="2"> + <?php + + if ($result_count_title[0] == "0" || $result_count_title[0] == "") { + // temp + } + else { + + + echo $result_lang_page_name_update['page_description']; + } + ?> + </font></td> + <td valign="middle" bgcolor="<?php echo $color; ?>"><font face="Arial, Helvetica, sans-serif" size="2"><b> + <?php + + if ($result_count_title[0] == "0" || $result_count_title[0] == "") { + echo $result_updates['content_name']; + } + else { + echo '<a href="../?page='.$result_updates['content_name'].'&lang='.$updates_l ang.'">'.$result_updates['content_name'].'</a>'; + } + ?> + </b></font></td> + <td valign="middle" bgcolor="<?php echo $color; ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"> + <?php + $query_lang_name_update = mysql_query("SELECT * + FROM `languages` + WHERE `lang_id` = '". $updates_lang ."' ;") ; + $result_lang_name_update = mysql_fetch_array($query_lang_name_update); + + echo $result_lang_name_update['lang_name']; + ?> + </font></div></td> + <td valign="middle" bgcolor="<?php echo $color; ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"> + <?php + echo $result_updates['content_date'].' '.$result_updates['content_time']; + ?> + </font></div></td> + </tr> + <?php + } // end while +?> +</table> +<h3>Website Translation Status</h3> +<p>This page show the current website translation status.</p> +<table cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="200"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Title </strong></font></div></td> + <td width="200"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Filename</strong></font></div></td> + <td width="100"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>English</strong></font></div></td> + <?php + $query_lang_names = mysql_query("SELECT * + FROM `languages` + WHERE `lang_level` <=9 + ORDER BY `lang_level` DESC ;") ; + while($result_lang_names = mysql_fetch_array($query_lang_names)) { + ?> + <td width="100"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong><?php echo $result_lang_names["lang_name"]; ?></strong></font></div></td> [truncated at 1000 lines; 167 more skipped]

18 years, 9 months

[greatlrd] 19914: adding version reg values for directx thx Christoph_vW for tell me d2 does not found dx, and thx to filip how to write the key.

by greatlrd＠svn.reactos.com

adding version reg values for directx thx Christoph_vW for tell me d2 does not found dx, and thx to filip how to write the key. Modified: trunk/reactos/bootdata/hivedef.inf _____ Modified: trunk/reactos/bootdata/hivedef.inf --- trunk/reactos/bootdata/hivedef.inf 2005-12-05 18:43:49 UTC (rev 19913) +++ trunk/reactos/bootdata/hivedef.inf 2005-12-05 18:45:09 UTC (rev 19914) @@ -22,6 +22,16 @@ HKCU,"SOFTWARE",,0x00000012 HKCU,"SOFTWARE\Microsoft",,0x00000012 +; DirectX version report as DirectX 9.0 +HKCU,"SOFTWARE\Microsoft\DirectX","Debug",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\DirectX","InstalledVersion",0x00000001,0x00,0x 00,0x00,0x09,0x00,0x00,0x00,0x00 +HKCU,"SOFTWARE\Microsoft\DirectX","InstallMDX",0x00010001,0x00000001 +HKCU,"SOFTWARE\Microsoft\DirectX","RC",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904" + + + + ; Current user shell folder settings HKCU,"SOFTWARE\Microsoft\Windows",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion",,0x00000012

18 years, 9 months

[weiden] 19913: display the "Reinstall Driver" button in case the installation previously failed

by weiden＠svn.reactos.com

display the "Reinstall Driver" button in case the installation previously failed Modified: trunk/reactos/lib/devmgr/En.rc Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/devprblm.c Modified: trunk/reactos/lib/devmgr/resource.h _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-12-05 18:15:19 UTC (rev 19912) +++ trunk/reactos/lib/devmgr/En.rc 2005-12-05 18:43:49 UTC (rev 19913) @@ -19,6 +19,7 @@ IDS_DEVONPARENT "on %1" IDS_TROUBLESHOOTDEV "&Troubleshoot..." IDS_ENABLEDEV "E&nable Device" + IDS_REINSTALLDRV "Re&install Driver" END STRINGTABLE _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-05 18:15:19 UTC (rev 19912) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-05 18:43:49 UTC (rev 19913) @@ -470,10 +470,18 @@ DeviceInfoData->DevInst, 0, dap->hMachine); - if (cr == CR_SUCCESS && - (Status & DN_HAS_PROBLEM) && ProblemNumber == CM_PROB_DISABLED) + if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) { - TroubleShootStrId = IDS_ENABLEDEV; + switch (ProblemNumber) + { + case CM_PROB_DISABLED: + TroubleShootStrId = IDS_ENABLEDEV; + break; + + case CM_PROB_FAILED_INSTALL: + TroubleShootStrId = IDS_REINSTALLDRV; + break; + } } if (LoadString(hDllInstance, _____ Modified: trunk/reactos/lib/devmgr/devprblm.c --- trunk/reactos/lib/devmgr/devprblm.c 2005-12-05 18:15:19 UTC (rev 19912) +++ trunk/reactos/lib/devmgr/devprblm.c 2005-12-05 18:43:49 UTC (rev 19913) @@ -56,6 +56,12 @@ break; } + case CM_PROB_FAILED_INSTALL: + { + /* FIXME - display the driver installation wizard */ + break; + } + default: { /* FIXME - troubleshoot the device */ _____ Modified: trunk/reactos/lib/devmgr/resource.h --- trunk/reactos/lib/devmgr/resource.h 2005-12-05 18:15:19 UTC (rev 19912) +++ trunk/reactos/lib/devmgr/resource.h 2005-12-05 18:43:49 UTC (rev 19913) @@ -24,6 +24,7 @@ #define IDC_PROPERTIES 0x58A #define IDC_DEVUSAGELABEL 0x58B #define IDC_DEVPROBLEM 0x58C +#define IDS_REINSTALLDRV 0x58D #define IDS_NAME 0x100 #define IDS_TYPE 0x101

18 years, 9 months

[weiden] 19912: Patch by FRy2oo5 <fRy2oo5@gmail.com>:

by weiden＠svn.reactos.com

Patch by FRy2oo5 <fRy2oo5(a)gmail.com>: - Updated German translation of syssetup.dll Modified: trunk/reactos/lib/syssetup/syssetup_De.rc _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-12-05 17:17:48 UTC (rev 19911) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-12-05 18:15:19 UTC (rev 19912) @@ -179,17 +179,25 @@ IDS_PROCESSSUBTITLE "Process page subtitle" END + STRINGTABLE BEGIN + IDS_CMT_WINEFILE "Starte Winefile" + IDS_CMT_IBROWSER "Starte iBrowser" +END + + +STRINGTABLE +BEGIN IDS_ACCESSORIES "Zubeh÷r" - IDS_CMT_CALC "Launch Calculator" + IDS_CMT_CALC "Starte Taschenrechner" IDS_CMT_CMD "Íffne Kommandozeilenfenster" IDS_CMT_EXPLORER "Starte Explorer" - IDS_CMT_WINEFILE "Starte Winefile" IDS_CMT_NOTEPAD "Starte Texteditor" - IDS_CMT_REGEDIT "Starte Registry Editor" + IDS_CMT_REGEDIT "Starte Registrierungseditor" END + STRINGTABLE BEGIN IDS_GAMES "Spiele" @@ -197,4 +205,18 @@ IDS_CMT_WINEMINE "WineMine" END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS Setup" + IDS_UNKNOWN_ERROR "Unbekannter Fehler" + IDS_REGISTERING_COMPONENTS "Registriere Komponenten..." + IDS_LOADLIBRARY_FAILED "LoadLibrary fehlgeschlagen: " + IDS_GETPROCADDR_FAILED "GetProcAddr fehlgeschlagen: " + IDS_REGSVR_FAILED "DllRegisterServer fehlgeschlagen: " + IDS_DLLINSTALL_FAILED "DllInstall fehlgeschlagen: " + IDS_TIMEOUT "Zeit³berschreitung wõhrend der Registrierung" + IDS_REASON_UNKNOWN "Grund unbekannt" +END + /* EOF */

18 years, 9 months

[hbirr] 19911: Use a local copy of the path name in vfatGetFCBForFile, because we change parts of the name to the on-disk names.

by hbirr＠svn.reactos.com

Use a local copy of the path name in vfatGetFCBForFile, because we change parts of the name to the on-disk names. Modified: trunk/reactos/drivers/fs/vfat/fcb.c _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-12-05 17:04:54 UTC (rev 19910) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-12-05 17:17:48 UTC (rev 19911) @@ -660,6 +660,8 @@ PVFATFCB parentFCB; UNICODE_STRING NameU; UNICODE_STRING RootNameU = RTL_CONSTANT_STRING(L"\\"); + UNICODE_STRING FileNameU; + WCHAR NameBuffer[260]; PWCHAR curr, prev, last; ULONG Length; @@ -668,13 +670,17 @@ pParentFCB, pFCB, pFileNameU); + + FileNameU.Buffer = NameBuffer; + FileNameU.MaximumLength = sizeof(NameBuffer); + RtlCopyUnicodeString(&FileNameU, pFileNameU); parentFCB = *pParentFCB; if (parentFCB == NULL) { // Trivial case, open of the root directory on volume - if (RtlEqualUnicodeString(pFileNameU, &RootNameU, FALSE)) + if (RtlEqualUnicodeString(&FileNameU, &RootNameU, FALSE)) { DPRINT ("returning root FCB\n"); @@ -686,7 +692,7 @@ } /* Check for an existing FCB */ - FCB = vfatGrabFCBFromTable (pVCB, pFileNameU); + FCB = vfatGrabFCBFromTable (pVCB, &FileNameU); if (FCB) { *pFCB = FCB; @@ -695,34 +701,34 @@ return STATUS_SUCCESS; } - last = curr = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; - while (*curr != L'\\' && curr > pFileNameU->Buffer) + last = curr = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; + while (*curr != L'\\' && curr > FileNameU.Buffer) { curr--; } - if (curr > pFileNameU->Buffer) + if (curr > FileNameU.Buffer) { - NameU.Buffer = pFileNameU->Buffer; - NameU.MaximumLength = NameU.Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR); + NameU.Buffer = FileNameU.Buffer; + NameU.MaximumLength = NameU.Length = (curr - FileNameU.Buffer) * sizeof(WCHAR); FCB = vfatGrabFCBFromTable(pVCB, &NameU); if (FCB) { - Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR); + Length = (curr - FileNameU.Buffer) * sizeof(WCHAR); if (Length != FCB->PathNameU.Length) { - if (pFileNameU->Length + FCB->PathNameU.Length - Length > pFileNameU->MaximumLength) + if (FileNameU.Length + FCB->PathNameU.Length - Length > FileNameU.MaximumLength) { vfatReleaseFCB (pVCB, FCB); return STATUS_OBJECT_NAME_INVALID; } - RtlMoveMemory(pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR), - curr, pFileNameU->Length - Length); - pFileNameU->Length += (USHORT)(FCB->PathNameU.Length - Length); - curr = pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR); - last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; + RtlMoveMemory(FileNameU.Buffer + FCB->PathNameU.Length / sizeof(WCHAR), + curr, FileNameU.Length - Length); + FileNameU.Length += (USHORT)(FCB->PathNameU.Length - Length); + curr = FileNameU.Buffer + FCB->PathNameU.Length / sizeof(WCHAR); + last = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; } - RtlCopyMemory(pFileNameU->Buffer, FCB->PathNameU.Buffer, FCB->PathNameU.Length); + RtlCopyMemory(FileNameU.Buffer, FCB->PathNameU.Buffer, FCB->PathNameU.Length); } } else @@ -733,7 +739,7 @@ if (FCB == NULL) { FCB = vfatOpenRootFCB(pVCB); - curr = pFileNameU->Buffer; + curr = FileNameU.Buffer; } parentFCB = NULL; @@ -743,8 +749,8 @@ { FCB = parentFCB; parentFCB = NULL; - prev = curr = pFileNameU->Buffer - 1; - last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; + prev = curr = FileNameU.Buffer - 1; + last = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; } while (curr <= last) @@ -772,16 +778,16 @@ Length = (curr - prev) * sizeof(WCHAR); if (Length != parentFCB->LongNameU.Length) { - if (pFileNameU->Length + parentFCB->LongNameU.Length - Length > pFileNameU->MaximumLength) + if (FileNameU.Length + parentFCB->LongNameU.Length - Length > FileNameU.MaximumLength) { vfatReleaseFCB (pVCB, parentFCB); return STATUS_OBJECT_NAME_INVALID; } RtlMoveMemory(prev + parentFCB->LongNameU.Length / sizeof(WCHAR), curr, - pFileNameU->Length - (curr - pFileNameU->Buffer) * sizeof(WCHAR)); - pFileNameU->Length += (USHORT)(parentFCB->LongNameU.Length - Length); + FileNameU.Length - (curr - FileNameU.Buffer) * sizeof(WCHAR)); + FileNameU.Length += (USHORT)(parentFCB->LongNameU.Length - Length); curr = prev + parentFCB->LongNameU.Length / sizeof(WCHAR); - last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; + last = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; } RtlCopyMemory(prev, parentFCB->LongNameU.Buffer, parentFCB->LongNameU.Length); } @@ -791,9 +797,9 @@ { curr++; } - NameU.Buffer = pFileNameU->Buffer; + NameU.Buffer = FileNameU.Buffer; NameU.Length = (curr - NameU.Buffer) * sizeof(WCHAR); - NameU.MaximumLength = pFileNameU->MaximumLength; + NameU.MaximumLength = FileNameU.MaximumLength; DPRINT("%wZ\n", &NameU); FCB = vfatGrabFCBFromTable(pVCB, &NameU); if (FCB == NULL)

18 years, 9 months

[hbirr] 19910: Removed some third party miniport drivers.

by hbirr＠svn.reactos.com

Removed some third party miniport drivers. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-12-05 16:55:55 UTC (rev 19909) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-12-05 17:04:54 UTC (rev 19910) @@ -598,31 +598,7 @@ /* Load buslogic.sys (depends on hardware detection) */ if (!LoadDriver(SourcePath, "buslogic.sys")) return; - /* - * Load aic78u2.sys (depends on hardware detection) - */ - if (!LoadDriver(SourcePath, "aic78u2.sys")) - /*return*/; - - /* - * Load trm390w.sys (depends on hardware detection) - */ - if (!LoadDriver(SourcePath, "trm390w.sys")) - /*return*/; - /* - * Load hpt3xx.sys (depends on hardware detection) - */ - if (!LoadDriver(SourcePath, "hpt3xx.sys")) - /*return*/; - - /* - * Load inia100.sys (depends on hardware detection) - */ - if (!LoadDriver(SourcePath, "inia100.sys")) - /*return*/; - - /* Load class2.sys */ if (!LoadDriver(SourcePath, "class2.sys")) return;

18 years, 9 months

[cwittich] 19909: added SplitSymbols stub

by cwittich＠svn.reactos.com

added SplitSymbols stub Modified: trunk/reactos/lib/imagehlp/imagehlp.def Modified: trunk/reactos/lib/imagehlp/modify.c _____ Modified: trunk/reactos/lib/imagehlp/imagehlp.def --- trunk/reactos/lib/imagehlp/imagehlp.def 2005-12-05 15:54:38 UTC (rev 19908) +++ trunk/reactos/lib/imagehlp/imagehlp.def 2005-12-05 16:55:55 UTC (rev 19909) @@ -42,7 +42,7 @@ RemoveRelocations @1 SearchTreeForFile=Dbghelp.SearchTreeForFile @40 SetImageConfigInformation @41 -;SplitSymbols @42 +SplitSymbols @42 StackWalk=Dbghelp.StackWalk @43 StackWalk64=Dbghelp.StackWalk64 @44 SymCleanup=Dbghelp.SymCleanup @45 _____ Modified: trunk/reactos/lib/imagehlp/modify.c --- trunk/reactos/lib/imagehlp/modify.c 2005-12-05 15:54:38 UTC (rev 19908) +++ trunk/reactos/lib/imagehlp/modify.c 2005-12-05 16:55:55 UTC (rev 19909) @@ -1020,6 +1020,21 @@ } /* + * @unimplemented + */ +BOOL +IMAGEAPI +SplitSymbols(LPSTR ImageName, + LPSTR SymbolsPath, + LPSTR SymbolFilePath, + DWORD Flags) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* * @implemented */ BOOL

18 years, 9 months

[sedwards] 19908: generate a more recent config.h for Wine code. It will be needed for a new dll I will import

by sedwards＠svn.reactos.com

generate a more recent config.h for Wine code. It will be needed for a new dll I will import Modified: trunk/reactos/include/wine/config.h _____ Modified: trunk/reactos/include/wine/config.h --- trunk/reactos/include/wine/config.h 2005-12-05 14:20:29 UTC (rev 19907) +++ trunk/reactos/include/wine/config.h 2005-12-05 15:54:38 UTC (rev 19908) @@ -3,22 +3,10 @@ #define __WINE_CONFIG_H -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ +/* Specifies the compiler flag that forces a short wchar_t */ +#define CC_FLAG_SHORT_WCHAR "-fshort-wchar" -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define if you have ALSA including devel headers */ +/* Define if you have ALSA 1.x including devel headers */ /* #undef HAVE_ALSA */ /* Define to 1 if you have the <alsa/asoundlib.h> header file. */ @@ -33,6 +21,9 @@ /* Define if you have ARTS sound server */ /* #undef HAVE_ARTS */ +/* Define to 1 if you have the <asm/types.h> header file. */ +/* #undef HAVE_ASM_TYPES_H */ + /* Define to 1 if you have the <audio/audiolib.h> header file. */ /* #undef HAVE_AUDIO_AUDIOLIB_H */ @@ -54,17 +45,17 @@ /* Define to 1 if you have the `connect' function. */ /* #undef HAVE_CONNECT */ -/* Define if we have linux/input.h AND it contains the INPUT event API */ -/* #undef HAVE_CORRECT_LINUXINPUT_H */ - /* Define to 1 if you have the <cups/cups.h> header file. */ /* #undef HAVE_CUPS_CUPS_H */ /* Define to 1 if you have the <curses.h> header file. */ /* #undef HAVE_CURSES_H */ +/* Define if you have the daylight variable */ +#define HAVE_DAYLIGHT 1 + /* Define to 1 if you have the <direct.h> header file. */ -/* #undef HAVE_DIRECT_H */ +#define HAVE_DIRECT_H 1 /* Define to 1 if you have the <dlfcn.h> header file. */ /* #undef HAVE_DLFCN_H */ @@ -75,6 +66,15 @@ /* Define to 1 if you have the <elf.h> header file. */ /* #undef HAVE_ELF_H */ +/* Define to 1 if you have the `epoll_create' function. */ +/* #undef HAVE_EPOLL_CREATE */ + +/* Define if you have EsounD sound server */ +/* #undef HAVE_ESD */ + +/* Define to 1 if you have the `ffs' function. */ +/* #undef HAVE_FFS */ + /* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 @@ -84,7 +84,7 @@ /* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ /* #undef HAVE_FONTCONFIG_FONTCONFIG_H */ -/* Define to 1 if you have the 'fork' function. */ +/* Define to 1 if you have the `fork' function. */ /* #undef HAVE_FORK */ /* Define to 1 if you have the `fpclass' function. */ @@ -111,6 +111,9 @@ /* Define if you have the <freetype/fttrigon.h> header file. */ /* #undef HAVE_FREETYPE_FTTRIGON_H */ +/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ +/* #undef HAVE_FREETYPE_FTWINFNT_H */ + /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ @@ -120,24 +123,36 @@ /* Define to 1 if you have the <freetype/tttables.h> header file. */ /* #undef HAVE_FREETYPE_TTTABLES_H */ +/* Define to 1 if the system has the type `fsblkcnt_t'. */ +/* #undef HAVE_FSBLKCNT_T */ + +/* Define to 1 if the system has the type `fsfilcnt_t'. */ +/* #undef HAVE_FSFILCNT_T */ + +/* Define to 1 if you have the `fstatfs' function. */ +/* #undef HAVE_FSTATFS */ + +/* Define to 1 if you have the `fstatvfs' function. */ +/* #undef HAVE_FSTATVFS */ + /* Define to 1 if you have the <ft2build.h> header file. */ /* #undef HAVE_FT2BUILD_H */ /* Define to 1 if you have the `ftruncate' function. */ -/* #undef HAVE_FTRUNCATE */ +#define HAVE_FTRUNCATE 1 -/* Define to 1 if you have the `ftruncate64' function. */ -/* #undef HAVE_FTRUNCATE64 */ +/* Define to 1 if you have the `futimes' function. */ +/* #undef HAVE_FUTIMES */ -/* Define to 1 if you have the `getbkgd' function. */ -/* #undef HAVE_GETBKGD */ +/* Define to 1 if you have the `futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ +/* Define to 1 if you have the `getaddrinfo' function. */ +/* #undef HAVE_GETADDRINFO */ + /* Define to 1 if you have the `gethostbyname' function. */ /* #undef HAVE_GETHOSTBYNAME */ -/* Define to 1 if you have the `getnetbyaddr' function. */ -/* #undef HAVE_GETNETBYADDR */ - /* Define to 1 if you have the `getnetbyname' function. */ /* #undef HAVE_GETNETBYNAME */ @@ -168,15 +183,12 @@ /* Define to 1 if you have the `gettimeofday' function. */ /* #undef HAVE_GETTIMEOFDAY */ +/* Define to 1 if you have the `getuid' function. */ +/* #undef HAVE_GETUID */ + /* Define to 1 if you have the <gif_lib.h> header file. */ /* #undef HAVE_GIF_LIB_H */ -/* Define if the OpenGL headers define extension typedefs */ -/* #undef HAVE_GLEXT_PROTOTYPES */ - -/* Define if the OpenGL library supports the glXGetProcAddressARB call */ -/* #undef HAVE_GLX_GETPROCADDRESS */ - /* Define to 1 if you have the <GL/glext.h> header file. */ /* #undef HAVE_GL_GLEXT_H */ @@ -201,24 +213,36 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ +/* #undef HAVE_IOKIT_IOKITLIB_H */ + /* Define to 1 if you have the <io.h> header file. */ -/*#define HAVE_IO_H 1*/ +#define HAVE_IO_H 1 -/* Define if IPX should use netipx/ipx.h from libc */ -/* #undef HAVE_IPX_GNU */ - -/* Define if IPX includes are taken from Linux kernel */ -/* #undef HAVE_IPX_LINUX */ - -/* Define to 1 if you have the `iswalnum' function. */ -#define HAVE_ISWALNUM 1 - /* Define to 1 if you have the <jack/jack.h> header file. */ /* #undef HAVE_JACK_JACK_H */ /* Define to 1 if you have the <jpeglib.h> header file. */ /* #undef HAVE_JPEGLIB_H */ +/* Define to 1 if you have the <lber.h> header file. */ +/* #undef HAVE_LBER_H */ + +/* Define if you have the LittleCMS development environment */ +/* #undef HAVE_LCMS */ + +/* Define to 1 if you have the <lcms.h> header file. */ +/* #undef HAVE_LCMS_H */ + +/* Define to 1 if you have the <lcms/lcms.h> header file. */ +/* #undef HAVE_LCMS_LCMS_H */ + +/* Define if you have the OpenLDAP development environment */ +/* #undef HAVE_LDAP */ + +/* Define to 1 if you have the <ldap.h> header file. */ +/* #undef HAVE_LDAP_H */ + /* Define if you have libaudioIO */ /* #undef HAVE_LIBAUDIOIO */ @@ -228,21 +252,9 @@ /* Define if you have the curses library (-lcurses) */ /* #undef HAVE_LIBCURSES */ -/* Define if you have libgif/libungif including devel headers */ -/* #undef HAVE_LIBGIF */ - /* Define to 1 if you have the `i386' library (-li386). */ /* #undef HAVE_LIBI386 */ -/* Define to 1 if you have the <libio.h> header file. */ -/* #undef HAVE_LIBIO_H */ - -/* Define if you have libjpeg including devel headers */ -/* #undef HAVE_LIBJPEG */ - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - /* Define if you have the ncurses library (-lncurses) */ /* #undef HAVE_LIBNCURSES */ @@ -261,11 +273,11 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ -/* Define to 1 if you have the <libutil.h> header file. */ -/* #undef HAVE_LIBUTIL_H */ +/* Define if you have the libxml2 library */ +/* #undef HAVE_LIBXML2 */ -/* Define to 1 if you have the `w' library (-lw). */ -/* #undef HAVE_LIBW */ +/* Define to 1 if you have the <libxml/parser.h> header file. */ +/* #undef HAVE_LIBXML_PARSER_H */ /* Define to 1 if you have the `xpg4' library (-lxpg4). */ /* #undef HAVE_LIBXPG4 */ @@ -276,9 +288,15 @@ /* Define if you have the X Shape extension */ /* #undef HAVE_LIBXSHAPE */ -/* Define if you have the Xxf86dga library version 1 */ -/* #undef HAVE_LIBXXF86DGA */ +/* Define if you have the libxslt library */ +/* #undef HAVE_LIBXSLT */ +/* Define to 1 if you have the <libxslt/pattern.h> header file. */ +/* #undef HAVE_LIBXSLT_PATTERN_H */ + +/* Define to 1 if you have the <libxslt/transform.h> header file. */ +/* #undef HAVE_LIBXSLT_TRANSFORM_H */ + /* Define if you have the Xxf86dga library version 2 */ /* #undef HAVE_LIBXXF86DGA2 */ @@ -300,6 +318,9 @@ /* Define to 1 if you have the <linux/cdrom.h> header file. */ /* #undef HAVE_LINUX_CDROM_H */ +/* Define to 1 if you have the <linux/compiler.h> header file. */ +/* #undef HAVE_LINUX_COMPILER_H */ + /* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ /* #undef HAVE_LINUX_GETHOSTBYNAME_R_6 */ @@ -309,6 +330,12 @@ /* Define to 1 if you have the <linux/input.h> header file. */ /* #undef HAVE_LINUX_INPUT_H */ +/* Define to 1 if you have the <linux/ioctl.h> header file. */ +/* #undef HAVE_LINUX_IOCTL_H */ + +/* Define to 1 if you have the <linux/ipx.h> header file. */ +/* #undef HAVE_LINUX_IPX_H */ + /* Define to 1 if you have the <linux/joystick.h> header file. */ /* #undef HAVE_LINUX_JOYSTICK_H */ @@ -324,18 +351,27 @@ /* Define to 1 if you have the <linux/ucdrom.h> header file. */ /* #undef HAVE_LINUX_UCDROM_H */ -/* Define to 1 if you have the `lseek64' function. */ -/* #undef HAVE_LSEEK64 */ +/* Define to 1 if you have the <linux/videodev.h> header file. */ +/* #undef HAVE_LINUX_VIDEODEV_H */ +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + /* Define to 1 if you have the `lstat' function. */ /* #undef HAVE_LSTAT */ /* Define to 1 if you have the <machine/cpu.h> header file. */ /* #undef HAVE_MACHINE_CPU_H */ +/* Define to 1 if you have the <machine/limits.h> header file. */ +/* #undef HAVE_MACHINE_LIMITS_H */ + /* Define to 1 if you have the <machine/soundcard.h> header file. */ /* #undef HAVE_MACHINE_SOUNDCARD_H */ +/* Define to 1 if you have the <mach/machine.h> header file. */ +/* #undef HAVE_MACH_MACHINE_H */ + /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 @@ -345,6 +381,9 @@ /* Define to 1 if you have the `mmap' function. */ /* #undef HAVE_MMAP */ +/* Define to 1 if you have the <mntent.h> header file. */ +/* #undef HAVE_MNTENT_H */ + /* Define to 1 if the system has the type `mode_t'. */ #define HAVE_MODE_T 1 @@ -363,15 +402,15 @@ /* Define to 1 if you have the <netinet/in_systm.h> header file. */ /* #undef HAVE_NETINET_IN_SYSTM_H */ -/* Define to 1 if you have the <netinet/ip.h> header file. */ -/* #undef HAVE_NETINET_IP_H */ - /* Define to 1 if you have the <netinet/tcp_fsm.h> header file. */ /* #undef HAVE_NETINET_TCP_FSM_H */ /* Define to 1 if you have the <netinet/tcp.h> header file. */ /* #undef HAVE_NETINET_TCP_H */ +/* Define to 1 if you have the <netipx/ipx.h> header file. */ +/* #undef HAVE_NETIPX_IPX_H */ + /* Define to 1 if you have the <net/if_arp.h> header file. */ /* #undef HAVE_NET_IF_ARP_H */ @@ -396,20 +435,14 @@ /* Define to 1 if you have the <openssl/ssl.h> header file. */ /* #undef HAVE_OPENSSL_SSL_H */ -/* Define if you have the Open Sound system */ -/* #undef HAVE_OSS */ - -/* Define if you have the Open Sound system (MIDI interface) */ -/* #undef HAVE_OSS_MIDI */ - /* Define to 1 if you have the `pclose' function. */ #define HAVE_PCLOSE 1 /* Define to 1 if the system has the type `pid_t'. */ #define HAVE_PID_T 1 -/* Define to 1 if you have the `pipe' function. */ -/* #undef HAVE_PIPE */ +/* Define to 1 if you have the <poll.h> header file. */ +/* #undef HAVE_POLL_H */ /* Define to 1 if you have the `popen' function. */ #define HAVE_POPEN 1 @@ -421,11 +454,17 @@ /* #undef HAVE_PREAD */ /* Define to 1 if you have the <process.h> header file. */ -/*#define HAVE_PROCESS_H 1*/ +#define HAVE_PROCESS_H 1 /* Define to 1 if you have the `pthread_getattr_np' function. */ /* #undef HAVE_PTHREAD_GETATTR_NP */ +/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */ +/* #undef HAVE_PTHREAD_GET_STACKADDR_NP */ + +/* Define to 1 if you have the `pthread_get_stacksize_np' function. */ +/* #undef HAVE_PTHREAD_GET_STACKSIZE_NP */ + /* Define to 1 if you have the <pthread.h> header file. */ /* #undef HAVE_PTHREAD_H */ @@ -435,20 +474,20 @@ /* Define to 1 if the system has the type `pthread_rwlock_t'. */ /* #undef HAVE_PTHREAD_RWLOCK_T */ -/* Define to 1 if you have the <pty.h> header file. */ -/* #undef HAVE_PTY_H */ - /* Define to 1 if you have the <pwd.h> header file. */ /* #undef HAVE_PWD_H */ /* Define to 1 if you have the `pwrite' function. */ /* #undef HAVE_PWRITE */ +/* Define to 1 if you have the `readlink' function. */ +/* #undef HAVE_READLINK */ + /* Define to 1 if you have the <regex.h> header file. */ /* #undef HAVE_REGEX_H */ -/* Define to 1 if you have the `resizeterm' function. */ -/* #undef HAVE_RESIZETERM */ +/* Define to 1 if the system has the type `request_sense'. */ +/* #undef HAVE_REQUEST_SENSE */ /* Define to 1 if you have the <resolv.h> header file. */ /* #undef HAVE_RESOLV_H */ @@ -462,6 +501,12 @@ /* Define to 1 if you have the <sched.h> header file. */ /* #undef HAVE_SCHED_H */ +/* Define to 1 if you have the `sched_yield' function. */ +/* #undef HAVE_SCHED_YIELD */ + +/* Define to 1 if `cmd' is member of `scsireq_t'. */ +/* #undef HAVE_SCSIREQ_T_CMD */ + /* Define to 1 if you have the <scsi/scsi.h> header file. */ /* #undef HAVE_SCSI_SCSI_H */ @@ -480,24 +525,33 @@ /* Define to 1 if you have the `settimeofday' function. */ /* #undef HAVE_SETTIMEOFDAY */ +/* Define to 1 if `interface_id' is member of `sg_io_hdr_t'. */ +/* #undef HAVE_SG_IO_HDR_T_INTERFACE_ID */ + +/* Define if sigaddset is supported */ +/* #undef HAVE_SIGADDSET */ + /* Define to 1 if you have the `sigaltstack' function. */ /* #undef HAVE_SIGALTSTACK */ /* Define to 1 if `si_fd' is member of `siginfo_t'. */ /* #undef HAVE_SIGINFO_T_SI_FD */ +/* Define to 1 if you have the `sigprocmask' function. */ +/* #undef HAVE_SIGPROCMASK */ + /* Define to 1 if you have the sigsetjmp (and siglongjmp) function */ /* #undef HAVE_SIGSETJMP */ +/* Define to 1 if the system has the type `sigset_t'. */ +/* #undef HAVE_SIGSET_T */ + /* Define to 1 if the system has the type `size_t'. */ #define HAVE_SIZE_T 1 /* Define to 1 if you have the `snprintf' function. */ -/* #undef HAVE_SNPRINTF */ +#define HAVE_SNPRINTF 1 -/* Define to 1 if you have the <socket.h> header file. */ -/* #undef HAVE_SOCKET_H */ - /* Define to 1 if you have the <soundcard.h> header file. */ /* #undef HAVE_SOUNDCARD_H */ @@ -505,11 +559,14 @@ #define HAVE_SPAWNVP 1 /* Define to 1 if the system has the type `ssize_t'. */ -#define HAVE_SSIZE_T +#define HAVE_SSIZE_T 1 /* Define to 1 if you have the `statfs' function. */ /* #undef HAVE_STATFS */ +/* Define to 1 if you have the `statvfs' function. */ +/* #undef HAVE_STATVFS */ + /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -517,7 +574,7 @@ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strcasecmp' function. */ -/* #undef HAVE_STRCASECMP */ +//#define HAVE_STRCASECMP 1 /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -529,8 +586,11 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have the `strncasecmp' function. */ -/* #undef HAVE_STRNCASECMP */ +//#define HAVE_STRNCASECMP 1 +/* Define to 1 if `direction' is member of `struct ff_effect'. */ +/* #undef HAVE_STRUCT_FF_EFFECT_DIRECTION */ + /* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ /* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ @@ -549,6 +609,21 @@ /* Define to 1 if `f_bfree' is member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_BFREE */ +/* Define to 1 if `f_favail' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FAVAIL */ + +/* Define to 1 if `f_ffree' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FFREE */ + +/* Define to 1 if `f_frsize' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FRSIZE */ + +/* Define to 1 if `f_namelen' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_NAMELEN */ + +/* Define to 1 if `f_blocks' is member of `struct statvfs'. */ +/* #undef HAVE_STRUCT_STATVFS_F_BLOCKS */ + /* Define to 1 if `st_blocks' is member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ @@ -561,24 +636,30 @@ /* Define to 1 if you have the <sys/cdio.h> header file. */ /* #undef HAVE_SYS_CDIO_H */ +/* Define to 1 if you have the <sys/elf32.h> header file. */ +/* #undef HAVE_SYS_ELF32_H */ + +/* Define to 1 if you have the <sys/epoll.h> header file. */ +/* #undef HAVE_SYS_EPOLL_H */ + /* Define to 1 if you have the <sys/errno.h> header file. */ /* #undef HAVE_SYS_ERRNO_H */ -/* Define to 1 if you have the <sys/file.h> header file. */ -#define HAVE_SYS_FILE_H 1 +/* Define to 1 if you have the <sys/exec_elf.h> header file. */ +/* #undef HAVE_SYS_EXEC_ELF_H */ /* Define to 1 if you have the <sys/filio.h> header file. */ /* #undef HAVE_SYS_FILIO_H */ -/* Define to 1 if you have the <sys/inttypes.h> header file. */ -/* #undef HAVE_SYS_INTTYPES_H */ - /* Define to 1 if you have the <sys/ioctl.h> header file. */ /* #undef HAVE_SYS_IOCTL_H */ /* Define to 1 if you have the <sys/ipc.h> header file. */ /* #undef HAVE_SYS_IPC_H */ +/* Define to 1 if you have the <sys/limits.h> header file. */ +/* #undef HAVE_SYS_LIMITS_H */ + /* Define to 1 if you have the <sys/link.h> header file. */ /* #undef HAVE_SYS_LINK_H */ @@ -630,6 +711,9 @@ /* Define to 1 if you have the <sys/statfs.h> header file. */ /* #undef HAVE_SYS_STATFS_H */ +/* Define to 1 if you have the <sys/statvfs.h> header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 @@ -660,12 +744,6 @@ /* Define to 1 if you have the <sys/user.h> header file. */ /* #undef HAVE_SYS_USER_H */ -/* Define to 1 if you have the <sys/v86intr.h> header file. */ -/* #undef HAVE_SYS_V86INTR_H */ - -/* Define to 1 if you have the <sys/v86.h> header file. */ -/* #undef HAVE_SYS_V86_H */ - /* Define to 1 if you have the <sys/vfs.h> header file. */ /* #undef HAVE_SYS_VFS_H */ @@ -684,6 +762,9 @@ /* Define to 1 if you have the `timegm' function. */ /* #undef HAVE_TIMEGM */ +/* Define if you have the timezone variable */ +#define HAVE_TIMEZONE 1 + /* Define to 1 if you have the <ucontext.h> header file. */ /* #undef HAVE_UCONTEXT_H */ @@ -705,15 +786,9 @@ /* Define if we have va_copy */ #define HAVE_VA_COPY 1 -/* Define to 1 if you have the `vfscanf' function. */ -#define HAVE_VFSCANF 1 - /* Define to 1 if you have the `vsnprintf' function. */ -/* #define HAVE_VSNPRINTF 1 */ +//#define HAVE_VSNPRINTF 1 -/* Define to 1 if you have the `wait' function. */ -/* #undef HAVE_WAIT */ - /* Define to 1 if you have the `wait4' function. */ /* #undef HAVE_WAIT4 */ @@ -729,6 +804,9 @@ /* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XF86VMODE_H */ +/* Define to 1 if you have the <X11/extensions/XInput.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XINPUT_H */ + /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XRANDR_H */ @@ -738,9 +816,6 @@ /* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ /* #undef HAVE_X11_EXTENSIONS_XSHM_H */ -/* Define to 1 if you have the <X11/extensions/Xvlib.h> header file. */ -/* #undef HAVE_X11_EXTENSIONS_XVLIB_H */ - /* Define to 1 if you have the <X11/XKBlib.h> header file. */ /* #undef HAVE_X11_XKBLIB_H */ @@ -753,9 +828,12 @@ /* Define if you have the XKB extension */ /* #undef HAVE_XKB */ -/* Define if the X libraries support XVideo */ -/* #undef HAVE_XVIDEO */ +/* Define if libxml2 has the xmlReadMemory function */ +/* #undef HAVE_XMLREADMEMORY */ +/* Define if Xrender has the XRenderSetPictureTransform function */ +/* #undef HAVE_XRENDERSETPICTURETRANSFORM */ + /* Define to 1 if you have the `_lwp_create' function. */ /* #undef HAVE__LWP_CREATE */ @@ -775,7 +853,7 @@ #define HAVE__SPAWNVP 1 /* Define to 1 if you have the `_stricmp' function. */ -/* #undef HAVE__STRICMP 1 */ +#define HAVE__STRICMP 1 /* Define to 1 if you have the `_strnicmp' function. */ #define HAVE__STRNICMP 1 @@ -786,29 +864,23 @@ /* Define if we have __va_copy */ #define HAVE___VA_COPY 1 -/* Define to disable all debug messages. */ -/* #undef NO_DEBUG_MSGS */ - -/* Define to disable trace messages. */ -/* #undef NO_TRACE_MSGS */ - /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +#define PACKAGE_BUGREPORT "ros-dev(a)reactos.org" /* Define to the full name of this package. */ -#define PACKAGE_NAME "Wine" +#define PACKAGE_NAME "ReactOS" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Wine 20031118" +#define PACKAGE_STRING "ReactOS 0.3.0" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "wine" +#define PACKAGE_TARNAME "ReactOS" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20031118" +#define PACKAGE_VERSION "0.3.0" -/* The size of a `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 +/* Define to the soname of the libcapi20 library. */ +/* #undef SONAME_LIBCAPI20 */ /* Define to the soname of the libcrypto library. */ /* #undef SONAME_LIBCRYPTO */ @@ -825,35 +897,45 @@ /* Define to the soname of the libfreetype library. */ /* #undef SONAME_LIBFREETYPE */ +/* Define to the soname of the libgif library. */ +/* #undef SONAME_LIBGIF */ + /* Define to the soname of the libGL library. */ /* #undef SONAME_LIBGL */ /* Define to the soname of the libjack library. */ /* #undef SONAME_LIBJACK */ +/* Define to the soname of the libjpeg library. */ +/* #undef SONAME_LIBJPEG */ + /* Define to the soname of the libncurses library. */ /* #undef SONAME_LIBNCURSES */ /* Define to the soname of the libssl library. */ /* #undef SONAME_LIBSSL */ +/* Define to the soname of the libtxc_dxtn library. */ +/* #undef SONAME_LIBTXC_DXTN */ + +/* Define to the soname of the libungif library. */ +/* #undef SONAME_LIBUNGIF */ + /* Define to the soname of the libX11 library. */ /* #undef SONAME_LIBX11 */ /* Define to the soname of the libXext library. */ /* #undef SONAME_LIBXEXT */ +/* Define to the soname of the libXi library. */ +/* #undef SONAME_LIBXI */ + +/* Define to the soname of the libXrandr library. */ +/* #undef SONAME_LIBXRANDR */ + /* Define to the soname of the libXrender library. */ /* #undef SONAME_LIBXRENDER */ -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - /* Define if the struct statfs is defined by <sys/mount.h> */ /* #undef STATFS_DEFINED_BY_SYS_MOUNT */ @@ -876,24 +958,17 @@ `char[]'. */ #define YYTEXT_POINTER 1 -/* Set this to 64 to enable 64-bit file support on Linux */ -/* #undef _FILE_OFFSET_BITS */ - /* Define to a macro to generate an assembly function directive */ #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" /* Define to a macro to generate an assembly name from a C symbol */ #define __ASM_NAME(name) "_" name -/* Define to the assembler keyword used to specify a word value */ -#define __ASM_SHORT ".short" - -/* Define to the assembler keyword used to specify an ASCII string */ -#define __ASM_STRING ".string" - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus /* #undef inline */ +#endif

18 years, 9 months

[hpoussin] 19907: Change code in InterfaceBusTranslateBusAddress to use less pointer dereferences and less stack variables

by hpoussin＠svn.reactos.com

Change code in InterfaceBusTranslateBusAddress to use less pointer dereferences and less stack variables Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-12-05 02:59:29 UTC (rev 19906) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-12-05 14:20:29 UTC (rev 19907) @@ -858,16 +858,14 @@ OUT PPHYSICAL_ADDRESS TranslatedAddress) { PPDO_DEVICE_EXTENSION DeviceExtension; - PFDO_DEVICE_EXTENSION FdoDeviceExtension; DPRINT("InterfaceBusTranslateBusAddress(%p %p 0x%lx %p %p)\n", Context, BusAddress, Length, AddressSpace, TranslatedAddress); DeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; - FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceExtension->Fdo->DeviceExtension; return HalTranslateBusAddress( - PCIBus, FdoDeviceExtension->BusNumber, + PCIBus, DeviceExtension->PciDevice->BusNumber, BusAddress, AddressSpace, TranslatedAddress); }

18 years, 9 months

← Newer
1
...
56
57
58
59
60
61
62
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005