Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[arty] 40321: FORMATTING only.
by arty＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: arty Date: Thu Apr 2 05:02:56 2009 New Revision: 40321 URL: http://svn.reactos.org/svn/reactos?rev=40321&view=rev Log: FORMATTING only. Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Thu Apr 2 05:02:56 2009 @@ -15,10 +15,10 @@ UINT TdiAddressSizeFromType( UINT AddressType ) { switch( AddressType ) { case AF_INET: - return sizeof(TA_IP_ADDRESS); + return sizeof(TA_IP_ADDRESS); default: - AFD_DbgPrint(MID_TRACE,("TdiAddressSizeFromType - invalid type: %x\n", AddressType)); - KeBugCheck( 0 ); + AFD_DbgPrint(MID_TRACE,("TdiAddressSizeFromType - invalid type: %x\n", AddressType)); + KeBugCheck( 0 ); } return 0; } @@ -36,7 +36,7 @@ } VOID TaCopyAddressInPlace( PTA_ADDRESS Target, - PTA_ADDRESS Source ) { + PTA_ADDRESS Source ) { UINT AddrLen = TaLengthOfAddress( Source ); RtlCopyMemory( Target, Source, AddrLen ); } @@ -49,7 +49,7 @@ } VOID TaCopyTransportAddressInPlace( PTRANSPORT_ADDRESS Target, - PTRANSPORT_ADDRESS Source ) { + PTRANSPORT_ADDRESS Source ) { UINT AddrLen = TaLengthOfTransportAddress( Source ); RtlCopyMemory( Target, Source, AddrLen ); } @@ -63,9 +63,9 @@ A = ExAllocatePool( NonPagedPool, AddrLen ); if( A ) - TaCopyTransportAddressInPlace( A, OtherAddress ); - - return A; + TaCopyTransportAddressInPlace( A, OtherAddress ); + + return A; } static NTSTATUS TdiBuildNullConnectionInfoInPlace @@ -80,23 +80,23 @@ * Status of operation */ { - ULONG TdiAddressSize; - PTRANSPORT_ADDRESS TransportAddress; - - TdiAddressSize = TdiAddressSizeFromType(Type); - - RtlZeroMemory(ConnInfo, - sizeof(TDI_CONNECTION_INFORMATION) + - TdiAddressSize); - - ConnInfo->OptionsLength = sizeof(ULONG); - ConnInfo->RemoteAddressLength = TdiAddressSize; - ConnInfo->RemoteAddress = TransportAddress = - (PTRANSPORT_ADDRESS)&ConnInfo[1]; - TransportAddress->TAAddressCount = 1; - TransportAddress->Address[0].AddressType = Type; - - return STATUS_SUCCESS; + ULONG TdiAddressSize; + PTRANSPORT_ADDRESS TransportAddress; + + TdiAddressSize = TdiAddressSizeFromType(Type); + + RtlZeroMemory(ConnInfo, + sizeof(TDI_CONNECTION_INFORMATION) + + TdiAddressSize); + + ConnInfo->OptionsLength = sizeof(ULONG); + ConnInfo->RemoteAddressLength = TdiAddressSize; + ConnInfo->RemoteAddress = TransportAddress = + (PTRANSPORT_ADDRESS)&ConnInfo[1]; + TransportAddress->TAAddressCount = 1; + TransportAddress->Address[0].AddressType = Type; + + return STATUS_SUCCESS; } NTSTATUS TdiBuildNullConnectionInfo @@ -112,34 +112,34 @@ * Status of operation */ { - PTDI_CONNECTION_INFORMATION ConnInfo; - ULONG TdiAddressSize; - NTSTATUS Status; - - TdiAddressSize = TdiAddressSizeFromType(Type); - - ConnInfo = (PTDI_CONNECTION_INFORMATION) - ExAllocatePool(NonPagedPool, - sizeof(TDI_CONNECTION_INFORMATION) + - TdiAddressSize); - if (!ConnInfo) { - *ConnectionInfo = NULL; - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type ); - - if (!NT_SUCCESS(Status)) { - ExFreePool( ConnInfo ); - *ConnectionInfo = NULL; - return Status; - } else - *ConnectionInfo = ConnInfo; - - ConnInfo->RemoteAddress = (PTA_ADDRESS)&ConnInfo[1]; - ConnInfo->RemoteAddressLength = TdiAddressSize; - - return Status; + PTDI_CONNECTION_INFORMATION ConnInfo; + ULONG TdiAddressSize; + NTSTATUS Status; + + TdiAddressSize = TdiAddressSizeFromType(Type); + + ConnInfo = (PTDI_CONNECTION_INFORMATION) + ExAllocatePool(NonPagedPool, + sizeof(TDI_CONNECTION_INFORMATION) + + TdiAddressSize); + if (!ConnInfo) { + *ConnectionInfo = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type ); + + if (!NT_SUCCESS(Status)) { + ExFreePool( ConnInfo ); + *ConnectionInfo = NULL; + return Status; + } else + *ConnectionInfo = ConnInfo; + + ConnInfo->RemoteAddress = (PTA_ADDRESS)&ConnInfo[1]; + ConnInfo->RemoteAddressLength = TdiAddressSize; + + return Status; } @@ -151,10 +151,10 @@ _SEH2_TRY { RtlCopyMemory( ConnectionInfo->RemoteAddress, - Address, - ConnectionInfo->RemoteAddressLength ); + Address, + ConnectionInfo->RemoteAddressLength ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + Status = _SEH2_GetExceptionCode(); } _SEH2_END; return Status; @@ -166,10 +166,10 @@ ( PTDI_CONNECTION_INFORMATION *ConnectionInfo, PTRANSPORT_ADDRESS Address ) { NTSTATUS Status = TdiBuildNullConnectionInfo - ( ConnectionInfo, Address->Address[0].AddressType ); + ( ConnectionInfo, Address->Address[0].AddressType ); if( NT_SUCCESS(Status) ) - TdiBuildConnectionInfoInPlace( *ConnectionInfo, Address ); + TdiBuildConnectionInfoInPlace( *ConnectionInfo, Address ); return Status; } @@ -178,16 +178,16 @@ TdiBuildConnectionInfoPair ( PTDI_CONNECTION_INFO_PAIR ConnectionInfo, PTRANSPORT_ADDRESS From, PTRANSPORT_ADDRESS To ) - /* - * FUNCTION: Fill a TDI_CONNECTION_INFO_PAIR struct will the two addresses - * given. - * ARGUMENTS: - * ConnectionInfo: The pair - * From: The from address - * To: The to address - * RETURNS: - * Status of the operation - */ +/* + * FUNCTION: Fill a TDI_CONNECTION_INFO_PAIR struct will the two addresses + * given. + * ARGUMENTS: + * ConnectionInfo: The pair + * From: The from address + * To: The to address + * RETURNS: + * Status of the operation + */ { PCHAR LayoutFrame; UINT SizeOfEntry; @@ -220,10 +220,10 @@ } PTA_ADDRESS TdiGetRemoteAddress( PTDI_CONNECTION_INFORMATION TdiConn ) - /* - * Convenience function that rounds out the abstraction of - * the TDI_CONNECTION_INFORMATION struct. - */ +/* + * Convenience function that rounds out the abstraction of + * the TDI_CONNECTION_INFORMATION struct. + */ { return TdiConn->RemoteAddress; }

1 0

[dgoette] 40320: continue: converting database calls to PDO
by dgoette＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: dgoette Date: Thu Apr 2 04:42:42 2009 New Revision: 40320 URL: http://svn.reactos.org/svn/reactos?rev=40320&view=rev Log: continue: converting database calls to PDO Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_submit.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat_co… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree_co… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat_main… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id_mainta… Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_group.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -512,7 +512,7 @@ <blockquote> <?php // Query Bundles - $stmt=DBConnections::getInstance()->prepare("SELECT * FROM rsdb_group_bundles WHERE bundle_groupid = :group_id") ; + $stmt=CDBConnections::getInstance()->prepare("SELECT * FROM rsdb_group_bundles WHERE bundle_groupid = :group_id") ; $stmt->bindParam('group_id',$result_page["grpentr_id"],PDO::PARAM_STR); $stmt->execute(); while($result_bundlelist = $stmt->fetch(PDO::FETCH_ASSOC)) { Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_submit.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_submit.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_submit.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -526,7 +526,7 @@ $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_name = :name ORDER BY vendor_id DESC LIMIT 1"); $stmt->bindParam('name',$RSDB_TEMP_txtvname,PDO::PARAM_STR); $stmt->execute(); - $result_vendor_entry = $stmt->fetch(PDO::FETCH_ASSOC) + $result_vendor_entry = $stmt->fetch(PDO::FETCH_ASSOC); $RSDB_TEMP_cboVendor = $result_vendor_entry['vendor_id']; @@ -535,7 +535,7 @@ $RSDB_TEMP_cboVendor = $RSDB_TEMP_rockhide; } - $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_groups ( grpentr_id, grpentr_name, grpentr_visible, grpentr_category, grpentr_vendor, grpentr_description, grpentr_usrid, grpentr_date ) VALUES ('', :name, '1', :category, :vendor, :description, :user_id , NOW() )"; + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_groups ( grpentr_id, grpentr_name, grpentr_visible, grpentr_category, grpentr_vendor, grpentr_description, grpentr_usrid, grpentr_date ) VALUES ('', :name, '1', :category, :vendor, :description, :user_id , NOW() )"); $stmt->bindParam('name',$RSDB_TEMP_txtname,PDO::PARAM_STR); $stmt->bindParam('category',$RSDB_TEMP_cboCategory,PDO::PARAM_STR); $stmt->bindParam('vendor',$RSDB_TEMP_cboVendor,PDO::PARAM_STR); Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -35,17 +35,16 @@ -$query_count_cat=mysql_query("SELECT COUNT('cat_id') - FROM `rsdb_categories` - WHERE `cat_visible` = '1' - AND `cat_path` = " . htmlentities($RSDB_SET_cat) . " - " . $RSDB_intern_code_db_rsdb_categories . " ;"); -$result_count_cat = mysql_fetch_row($query_count_cat); +$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_categories WHERE cat_visible = '1' AND cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . ""); +$stmt->bindParam('path',$RSDB_SET_cat,PDO::PARAM_STR); +$stmt->execute(); +$result_count_cat = $stmt->fetch(PDO::FETCH_NUM); // Update the ViewCounter: if ($RSDB_SET_cat != "" || $RSDB_SET_cat != "0") { - $query_update_viewcounter = "UPDATE `rsdb_categories` SET `cat_viewcounter` = (cat_viewcounter + 1) WHERE `cat_id` = '" . $RSDB_SET_cat . "' LIMIT 1 ;"; - @mysql_query($query_update_viewcounter); + $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_categories SET cat_viewcounter = (cat_viewcounter + 1) WHERE cat_id = :cat_id"); + $stmt->bindParam('cat_id',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); } if ($result_count_cat[0]) { @@ -66,12 +65,9 @@ </tr> <?php - $query_page = mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_visible` = '1' - AND `cat_path` = " . htmlentities($RSDB_SET_cat) . " - " . $RSDB_intern_code_db_rsdb_categories . " - ORDER BY `".htmlentities($RSDB_TEMP_sortby)."` ASC") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_visible = '1' AND cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . " ORDER BY `".htmlentities($RSDB_TEMP_sortby)."` ASC"); + $stmt->bindParam('path',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); $farbe1="#E2E2E2"; $farbe2="#EEEEEE"; @@ -81,7 +77,7 @@ include('inc/tree/tree_category_flat_count_grouplist.php'); - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages ?> <tr> <td width="25%" valign="top" bgcolor="<?php Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat_co… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat_co… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat_co… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -51,24 +51,19 @@ $RSDB_VAR_counter_tree_grouplist = 0; - $query_count_groups=mysql_query("SELECT COUNT('cat_id') - FROM `rsdb_categories` - WHERE `cat_visible` = '1' - AND `cat_path` = " . $RSDB_SET_cat . " - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_count_groups = mysql_fetch_row($query_count_groups); + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_categories WHERE cat_visible = '1' AND cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('path',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); + $result_count_groups = $stmt->fetch(); $RSDB_TEMP_counter_group=0; count_group_and_category($RSDB_TEMP_cat_id_grouplista); if ($result_count_groups[0]) { - $query_treeview_count_groups = mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_visible` = '1' - AND `cat_path` = " . $RSDB_TEMP_cat_id_grouplist . " - " . $RSDB_intern_code_db_rsdb_categories . " - ORDER BY `cat_name` ASC") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_visible = '1' AND cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . " ORDER BY cat_name ASC"); + $stmt->bindParam('path',$RSDB_TEMP_cat_id_grouplist,PDO::PARAM_STR); + $stmt->execute(); $cellcolor1="#E2E2E2"; @@ -76,7 +71,7 @@ $cellcolorcounter="0"; - while($result_treeview_count_groups = mysql_fetch_array($query_treeview_count_groups)) { // treeview_count_groups + while($result_treeview_count_groups = $stmt->fetch(PDO::FETCH_ASSOC)) { // treeview_count_groups // echo "<br><a href='".$RSDB_intern_link_category_cat.$result_treeview_count_groups['cat_id']."'>".$result_treeview_count_groups['cat_name']."</a>"; @@ -101,12 +96,9 @@ global $RSDB_TEMP_counter_group; global $RSDB_intern_code_db_rsdb_groups; - $query_count_group_and_category=mysql_query("SELECT COUNT('grpentr_id') - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_category` = " . $RSDB_TEMP_cat_id_group . " - " . $RSDB_intern_code_db_rsdb_groups . " ;"); - $result_count_group_and_category = mysql_fetch_row($query_count_group_and_category); + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . ""); + $stmt->bindParam('category',$RSDB_TEMP_cat_id_group,PDO::PARAM_STR); + $result_count_group_and_category = $stmt->fetch(PDO::FETCH_NUM); // echo "->".$result_count_group_and_category[0]."<-"; if ($result_count_group_and_category[0]) { @@ -131,13 +123,11 @@ global $RSDB_intern_code_db_rsdb_categories; - $query_create_historybar=mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_path` = " . $RSDB_TEMP_cat_id ." - " . $RSDB_intern_code_db_rsdb_categories . " - AND `cat_visible` = '1' ;"); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . " AND cat_visible = '1'"); + $stmt->bindParam('path',$RSDB_TEMP_cat_id,PDO::PARAM_STR); + $stmt->execute(); - while($result_create_historybar=mysql_fetch_array($query_create_historybar)) { + while($result_create_historybar=$stmt->fetch(PDO::FETCH_ASSOC)) { count_tree_groups_entry($result_create_historybar['cat_id'], $RSDB_TEMP_cat_level_newmain); create_counter_groups($result_create_historybar['cat_path'], $result_create_historybar['cat_id'], 0, $RSDB_TEMP_cat_level_newmain); } @@ -152,13 +142,11 @@ - $query_count_tree_groups_entry=mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_TEMP_entry_id ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$RSDB_TEMP_entry_id,PDO::PARAM_STR); + $stmt->execute(); - $result_count_tree_groups_entry=mysql_fetch_array($query_count_tree_groups_entry); + $result_count_tree_groups_entry=$stmt->fetch(PDO::FETCH_ASSOC); // echo "<a href='".$RSDB_intern_link_category_cat.$result_count_tree_groups_entry['cat_id']."'>".$result_count_tree_groups_entry['cat_name']."</a>"; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -34,12 +34,10 @@ } -$query_count_groups=mysql_query("SELECT COUNT('grpentr_id') - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_category` = " . mysql_real_escape_string($RSDB_SET_cat) . " - " . $RSDB_intern_code_db_rsdb_groups . " ;"); -$result_count_groups = mysql_fetch_row($query_count_groups); +$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . ""); +$stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); +$stmt->execute(); +$result_count_groups = $stmt->fetch(PDO::FETCH_NUM); if ($result_count_groups[0]) { ?> @@ -69,18 +67,15 @@ </tr> <?php - $query_page = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_category` = " . mysql_real_escape_string($RSDB_SET_cat) . " - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_name` ASC") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_name ASC"); + $stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); $farbe1="#E2E2E2"; $farbe2="#EEEEEE"; $zaehler="0"; - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages ?> <tr> <td valign="top" bgcolor="<?php @@ -96,26 +91,20 @@ } ?>" > <div align="left"><font size="2" face="Arial, Helvetica, sans-serif"><b><a href="<?php echo $RSDB_intern_link_group_EX.$result_page['grpentr_id'].$RSDB_URI_slash; ?>"> <?php - $query_entry_vendor = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . mysql_real_escape_string($result_page['grpentr_vendor']) ." ;") ; - $result_entry_vendor = mysql_fetch_array($query_entry_vendor); + $stmt_vendor=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id"); + $stmt_vendor->bindParam('vendor_id',$result_page['grpentr_vendor'],PDO::PARAM_STR); + $stmt_vendor->execute(); + $result_entry_vendor = $stmt->fetch(PDO::FETCH_ASSOC); /* echo $result_entry_vendor['vendor_name']." "; */ ?> <?php echo $result_page['grpentr_name']; ?></a></b><?php echo "  <i>"; - $query_entry_appver = mysql_query("SELECT DISTINCT ( - `comp_appversion` - ), `comp_osversion` , `comp_id` , `comp_name` - FROM `rsdb_item_comp` - WHERE `comp_visible` = '1' - AND `comp_groupid` = '". mysql_real_escape_string($result_page['grpentr_id']) ."' - GROUP BY `comp_appversion` - ORDER BY `comp_appversion` ASC - LIMIT 0 , 15 ;") ; - while($result_entry_appver = mysql_fetch_array($query_entry_appver)) { + $stmt_comp=CDBConnection::getInstance()->prepare("SELECT DISTINCT(comp_appversion), comp_osversion, comp_id, comp_name FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_groupid = :group_id GROUP BY comp_appversion ORDER BY comp_appversion ASC LIMIT 15"); + $stmt_comp->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt_comp->execute(); + while($result_entry_appver = $stmt_comp->fetch(PDO::FETCH_ASSOC)) { if ($result_entry_appver['comp_name'] > $result_page['grpentr_name']) { echo "<a href=\"".$RSDB_intern_link_group_EX.$result_page['grpentr_id'].$RSDB_URI_slash2."&group2=".$result_entry_appver['comp_appversion']."\">".substr($result_entry_appver['comp_name'], strlen($result_page['grpentr_name'])+1 )."</a>, "; } @@ -149,49 +138,41 @@ $counter_forumentries = 0; $counter_screenshots = 0; - $query_group_sum_items = mysql_query("SELECT * - FROM `rsdb_item_comp` - WHERE `comp_groupid` = " . mysql_real_escape_string($result_page['grpentr_id']) . " - AND `comp_visible` = '1' - ORDER BY `comp_groupid` DESC ;") ; - while($result_group_sum_items = mysql_fetch_array($query_group_sum_items)) { + $stmt_item=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_groupid = :group_id AND comp_visible = '1' ORDER BY comp_groupid DESC"); + $stmt_item->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt_item->execute(); + while($result_group_sum_items = $stmt_item->fetch(PDO::FETCH_ASSOC)) { $counter_items++; if ($counter_awards_best < $result_group_sum_items['comp_award']) { $counter_awards_best = $result_group_sum_items['comp_award']; } - $query_count_stars_sum = mysql_query("SELECT * - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = " . $result_group_sum_items['comp_id'] . " - ORDER BY `test_comp_id` ASC") ; - - while($result_count_stars_sum = mysql_fetch_array($query_count_stars_sum)) { - $counter_stars_install_sum += $result_count_stars_sum['test_result_install']; - $counter_stars_function_sum += $result_count_stars_sum['test_result_function']; - $counter_stars_user_sum++; - } + $stmt_tests=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id"); + $stmt_tests->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_tests->execute(); + $tmp=$stmt_tests->fetch(PDO::FETCH_ASSOC); + + $counter_stars_install_sum += $tmp['install_sum']; + $counter_stars_function_sum += $tmp['function_sum']; + $counter_stars_user_sum += $tmp['user_sum']; - $query_count_testentries=mysql_query("SELECT COUNT('test_id') - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = '".mysql_real_escape_string($result_group_sum_items['comp_id'])."' ;"); - $result_count_testentries = mysql_fetch_row($query_count_testentries); + $stmt_count=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id"); + $stmt_count->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_count->execute(); + $result_count_testentries = $stmt_count->fetch(PDO::FETCH_NUM); $counter_testentries += $result_count_testentries[0]; // Forum entries: - $query_count_forumentries=mysql_query("SELECT COUNT('fmsg_id') - FROM `rsdb_item_comp_forum` - WHERE `fmsg_visible` = '1' - AND `fmsg_comp_id` = '".mysql_real_escape_string($result_group_sum_items['comp_id'])."' ;"); - $result_count_forumentries = mysql_fetch_row($query_count_forumentries); + $stmt_count=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_comp_forum WHERE fmsg_visible = '1' AND fmsg_comp_id = :comp_id"); + $stmt_count->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_count->execute(); + $result_count_forumentries = $stmt_count->fetch(PDO::FETCH_NUM); $counter_forumentries += $result_count_forumentries[0]; // Screenshots: - $query_count_screenshots=mysql_query("SELECT COUNT('media_id') - FROM `rsdb_object_media` - WHERE `media_visible` = '1' - AND `media_groupid` = '".mysql_real_escape_string($result_group_sum_items['comp_media'])."' ;"); - $result_count_screenshots = mysql_fetch_row($query_count_screenshots); + $stmt_count=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_object_media WHERE media_visible = '1' AND media_groupid = :group_id"); + $stmt_count->bindParam('group_id',$result_group_sum_items['comp_media'],PDO::PARAM_STR); + $stmt_count->execute(); + $result_count_screenshots = $stmt_count->fetch(PDO::FETCH_NUM); $counter_screenshots += $result_count_screenshots[0]; } ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -34,12 +34,10 @@ } -$query_count_groups=mysql_query("SELECT COUNT('grpentr_id') - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_category` = " . $RSDB_SET_cat . " - " . $RSDB_intern_code_db_rsdb_groups . " ;"); -$result_count_groups = mysql_fetch_row($query_count_groups); +$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . ""); +$stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); +$stmt->execute(); +$result_count_groups = $stmt->fetch(PDO::FETCH_NUM); if ($result_count_groups[0]) { ?> @@ -52,18 +50,15 @@ </tr> <?php - $query_page = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_category` = " . $RSDB_SET_cat . " - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_order` ASC") ; + $stmt=CDBConnecion::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_order ASC"); + $stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); $farbe1="#E2E2E2"; $farbe2="#EEEEEE"; $zaehler="0"; - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages ?> <tr> <td valign="top" bgcolor="<?php @@ -97,24 +92,19 @@ $counter_items = 0; - $query_group_sum_items = @mysql_query("SELECT * - FROM `rsdb_item_".mysql_escape_string($RSDB_intern_code_view_shortname)."` - WHERE `".mysql_escape_string($RSDB_intern_code_view_shortname)."_groupid` = " . $result_page['grpentr_id'] . " - AND `".mysql_escape_string($RSDB_intern_code_view_shortname)."_visible` = '1' - ORDER BY `".mysql_escape_string($RSDB_intern_code_view_shortname)."_groupid` DESC ;") ; - while($result_group_sum_items = @mysql_fetch_array($query_group_sum_items)) { + $stmt_item=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_".$RSDB_intern_code_view_shortname." WHERE ".$RSDB_intern_code_view_shortname."_groupid = :group_id AND ".$RSDB_intern_code_view_shortname."_visible` = '1' ORDER BY ".$RSDB_intern_code_view_shortname."_groupid DESC"); + $stmt_item->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt_item->execute(); + while($result_group_sum_items = $stmt_item->fetch(PDO::FETCH_ASSOC)) { $counter_items++; - $query_count_stars_sum = @mysql_query("SELECT * - FROM `".mysql_escape_string($RSDB_intern_code_view_shortname)."_item_".mysql_escape_string($RSDB_intern_code_view_shortname)."_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = " . $result_group_sum_items[$RSDB_intern_code_view_shortname.'_id'] . " - ORDER BY `test_comp_id` ASC") ; - - while($result_count_stars_sum = @mysql_fetch_array($query_count_stars_sum)) { - $counter_stars_install_sum += $result_count_stars_sum['test_result_install']; - $counter_stars_function_sum += $result_count_stars_sum['test_result_function']; - $counter_stars_user_sum++; - } + $stmt_tests=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM ".$RSDB_intern_code_view_shortname."_item_".$RSDB_intern_code_view_shortname."_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id ORDER BY test_comp_id ASC"); + $stmt_tests->bindParam('comp_id',$result_group_sum_items[$RSDB_intern_code_view_shortname.'_id'],PDO::PARAM_STR); + $stmt_tests->execute(); + $tmp=$stmt_tests->fetch(PDO::FETCH_ASSOC); + + $counter_stars_install_sum += $tmp['install_sum']; + $counter_stars_function_sum += $tmp['function_sum']; + $counter_stars_user_sum += $tmp['user_sum']; } echo $counter_items; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -36,17 +36,16 @@ -$query_count_cat=mysql_query("SELECT COUNT('cat_id') - FROM `rsdb_categories` - WHERE `cat_visible` = '1' - AND `cat_path` = " . htmlentities($RSDB_SET_cat) . " - " . $RSDB_intern_code_db_rsdb_categories . " ;"); -$result_count_cat = mysql_fetch_row($query_count_cat); +$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_categories WHERE cat_visible = '1' AND cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . ""); +$stmt->bindParam('path',$RSDB_SET_cat,PDO::PARAM_STR); +$stmt->execute(); +$result_count_cat = $stmt->fetch(PDO::FETCH_NUM); // Update the ViewCounter: if ($RSDB_SET_cat != "" || $RSDB_SET_cat != "0") { - $query_update_viewcounter = "UPDATE `rsdb_categories` SET `cat_viewcounter` = (cat_viewcounter + 1) WHERE `cat_id` = '" . $RSDB_SET_cat . "' LIMIT 1 ;"; - @mysql_query($query_update_viewcounter); + $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_categories SET cat_viewcounter = (cat_viewcounter + 1) WHERE cat_id = :cat_id"); + $stmt->bindParam('cat_id',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); } if ($result_count_cat[0]) { @@ -74,12 +73,9 @@ <?php - $query_treeview = mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_visible` = '1' - AND `cat_path` = " . htmlentities($RSDB_SET_cat) . " - " . $RSDB_intern_code_db_rsdb_categories . " - ORDER BY `".htmlentities($RSDB_TEMP_sortby)."` ASC") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_visible = '1' AND cat_path = :path " . $RSDB_intern_code_db_rsdb_categories . " ORDER BY ".$RSDB_TEMP_sortby." ASC"); + $stmt->bindParam('path',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); $cellcolor1="#E2E2E2"; @@ -88,7 +84,7 @@ include('inc/tree/tree_category_tree_count_grouplist.php'); - while($result_treeview = mysql_fetch_array($query_treeview)) { // TreeView + while($result_treeview = $stmt->fetch(PDO::FETCH_ASSOC)) { // TreeView ?> <tr> @@ -112,12 +108,10 @@ for ($guesslevel=1; ; $guesslevel++) { // echo $guesslevel."#"; - $query_category_tree_guesslevel= mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_TEMP_cat_current_id_guess ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_category_tree_guesslevel=mysql_fetch_array($query_category_tree_guesslevel); + $stmt_cat=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt_cat->bindParam('cat_id',$RSDB_TEMP_cat_current_id_guess,PDO::PARAM_STR); + $stmt_cat->execute(); + $result_category_tree_guesslevel=$stmt_cat->fetch(PDO::FETCH_ASSOC); // echo $result_category_tree_guesslevel['cat_name']; $RSDB_TEMP_cat_current_id_guess = $result_category_tree_guesslevel['cat_path']; @@ -166,15 +160,12 @@ global $RSDB_intern_code_db_rsdb_categories; global $RSDB_TEMP_sortby; - $query_create_historybar=mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_path` = " . $RSDB_TEMP_cat_id ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " - ORDER BY `".$RSDB_TEMP_sortby."` ASC ;"); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_path = :path AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . " ORDER BY ".$RSDB_TEMP_sortby." ASC"); + $stmt->bindParam('path',$RSDB_TEMP_cat_id,PDO::PARAM_STR); + $stmt->execute(); //$result_create_historybar=mysql_fetch_array($query_create_historybar); - while($result_create_historybar=mysql_fetch_array($query_create_historybar)) { + while($result_create_historybar=$stmt->fetch(PDO::FETCH_ASSOC)) { //echo "   catlev: ".$result_create_historybar['cat_level']." | curlev: ".$RSDB_TEMP_cat_level."<br>"; /* if ($result_create_historybar['cat_level'] > $RSDB_TEMP_cat_level) { @@ -205,13 +196,11 @@ // global $RSDB_TEMP_cat_icon; - $query_create_tree_entry=mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_TEMP_entry_id ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$RSDB_TEMP_entry_id,PDO::PARAM_STR); + $stmt->execute(); - $result_create_tree_entry=mysql_fetch_array($query_create_tree_entry); + $result_create_tree_entry=$stmt->fetch(PDO::FETCH_ASSOC); /* if ($result_create_tree_entry['cat_icon'] != "") { $RSDB_TEMP_cat_icon = $result_create_tree_entry['cat_icon']; @@ -227,12 +216,10 @@ // count the levels -> current category level for ($guesslevel=1; ; $guesslevel++) { // echo $guesslevel."#"; - $query_category_tree_guesslevel= mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_TEMP_cat_current_id_guess ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_category_tree_guesslevel=mysql_fetch_array($query_category_tree_guesslevel); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$RSDB_TEMP_cat_current_id_guess,PDO::PARAM_STR); + $stmt->execute(); + $result_category_tree_guesslevel=$stmt->fetch(PDO::FETCH_ASSOC); // echo $result_category_tree_guesslevel['cat_name']; $RSDB_TEMP_cat_current_id_guess = $result_category_tree_guesslevel['cat_path']; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree_co… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree_co… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree_co… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -55,12 +55,10 @@ global $RSDB_TEMP_counter_group; global $RSDB_intern_code_db_rsdb_groups; - $query_count_group_and_category=mysql_query("SELECT COUNT('grpentr_id') - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_category` = " . $RSDB_TEMP_cat_id_group . " - " . $RSDB_intern_code_db_rsdb_groups . " ;"); - $result_count_group_and_category = mysql_fetch_row($query_count_group_and_category); + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . ""); + $stmt->bindParam('category',$RSDB_TEMP_cat_id_group,PDO::PARAM_STR); + $stmt->execute(); + $result_count_group_and_category = $stmt->fetch(PDO::FETCH_NUM); // echo "->".$result_count_group_and_category[0]."<-"; if ($result_count_group_and_category[0]) { @@ -78,4 +76,4 @@ } -?> +?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -62,12 +62,10 @@ if ($RSDB_SET_cat != "") { if ($RSDB_SET_item != "" && $RSDB_viewpage != false) { - $query_itemid = mysql_query("SELECT * - FROM `rsdb_item_" . $RSDB_intern_code_view_shortname ."` - WHERE `" . $RSDB_intern_code_view_shortname . "_visible` = '1' - AND `" . $RSDB_intern_code_view_shortname . "_id` = " . $RSDB_SET_item . " - ORDER BY `" . $RSDB_intern_code_view_shortname . "_name` ASC") ; - $result_itempid = @mysql_fetch_array($query_itemid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_" . $RSDB_intern_code_view_shortname ." WHERE " . $RSDB_intern_code_view_shortname . "_visible = '1' AND " . $RSDB_intern_code_view_shortname . "_id = :item_id ORDER BY " . $RSDB_intern_code_view_shortname . "_name ASC"); + $stmt->bindParam('item_id',$RSDB_SET_item,PDO::PARAM_STR); + $stmt->execute(); + $result_itempid = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_itempid[$RSDB_intern_code_view_shortname.'_groupid'] == "" || $result_itempid[$RSDB_intern_code_view_shortname . '_groupid'] == "0") { //die(""); //echo "die1"; @@ -77,25 +75,20 @@ } if ($RSDB_SET_group != "" && $RSDB_viewpage != false) { //echo "+++++".$RSDB_SET_group; - $query_groupid = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_id` = " . $RSDB_SET_group . " - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_name` ASC") ; - $result_groupid = mysql_fetch_array($query_groupid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_name ASC") ; + $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); + $stmt->execute(); + $result_groupid = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_groupid['grpentr_category'] == "" || $result_groupid['grpentr_category'] == "0") { //die(""); //echo "die2"; $RSDB_viewpage = false; } if ($RSDB_viewpage != false) { - $query_category_treehistory_groupid= mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $result_groupid['grpentr_category'] ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_category_treehistory_groupid=mysql_fetch_array($query_category_treehistory_groupid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$result_groupid['grpentr_category'],PDO::PARAM_STR); + $stmt->execute(); + $result_category_treehistory_groupid=$stmt->fetch(PDO::FETCH_ASSOC); $RSDB_TEMP_cat_path = $result_category_treehistory_groupid['cat_path']; $RSDB_TEMP_cat_id = $result_category_treehistory_groupid['cat_id']; @@ -109,12 +102,10 @@ } elseif ($RSDB_viewpage != false) { //echo "hjall"; - $query_category_treehistory= mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_SET_cat ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_category_treehistory=mysql_fetch_array($query_category_treehistory); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); + $result_category_treehistory=$stmt->fetch(PDO::FETCH_ASSOC); $RSDB_TEMP_cat_path = $result_category_treehistory['cat_path']; $RSDB_TEMP_cat_id = $result_category_treehistory['cat_id']; @@ -130,12 +121,10 @@ // count the levels -> current category level for ($guesslevel=1; ; $guesslevel++) { // echo $guesslevel."#"; - $query_category_tree_guesslevel= mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_TEMP_cat_current_id_guess ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_category_tree_guesslevel=@mysql_fetch_array($query_category_tree_guesslevel); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$RSDB_TEMP_cat_current_id_guess,PDO::PARAM_STR); + $stmt->execute(); + $result_category_tree_guesslevel=$stmt->fetch(PDO::FETCH_ASSOC); // echo $result_category_tree_guesslevel['cat_name']; $RSDB_TEMP_cat_current_id_guess = $result_category_tree_guesslevel['cat_path']; @@ -153,12 +142,10 @@ // echo "<br>Ring0: ".$i." "; for ($k=1; $k < ($RSDB_intern_catlevel+1-$i); $k++) { // echo $k."|"; - $query_category_tree_temp= mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = " . $RSDB_TEMP_cat_current_id ." - AND `cat_visible` = '1' - " . $RSDB_intern_code_db_rsdb_categories . " ;"); - $result_category_tree_temp=mysql_fetch_array($query_category_tree_temp); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND `cat_visible` = '1' " . $RSDB_intern_code_db_rsdb_categories . ""); + $stmt->bindParam('cat_id',$RSDB_TEMP_cat_current_id,PDO::PARAM_STR); + $stmt->execute(); + $result_category_tree_temp=$stmt->fetch(PDO::FETCH_ASSOC); $RSDB_TEMP_cat_current_id = $result_category_tree_temp['cat_path']; // echo "K:".$k."|E:".($result_category_treehistory['cat_level']+1-$i); @@ -185,22 +172,17 @@ } if ($RSDB_SET_group != "" && $RSDB_viewpage != false) { - $query_current_group = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_id` = " . $RSDB_SET_group . " - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_name` ASC") ; - $result_current_group = mysql_fetch_array($query_current_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_name ASC"); + $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); + $stmt->execute(); + $result_current_group = $stmt->fetch(PDO::FETCH_ASSOC); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_group_EX.$RSDB_SET_group.$RSDB_URI_slash."'>".$result_current_group['grpentr_name']."</a>"; } if ($RSDB_SET_item != "" && $RSDB_viewpage != false) { - $query_current_group = mysql_query("SELECT * - FROM `rsdb_item_" . $RSDB_intern_code_view_shortname ."` - WHERE `" . $RSDB_intern_code_view_shortname . "_visible` = '1' - AND `" . $RSDB_intern_code_view_shortname . "_id` = " . $RSDB_SET_item . " - ORDER BY `" . $RSDB_intern_code_view_shortname . "_name` ASC") ; - $result_current_group = mysql_fetch_array($query_current_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_" . $RSDB_intern_code_view_shortname ." WHERE " . $RSDB_intern_code_view_shortname . "_visible = '1' AND " . $RSDB_intern_code_view_shortname . "_id = :item_id ORDER BY " . $RSDB_intern_code_view_shortname . "_name ASC"); + $stmt->bindParam('item_id',$RSDB_SET_item,PDO::PARAM_STR); + $stmt->execute(); + $result_current_group = $stmt->fetch(PDO::PARAM_STR); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_item2_id_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group[$RSDB_intern_code_view_shortname .'_name']; switch ($RSDB_SET_view) { @@ -254,24 +236,20 @@ if ($RSDB_SET_sec == "name" || $RSDB_SET_sec == "vendor") { if ($RSDB_SET_sec == "name") { if ($RSDB_SET_item != "") { - $query_itemid = mysql_query("SELECT * - FROM `rsdb_item_" . $RSDB_intern_code_view_shortname ."` - WHERE `" . $RSDB_intern_code_view_shortname . "_visible` = '1' - AND `" . $RSDB_intern_code_view_shortname . "_id` = " . $RSDB_SET_item . " - ORDER BY `" . $RSDB_intern_code_view_shortname . "_name` ASC") ; - $result_itempid = @mysql_fetch_array($query_itemid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_" . $RSDB_intern_code_view_shortname ." WHERE " . $RSDB_intern_code_view_shortname . "_visible = '1' AND " . $RSDB_intern_code_view_shortname . "_id = :item_id ORDER BY " . $RSDB_intern_code_view_shortname . "_name ASC") ; + $stmt->bindParam('item_id',$RSDB_SET_item,PDO::PARAM_STR); + $stmt->execute(); + $result_itempid = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_itempid[$RSDB_intern_code_view_shortname.'_groupid'] == "" || $result_itempid[$RSDB_intern_code_view_shortname . '_groupid'] == "0") { $RSDB_viewpage = false; } $RSDB_SET_group = $result_itempid[$RSDB_intern_code_view_shortname . '_groupid']; } if ($RSDB_SET_group != "") { - $query_groupid = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_id` = " . $RSDB_SET_group . " - ORDER BY `grpentr_id` ASC") ; - $result_groupid = mysql_fetch_array($query_groupid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id ORDER BY grpentr_id ASC"); + $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); + $stmt->execute(); + $result_groupid = $stmt->fetch(PDO::FETCH_ASSOC); $RSDB_SET_letter = strtolower(substr($result_groupid['grpentr_name'], 0, 1)); } ?> @@ -289,12 +267,10 @@ echo "</a>"; if ($RSDB_SET_item != "" && $RSDB_viewpage != false) { - $query_itemid = mysql_query("SELECT * - FROM `rsdb_item_" . $RSDB_intern_code_view_shortname ."` - WHERE `" . $RSDB_intern_code_view_shortname . "_visible` = '1' - AND `" . $RSDB_intern_code_view_shortname . "_id` = " . $RSDB_SET_item . " - ORDER BY `" . $RSDB_intern_code_view_shortname . "_name` ASC") ; - $result_itempid = mysql_fetch_array($query_itemid); + $stmt=CDBConnection::getInstance("SELECT * FROM rsdb_item_" . $RSDB_intern_code_view_shortname ." WHERE " . $RSDB_intern_code_view_shortname . "_visible = '1' AND " . $RSDB_intern_code_view_shortname . "_id = :item_id ORDER BY " . $RSDB_intern_code_view_shortname . "_name ASC"); + $stmt->bindParam('item_id',$RSDB_SET_item,PDO::PARAM_STR); + $stmt->execute(); + $result_itempid = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_itempid[$RSDB_intern_code_view_shortname.'_groupid'] == "" || $result_itempid[$RSDB_intern_code_view_shortname . '_groupid'] == "0") { //die(""); $RSDB_viewpage = false; @@ -302,13 +278,10 @@ $RSDB_SET_group = $result_itempid[$RSDB_intern_code_view_shortname . '_groupid']; } if ($RSDB_SET_group != "" && $RSDB_viewpage != false) { - $query_current_group = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_id` = " . $RSDB_SET_group . " - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_name` ASC") ; - $result_current_group = mysql_fetch_array($query_current_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_name ASC"); + $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); + $stmt->execute(); + $result_current_group = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_current_group['grpentr_category'] == "" || $result_current_group['grpentr_category'] == "0") { //die(""); $RSDB_viewpage = false; @@ -316,12 +289,10 @@ echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_group_EX.$RSDB_SET_group.$RSDB_URI_slash."'>".$result_current_group['grpentr_name']."</a>"; } if ($RSDB_SET_item != "" && $RSDB_viewpage != false) { - $query_current_group = mysql_query("SELECT * - FROM `rsdb_item_" . $RSDB_intern_code_view_shortname ."` - WHERE `" . $RSDB_intern_code_view_shortname . "_visible` = '1' - AND `" . $RSDB_intern_code_view_shortname . "_id` = " . $RSDB_SET_item . " - ORDER BY `" . $RSDB_intern_code_view_shortname . "_name` ASC") ; - $result_current_group = mysql_fetch_array($query_current_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_" . $RSDB_intern_code_view_shortname ." WHERE " . $RSDB_intern_code_view_shortname . "_visible = '1' AND " . $RSDB_intern_code_view_shortname . "_id = :item_id ORDER BY " . $RSDB_intern_code_view_shortname . "_name ASC"); + $stmt->bindParam('item_id',$RSDB_SET_item,PDO::PARAM_STR); + $stmt->execute(); + $result_current_group = $stmt->fetch(PDO::FETCH_ASSOC); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_item_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group[$RSDB_intern_code_view_shortname .'_name']; switch ($RSDB_SET_view) { @@ -349,11 +320,10 @@ elseif ($RSDB_SET_sec == "vendor") { if ($RSDB_SET_vendor != "") { - $query_itemid = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . $RSDB_SET_vendor . " - ORDER BY `vendor_name` ASC") ; - $result_itempid = @mysql_fetch_array($query_itemid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id ORDER BY vendor_name ASC"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); + $result_itempid = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_itempid['vendor_id'] == "" || $result_itempid['vendor_id'] == "0") { $RSDB_viewpage = false; } @@ -376,11 +346,10 @@ echo "</a></font>"; if ($RSDB_SET_vendor != "" && $RSDB_viewpage != false) { - $query_itemid = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . $RSDB_SET_vendor . " - ORDER BY `vendor_name` ASC") ; - $result_itempid = mysql_fetch_array($query_itemid); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id ORDER BY vendor_name ASC"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); + $result_itempid = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_itempid['vendor_id'] == "" || $result_itempid['vendor_id'] == "0") { //die(""); $RSDB_viewpage = false; @@ -389,13 +358,10 @@ echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_vendor_id_EX.$RSDB_SET_vendor.$RSDB_URI_slash."'>".$result_itempid['vendor_name']."</a>"; } if ($RSDB_SET_group != "" && $RSDB_viewpage != false) { - $query_current_group = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_id` = " . $RSDB_SET_group . " - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_name` ASC") ; - $result_current_group = mysql_fetch_array($query_current_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_name ASC"); + $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); + $stmt->execute(); + $result_current_group = $stmt->fetch(PDO::FETCH_ASSOC); if ($result_current_group['grpentr_category'] == "" || $result_current_group['grpentr_category'] == "0") { //die(""); $RSDB_viewpage = false; @@ -403,11 +369,10 @@ echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_name_group_EX.$RSDB_SET_group.$RSDB_URI_slash."'>".$result_current_group['grpentr_name']."</a>"; } if ($RSDB_SET_item != "" && $RSDB_viewpage != false) { - $query_current_group = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . $RSDB_SET_vendor . " - ORDER BY `vendor_name` ASC") ; - $result_current_group = mysql_fetch_array($query_current_group); + $stmt=CDBCOnnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id ORDER BY vendor_name ASC"); + $stmt->bindParam('group_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); + $result_current_group = $stmt->fetch(PDO::PARAM_STR); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_name_item_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group['vendor_name']; echo "</a>"; } @@ -649,4 +614,4 @@ echo "<br />"; break; } -?> +?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -53,11 +53,10 @@ $result_count_group['cat_media']=1; } else { - $query_count_group=mysql_query("SELECT * - FROM `rsdb_categories` - WHERE `cat_id` = ". $RSDB_SET_cat ." - AND `cat_visible` = '1' ;"); - $result_count_group = mysql_fetch_array($query_count_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1'"); + $stmt->bindParam('cat_id',$RSDB_SET_cat,PDO::PARAM_STR); + $stmt->execute(); + $result_count_group = $stmt->fetch(PDO::FETCH_ASSOC); } $RSDB_compare_string = 'cat'; } @@ -83,11 +82,10 @@ $RSDB_compare_string = 'item'; } elseif ($RSDB_SET_group != "") { - $query_count_group=mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_id` = ". $RSDB_SET_group ." - AND `grpentr_visible` = '1' ;"); - $result_count_group = mysql_fetch_array($query_count_group); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_id = :group_id AND grpentr_visible = '1'"); + $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); + $stmt->execute(); + $result_count_group = $stmt->fetch(PDO::FETCH_ASSOC); $RSDB_compare_string = 'grpentr'; } } @@ -125,4 +123,4 @@ </table> </td> </tr> -</table> +</table> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -39,12 +39,10 @@ $RSDB_SET_letter = "%"; } -$query_count_cat=mysql_query("SELECT COUNT('cat_id') - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_name` LIKE '" . $RSDB_SET_letter . "%' - " . $RSDB_intern_code_db_rsdb_groups . " ;"); -$result_count_cat = mysql_fetch_row($query_count_cat); +$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_name LIKE :starts_with " . $RSDB_intern_code_db_rsdb_groups . ""); +$stmt->bindValue('starts_with',$RSDB_SET_letter.'%',PDO::PARAM_STR); +$stmt->execute(); +$result_count_cat = $stmt->fetch(PDO::FETCH_NUM); if ($result_count_cat[0]) { echo "<p align='center'>"; @@ -102,20 +100,16 @@ </tr> <?php - $query_page = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_name` LIKE '" . $RSDB_SET_letter . "%' - " . $RSDB_intern_code_db_rsdb_groups . " - ORDER BY `grpentr_name` ASC - LIMIT " . $RSDB_SET_curpos . " , " . $RSDB_intern_items_per_page . " ;") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_name LIKE :starts_with " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_name ASC LIMIT ".intval($RSDB_intern_items_per_page)." OFFSET ".intval($RSDB_SET_curpos)); + $stmt->bindValue('starts_with',$RSDB_SET_letter.'%',PDO::PARAM_STR); + $stmt->execute(); $farbe1="#E2E2E2"; $farbe2="#EEEEEE"; $zaehler="0"; //$farbe="#CCCCC"; - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages ?> <tr> <td valign="top" bgcolor="<?php @@ -132,10 +126,10 @@ ?>" > <div align="left"><font face="Arial, Helvetica, sans-serif"> <a href="<?php echo $RSDB_intern_link_group_EX.$result_page['grpentr_id'].$RSDB_URI_slash; ?>"><b><?php echo $result_page['grpentr_name']; ?></b></a></font></div></td> <td valign="top" bgcolor="<?php echo $farbe; ?>"> <div align="left"><font size="2" face="Arial, Helvetica, sans-serif"> <?php - $query_entry_vendor = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . $result_page['grpentr_vendor'] ." ;") ; - $result_entry_vendor = mysql_fetch_array($query_entry_vendor); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id"); + $stmt->bindParam('vendor_id',$result_page['grpentr_vendor'],PDO::PARAM_STR); + $stmt->execute(); + $result_entry_vendor = $stmt->fetch(PDO::FETCH_ASSOC); echo '<a href="'.$RSDB_intern_link_vendor_sec.$result_entry_vendor['vendor_id'].'">'.$result_entry_vendor['vendor_name'].'</a>'; ?></font><font face="Arial, Helvetica, sans-serif"></font> @@ -163,49 +157,40 @@ $counter_forumentries = 0; $counter_screenshots = 0; - $query_group_sum_items = mysql_query("SELECT * - FROM `rsdb_item_comp` - WHERE `comp_groupid` = " . mysql_real_escape_string($result_page['grpentr_id']) . " - AND `comp_visible` = '1' - ORDER BY `comp_groupid` DESC ;") ; - while($result_group_sum_items = mysql_fetch_array($query_group_sum_items)) { + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_groupid = :group_id AND comp_visible = '1' ORDER BY comp_groupid DESC"); + $stmt->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt->execute(); + while($result_group_sum_items = $stmt->fetch(PDO::FETCH_ASSOC)) { $counter_items++; if ($counter_awards_best < $result_group_sum_items['comp_award']) { $counter_awards_best = $result_group_sum_items['comp_award']; } - $query_count_stars_sum = mysql_query("SELECT * - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = " . $result_group_sum_items['comp_id'] . " - ORDER BY `test_comp_id` ASC") ; - - while($result_count_stars_sum = mysql_fetch_array($query_count_stars_sum)) { - $counter_stars_install_sum += $result_count_stars_sum['test_result_install']; - $counter_stars_function_sum += $result_count_stars_sum['test_result_function']; - $counter_stars_user_sum++; - } - - $query_count_testentries=mysql_query("SELECT COUNT('test_id') - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = '".mysql_real_escape_string($result_group_sum_items['comp_id'])."' ;"); - $result_count_testentries = mysql_fetch_row($query_count_testentries); + $stmt_sub=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id ORDER BY test_comp_id ASC"); + $stmt_sub->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_sub->execute(); + $tmp=$stmt_sub->fetchOnce(PDO::FETCH_ASSOC); + $counter_stars_install_sum += $tmp['install_sum']; + $counter_stars_function_sum += $tmp['function_sum']; + $counter_stars_user_sum += $tmp['user_sum']; + + $stmt_sub=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id"); + $stmt_sub->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_sub->execute(); + $result_count_testentries = $stmt->fetch(PDO::FETCH_NUM); $counter_testentries += $result_count_testentries[0]; // Forum entries: - $query_count_forumentries=mysql_query("SELECT COUNT('fmsg_id') - FROM `rsdb_item_comp_forum` - WHERE `fmsg_visible` = '1' - AND `fmsg_comp_id` = '".mysql_real_escape_string($result_group_sum_items['comp_id'])."' ;"); - $result_count_forumentries = mysql_fetch_row($query_count_forumentries); + $stmt=CDBCOnnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_comp_forum WHERE fmsg_visible = '1' AND fmsg_comp_id = :comp_id"); + $stmt->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt->execute(); + $result_count_forumentries = $stmt->fetch(PDO::FETCH_NUM); $counter_forumentries += $result_count_forumentries[0]; // Screenshots: - $query_count_screenshots=mysql_query("SELECT COUNT('media_id') - FROM `rsdb_object_media` - WHERE `media_visible` = '1' - AND `media_groupid` = '".mysql_real_escape_string($result_group_sum_items['comp_media'])."' ;"); - $result_count_screenshots = mysql_fetch_row($query_count_screenshots); + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_object_media WHERE media_visible = '1' AND media_groupid = :group_id"); + $stmt->bindParam('group_id',$result_group_sum_items['comp_media'],PDO::PARAM_STR); + $stmt->execute(); + $result_count_screenshots = $stmt->fetch(PDO::FETCH_NUM); $counter_screenshots += $result_count_screenshots[0]; } ?> @@ -219,24 +204,19 @@ $counter_items = 0; - $query_group_sum_items = mysql_query("SELECT * - FROM `rsdb_item_comp` - WHERE `comp_groupid` = " . $result_page['grpentr_id'] . " - AND `comp_visible` = '1' - ORDER BY `comp_groupid` DESC ;") ; - while($result_group_sum_items = mysql_fetch_array($query_group_sum_items)) { + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_groupid = :group_id AND comp_visible = '1' ORDER BY comp_groupid DESC"); + $stmt->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt->execute(); + while($result_group_sum_items = $stmt->fetch(PDO::FETCH_ASSOC)) { $counter_items++; - $query_count_stars_sum = mysql_query("SELECT * - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = " . $result_group_sum_items['comp_id'] . " - ORDER BY `test_comp_id` ASC") ; - - while($result_count_stars_sum = mysql_fetch_array($query_count_stars_sum)) { - $counter_stars_install_sum += $result_count_stars_sum['test_result_install']; - $counter_stars_function_sum += $result_count_stars_sum['test_result_function']; - $counter_stars_user_sum++; - } + $stmt_test=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id ORDER BY test_comp_id ASC"); + $stmt_test->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_test->execute(); + $stmt_test->fetchOnce(PDO::FETCH_ASSOC); + + $counter_stars_install_sum += $tmp['install_sum']; + $counter_stars_function_sum += $tmp['function_sum']; + $counter_stars_user_sum += $tmp['user_sum']; } echo $counter_items; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -39,11 +39,10 @@ $RSDB_SET_letter = "%"; } -$query_count_cat=mysql_query("SELECT COUNT('cat_id') - FROM `rsdb_item_vendor` - WHERE `vendor_name` LIKE '" . $RSDB_SET_letter . "%' - AND `vendor_visible` = '1' ;"); -$result_count_cat = mysql_fetch_row($query_count_cat); +$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_vendor WHERE vendor_name LIKE :starts_with AND vendor_visible = '1'"); +$stmt->bindValue('starts_with',$RSDB_SET_letter.'%',PDO::PARAM_STR); +$stmt->execute(); +$result_count_cat = $stmt->fetchOnce(PDO::FETCH_NUM); if ($result_count_cat[0]) { echo "<p align='center'>"; @@ -71,19 +70,17 @@ </tr> <?php - $query_page = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_name` LIKE '" . mysql_real_escape_string($RSDB_SET_letter) . "%' - AND `vendor_visible` = '1' - ORDER BY `vendor_name` ASC - LIMIT " . mysql_real_escape_string($RSDB_SET_curpos) . " , " . mysql_real_escape_string($RSDB_intern_items_per_page) . " ;") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_name LIKE :starts_with AND vendor_visible = '1' ORDER BY vendor_name ASC LIMIT :limit OFFSET :offset"); + $stmt->bindValue('starts_with',$RSDB_SET_letter.'%',PDO::PARAM_STR); + $stmt->bindParam('limit',$RSDB_intern_items_per_page,PDO::PARAM_INT); + $stmt->bindParam('offset',$RSDB_SET_curpos,PDO::PARAM_INT); $farbe1="#E2E2E2"; $farbe2="#EEEEEE"; $zaehler="0"; //$farbe="#CCCCC"; - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages ?> <tr> <td valign="top" bgcolor="<?php Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat_main… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat_main… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_flat_main… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -36,12 +36,10 @@ if (usrfunc_IsModerator($RSDB_intern_user_id)) { - $query_maintainer_vendor = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_visible` = '1' - AND `vendor_id` = '".mysql_real_escape_string($RSDB_SET_vendor)."' - LIMIT 1 ;") ; - $result_maintainer_vendor = mysql_fetch_array($query_maintainer_vendor); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_visible = '1' AND vendor_id = :vendor_id LIMIT 1"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); + $result_maintainer_vendor = $stmt->fetchOnce(PDO::FETCH_ASSOC); $RSDB_referrer=""; $RSDB_usragent=""; @@ -75,9 +73,15 @@ if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_sec == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { // Submit vendor entry: - $update_group_entry = "INSERT INTO `rsdb_item_vendor` ( `vendor_id` , `vendor_name` , `vendor_visible` , `vendor_fullname` , `vendor_url` , `vendor_email` , `vendor_infotext` , `vendor_usrid` , `vendor_usrip` , `vendor_date` , `vendor_checked` ) - VALUES ('', '". mysql_real_escape_string($RSDB_TEMP_vendname) ."', '1', '". mysql_real_escape_string($RSDB_TEMP_fullname) ."', '". mysql_real_escape_string($RSDB_TEMP_txturl) ."', '". mysql_real_escape_string($RSDB_TEMP_txtemail) ."', '". mysql_real_escape_string($RSDB_TEMP_txtinfo) ."', '".mysql_real_escape_string($RSDB_intern_user_id)."', '".mysql_real_escape_string($RSDB_ipaddr)."', NOW( ) , 'yes')"; - mysql_query($update_group_entry); + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_item_vendor ( vendor_id, vendor_name, vendor_visible, vendor_fullname, vendor_url, vendor_email, vendor_infotext, vendor_usrid, vendor_usrip, vendor_date, vendor_checked ) VALUES ('', :name, '1', :fullname, :url, :email, :info, :user_id, :ip, NOW() , 'yes')"); + $stmt->bindParam('name',$RSDB_TEMP_vendname,PDO::PARAM_STR); + $stmt->bindParam('fullname',$RSDB_TEMP_fullname,PDO::PARAM_STR); + $stmt->bindParam('url',$RSDB_TEMP_txturl,PDO::PARAM_STR); + $stmt->bindParam('email',$RSDB_TEMP_txtemail,PDO::PARAM_STR); + $stmt->bindParam('info',$RSDB_TEMP_txtinfo,PDO::PARAM_STR); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); + $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); + $stmt->execute(); add_log_entry("low", "tree_vendor", "submit", "[Vendor] Submit entry", @usrfunc_GetUsername($RSDB_intern_user_id)." submitted the following vendor: \n\nVendor-Name: ".htmlentities($RSDB_TEMP_vendname)."\n\Fullname: ".htmlentities($RSDB_TEMP_fullname)." \n\nUrl: ".htmlentities($RSDB_TEMP_txturl)." \n\E-Mail: ".htmlentities($RSDB_TEMP_txtemail)." \n\Info: ".htmlentities($RSDB_TEMP_txtinfo), "0"); ?> @@ -89,9 +93,15 @@ // Special request: if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { - $report_submit="INSERT INTO `rsdb_logs` ( `log_id` , `log_date` , `log_usrid` , `log_usrip` , `log_level` , `log_action` , `log_title` , `log_description` , `log_category` , `log_badusr` , `log_referrer` , `log_browseragent` , `log_read` , `log_taskdone_usr` ) - VALUES ('', NOW( ) , '".mysql_real_escape_string($RSDB_intern_user_id)."', '".mysql_escape_string($RSDB_ipaddr)."', 'low', 'request', '".mysql_escape_string($RSDB_TEMP_txtreq1)."', '".mysql_escape_string($RSDB_TEMP_txtreq2)."', 'user_moderator', '0', '".mysql_escape_string($RSDB_referrer)."', '".mysql_escape_string($RSDB_usragent)."', ';', '0');"; - $db_report_submit=mysql_query($report_submit); + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs (log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr ) + VALUES ('', NOW() , :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); + $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); + $stmt->bindParam('title',$RSDB_TEMP_txtreq1,PDO::PARAM_STR); + $stmt->bindParam('description',$RSDB_TEMP_txtreq2,PDO::PARAM_STR); + $stmt->bindParam('referrer',$RSDB_referrer,PDO::PARAM_STR); + $stmt->bindParam('user_agent',$RSDB_usragent,PDO::PARAM_STR); + $stmt->execute(); } ?> @@ -196,9 +206,10 @@ if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { - $update_log_entry = "UPDATE `rsdb_logs` SET - `log_taskdone_usr` = '". mysql_real_escape_string($RSDB_intern_user_id) ."' WHERE `log_id` = '". mysql_real_escape_string($RSDB_TEMP_done) ."' LIMIT 1 ;"; - mysql_query($update_log_entry); + $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id LIMIT 1"); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); + $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); + $stmt->execute(); } ?> @@ -219,14 +230,9 @@ $cellcolor1="#E2E2E2"; $cellcolor2="#EEEEEE"; $cellcolorcounter="0"; - $query_entry_sprequest = mysql_query("SELECT * - FROM `rsdb_logs` - WHERE `log_level` LIKE 'low' - AND `log_action` LIKE 'request' - AND `log_category` LIKE 'user_moderator' - ORDER BY `log_date` DESC - LIMIT 0, 30;") ; - while($result_entry_sprequest = mysql_fetch_array($query_entry_sprequest)) { + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_logs WHERE log_level LIKE 'low' AND log_action LIKE 'request' AND log_category LIKE 'user_moderator' ORDER BY log_date DESC LIMIT 30"); + $stmt->execute(); + while($result_entry_sprequest = $stmt->fetch(PDO::FETCH_ASSOC)) { ?> <tr valign="top" bgcolor="<?php $cellcolorcounter++; @@ -281,4 +287,4 @@ </script> <?php } -?> +?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -35,13 +35,11 @@ - $query_page = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = ". htmlentities($RSDB_SET_vendor) ." - AND `vendor_visible` = '1' - ORDER BY `vendor_name` ASC") ; - - $result_page = mysql_fetch_array($query_page); + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id AND vendor_visible = '1' ORDER BY vendor_name ASC"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); + + $result_page = $stmt->fetchOnce(PDO::FETCH_ASSOC); if ($result_page['vendor_id']) { ?> @@ -172,18 +170,15 @@ </tr> <?php - $query_page = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_vendor` = " . htmlentities($RSDB_SET_vendor) . " - AND `grpentr_visible` = '1' - ". $RSDB_intern_code_db_rsdb_groups ." - ORDER BY `grpentr_name` ASC ;") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_vendor = :vendor_id AND grpentr_visible = '1' ". $RSDB_intern_code_db_rsdb_groups ." ORDER BY grpentr_name ASC"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); $farbe1="#E2E2E2"; $farbe2="#EEEEEE"; $zaehler="0"; - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages ?> <tr> <td valign="top" bgcolor="<?php @@ -200,10 +195,10 @@ ?>" > <div align="left"><font size="2" face="Arial, Helvetica, sans-serif"><b><a href="<?php echo $RSDB_intern_link_vendor2_group.$result_page['grpentr_id']; ?>"> <?php - $query_entry_vendor = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . mysql_real_escape_string($result_page['grpentr_vendor']) ." ;") ; - $result_entry_vendor = mysql_fetch_array($query_entry_vendor); + $stmt_item=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_id = :vendor_id"); + $stmt_item->bindParam('vendor_id',$result_page['grpentr_vendor'],PDO::PARAM_STR); + $stmt_item->execute(); + $result_entry_vendor = $stmt->fetch(PDO::FETCH_ASSOC); /* echo $result_entry_vendor['vendor_name']." "; */ @@ -211,16 +206,10 @@ <?php echo $result_page['grpentr_name']; ?></a></b> <?php echo "  <i>"; - $query_entry_appver = mysql_query("SELECT DISTINCT ( - `comp_appversion` - ), `comp_osversion` , `comp_id` , `comp_name` - FROM `rsdb_item_comp` - WHERE `comp_visible` = '1' - AND `comp_groupid` = '". mysql_real_escape_string($result_page['grpentr_id']) ."' - GROUP BY `comp_appversion` - ORDER BY `comp_appversion` ASC - LIMIT 0 , 15 ;") ; - while($result_entry_appver = mysql_fetch_array($query_entry_appver)) { + $stmt_item=CDBConnection::getInstance()->prepare("SELECT DISTINCT (comp_appversion), comp_osversion, comp_id, comp_name FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_groupid = :group_id GROUP BY comp_appversion ORDER BY comp_appversion ASC LIMIT 15"); + $stmt_item->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt_item->execute(); + while($result_entry_appver = $stmt_item->fetch(PDO::FETCH_ASSOC)) { if ($result_entry_appver['comp_name'] > $result_page['grpentr_name']) { echo "<a href=\"".$RSDB_intern_link_group.$result_page['grpentr_id']."&group2=".$result_entry_appver['comp_appversion']."\">".substr($result_entry_appver['comp_name'], strlen($result_page['grpentr_name'])+1 )."</a>, "; } @@ -252,49 +241,41 @@ $counter_forumentries = 0; $counter_screenshots = 0; - $query_group_sum_items = mysql_query("SELECT * - FROM `rsdb_item_comp` - WHERE `comp_groupid` = " . mysql_real_escape_string($result_page['grpentr_id']) . " - AND `comp_visible` = '1' - ORDER BY `comp_groupid` DESC ;") ; - while($result_group_sum_items = mysql_fetch_array($query_group_sum_items)) { + $stmt_comp=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_groupid = :group_id AND comp_visible = '1' ORDER BY comp_groupid DESC"); + $stmt_comp->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); + $stmt_comp->execute(); + while($result_group_sum_items = $stmt_comp->fetch(PDO::FETCH_ASSOC)) { $counter_items++; if ($counter_awards_best < $result_group_sum_items['comp_award']) { $counter_awards_best = $result_group_sum_items['comp_award']; } - $query_count_stars_sum = mysql_query("SELECT * - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = " . $result_group_sum_items['comp_id'] . " - ORDER BY `test_comp_id` ASC") ; - - while($result_count_stars_sum = mysql_fetch_array($query_count_stars_sum)) { - $counter_stars_install_sum += $result_count_stars_sum['test_result_install']; - $counter_stars_function_sum += $result_count_stars_sum['test_result_function']; - $counter_stars_user_sum++; - } + $stmt_results=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id ORDER BY test_comp_id ASC"); + $stmt_results->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_results->execute(); + $tmp=$stmt_results->fetchOnce(PDO::FETCH_ASSOC); + + $counter_stars_install_sum += $tmp['install_sum']; + $counter_stars_function_sum += $tmp['function_sum']; + $counter_stars_user_sum += $tmp['user_sum']; - $query_count_testentries=mysql_query("SELECT COUNT('test_id') - FROM `rsdb_item_comp_testresults` - WHERE `test_visible` = '1' - AND `test_comp_id` = '".mysql_real_escape_string($result_group_sum_items['comp_id'])."' ;"); - $result_count_testentries = mysql_fetch_row($query_count_testentries); + $stmt_count=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_comp_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id"); + $stmt_count->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt_count->execute(); + $result_count_testentries = $stmt_count->fetchOnce(PDO::FETCH_NUM); $counter_testentries += $result_count_testentries[0]; // Forum entries: - $query_count_forumentries=mysql_query("SELECT COUNT('fmsg_id') - FROM `rsdb_item_comp_forum` - WHERE `fmsg_visible` = '1' - AND `fmsg_comp_id` = '".mysql_real_escape_string($result_group_sum_items['comp_id'])."' ;"); - $result_count_forumentries = mysql_fetch_row($query_count_forumentries); + $stmt_count=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_item_comp_forum WHERE fmsg_visible = '1' AND fmsg_comp_id = :comp_id"); + $stmt->bindParam('comp_id',$result_group_sum_items['comp_id'],PDO::PARAM_STR); + $stmt->execute(); + $result_count_forumentries = $stmt->fetchOnce(PDO::FETCH_NUM); $counter_forumentries += $result_count_forumentries[0]; // Screenshots: - $query_count_screenshots=mysql_query("SELECT COUNT('media_id') - FROM `rsdb_object_media` - WHERE `media_visible` = '1' - AND `media_groupid` = '".mysql_real_escape_string($result_group_sum_items['comp_media'])."' ;"); - $result_count_screenshots = mysql_fetch_row($query_count_screenshots); + $stmt_count=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_object_media WHERE media_visible = '1' AND media_groupid = :group_id"); + $stmt_count->bindParam('group_id',$result_group_sum_items['comp_media'],PDO::PARAM_STR); + $stmt_count->execute(); + $result_count_screenshots = $stmt_count->fetchOnce(PDO::FETCH_ASSOC); $counter_screenshots += $result_count_screenshots[0]; } ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id_mainta… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id_mainta… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id_mainta… [iso-8859-1] Thu Apr 2 04:42:42 2009 @@ -36,12 +36,10 @@ if (usrfunc_IsModerator($RSDB_intern_user_id)) { - $query_maintainer_vendor = mysql_query("SELECT * - FROM `rsdb_item_vendor` - WHERE `vendor_visible` = '1' - AND `vendor_id` = '".mysql_real_escape_string($RSDB_SET_vendor)."' - LIMIT 1 ;") ; - $result_maintainer_vendor = mysql_fetch_array($query_maintainer_vendor); + $stmt=CDBConnection::getInstance()->prepapare("SELECT * FROM rsdb_item_vendor WHERE vendor_visible = '1' AND vendor_id = :vendor_id LIMIT 1"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); + $result_maintainer_vendor = $stmt->fetchOnce(PDO::FETCH_ASSOC); $RSDB_referrer=""; $RSDB_usragent=""; @@ -75,13 +73,14 @@ // Edit application group data: if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_vendor != "" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { // Update group entry: - $update_group_entry = "UPDATE `rsdb_item_vendor` SET `vendor_name` = '". mysql_real_escape_string($RSDB_TEMP_vendname) ."', - `vendor_fullname` = '". mysql_real_escape_string($RSDB_TEMP_fullname) ."', - `vendor_url` = '". mysql_real_escape_string($RSDB_TEMP_txturl) ."', - `vendor_email` = '". mysql_real_escape_string($RSDB_TEMP_txtemail) ."', - `vendor_infotext` = '". mysql_real_escape_string($RSDB_TEMP_txtinfo) ."' - WHERE `vendor_id` = '". mysql_real_escape_string($RSDB_SET_vendor) ."' LIMIT 1 ;"; - mysql_query($update_group_entry); + $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_name = :name, vendor_fullname = :fullname, vendor_url = :url, vendor_email = :email, vendor_infotext = :info WHERE vendor_id = :vendor_id LIMIT 1"); + $stmt->bindParam('name',$RSDB_TEMP_vendname,PDO::PARAM_STR); + $stmt->bindParam('fullname',$RSDB_TEMP_fullname,PDO::PARAM_STR); + $stmt->bindParam('url',$RSDB_TEMP_txturl,PDO::PARAM_STR); + $stmt->bindParam('email',$RSDB_TEMP_txtemail,PDO::PARAM_STR); + $stmt->bindParam('info',$RSDB_TEMP_txtinfo,PDO::PARAM_STR); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); add_log_entry("low", "tree_vendor", "edit", "[Vendor] Edit entry", @usrfunc_GetUsername($RSDB_intern_user_id)." changed the group data from: \n\nVendor-Name: ".htmlentities($result_maintainer_vendor['vendor_name'])." - ".htmlentities($result_maintainer_vendor['vendor_fullname'])." - ".$result_maintainer_vendor['vendor_id']."\n\nUrl: ".htmlentities($result_maintainer_vendor['vendor_url'])." \n\E-Mail: ".$result_maintainer_vendor['vendor_email']." \n\Info: ".$result_maintainer_vendor['vendor_infotext']." \n\n\nTo: \n\nVendor-Name: ".htmlentities($RSDB_TEMP_vendname)."\n\Fullname: ".htmlentities($RSDB_TEMP_fullname)." \n\nUrl: ".htmlentities($RSDB_TEMP_txturl)." \n\E-Mail: ".htmlentities($RSDB_TEMP_txtemail)." \n\Info: ".htmlentities($RSDB_TEMP_txtinfo), "0"); ?> @@ -93,15 +92,20 @@ // Special request: if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { - $report_submit="INSERT INTO `rsdb_logs` ( `log_id` , `log_date` , `log_usrid` , `log_usrip` , `log_level` , `log_action` , `log_title` , `log_description` , `log_category` , `log_badusr` , `log_referrer` , `log_browseragent` , `log_read` , `log_taskdone_usr` ) - VALUES ('', NOW( ) , '".mysql_real_escape_string($RSDB_intern_user_id)."', '".mysql_escape_string($RSDB_ipaddr)."', 'low', 'request', '".mysql_escape_string($RSDB_TEMP_txtreq1)."', '".mysql_escape_string($RSDB_TEMP_txtreq2)."', 'user_moderator', '0', '".mysql_escape_string($RSDB_referrer)."', '".mysql_escape_string($RSDB_usragent)."', ';', '0');"; - $db_report_submit=mysql_query($report_submit); + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs (log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr) VALUES ('', NOW(), :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); + $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); + $stmt->bindParam('title',$RSDB_TEMP_txtreq1,PDO::PARAM_STR); + $stmt->bindParam('description',$RSDB_TEMP_txtreq2,PDO::PARAM_STR); + $stmt->bindParam('referrer',$RSDB_referrer,PDO::PARAM_STR); + $stmt->bindParam('user_agent',$RSDB_usragent,PDO::PARAM_STR); + $stmt->execute(); } // Report spam: if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { - $update_log_entry = "UPDATE `rsdb_item_vendor` SET - `vendor_visible` = '3' WHERE `vendor_id` = '". mysql_real_escape_string($RSDB_SET_vendor) ."' LIMIT 1 ;"; - mysql_query($update_log_entry); + $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_visible = '3' WHERE vendor_id = :vendor_id LIMIT 1"); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); add_log_entry("low", "tree_vendor", "report_spam", "[Vendor] Spam/ads report", @usrfunc_GetUsername($RSDB_intern_user_id)." wrote: \n".htmlentities($RSDB_TEMP_txtspam)." \n\n\n\nUser: ".@usrfunc_GetUsername($result_maintainer_vendor['vendor_usrid'])." - ".$result_maintainer_vendor['vendor_usrid']."\n\nVendor-Name: ".htmlentities($result_maintainer_vendor['vendor_name'])." - ".$result_maintainer_vendor['vendor_id']."\n\nUrl: ".htmlentities($result_maintainer_vendor['vendor_url'])." \n\E-Mail: ".$result_maintainer_vendor['vendor_email']." \n\Info: ".$result_maintainer_vendor['vendor_infotext'], $result_maintainer_vendor['vendor_usrid']); } // Verified: @@ -113,9 +117,10 @@ } if ($result_maintainer_vendor['vendor_checked'] == "1" || $result_maintainer_vendor['vendor_checked'] == "no") { if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { - $update_log_entry = "UPDATE `rsdb_item_vendor` SET - `vendor_checked` = '". mysql_real_escape_string($temp_verified) ."' WHERE `vendor_id` = '". mysql_real_escape_string($RSDB_SET_vendor) ."' LIMIT 1 ;"; - mysql_query($update_log_entry); + $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_checked = :checked WHERE vendor_id = :vendor_id LIMIT 1"); + $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); + $stmt->bindParam('vendor_id',$RSDB_SET_vendor,PDO::PARAM_STR); + $stmt->execute(); add_log_entry("low", "tree_vendor", "verified", "[Vendor] Verified", @usrfunc_GetUsername($RSDB_intern_user_id)." has verified the following vendor: \n\n\n\nUser: ".@usrfunc_GetUsername($result_maintainer_vendor['vendor_usrid'])." - ".$result_maintainer_vendor['vendor_usrid']."\n\nVendor-Name: ".htmlentities($result_maintainer_vendor['vendor_name'])." - ".$result_maintainer_vendor['vendor_id']."\n\nUrl: ".htmlentities($result_maintainer_vendor['vendor_url'])." \n\E-Mail: ".$result_maintainer_vendor['vendor_email']." \n\Info: ".$result_maintainer_vendor['vendor_infotext'], "0"); } } @@ -354,9 +359,10 @@ if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { - $update_log_entry = "UPDATE `rsdb_logs` SET - `log_taskdone_usr` = '". mysql_real_escape_string($RSDB_intern_user_id) ."' WHERE `log_id` = '". mysql_real_escape_string($RSDB_TEMP_done) ."' LIMIT 1 ;"; - mysql_query($update_log_entry); + $stmt=CDBConnection::getInstance()->prepare"UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id LIMIT 1"); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); + $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); + $stmt->execute(); } ?> @@ -377,14 +383,9 @@ $cellcolor1="#E2E2E2"; $cellcolor2="#EEEEEE"; $cellcolorcounter="0"; - $query_entry_sprequest = mysql_query("SELECT * - FROM `rsdb_logs` - WHERE `log_level` LIKE 'low' - AND `log_action` LIKE 'request' - AND `log_category` LIKE 'user_moderator' - ORDER BY `log_date` DESC - LIMIT 0, 30;") ; - while($result_entry_sprequest = mysql_fetch_array($query_entry_sprequest)) { + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_logs WHERE log_level LIKE 'low' AND log_action LIKE 'request' AND log_category LIKE 'user_moderator' ORDER BY log_date DESC LIMIT 30;"); + $stmt->execute(); + while($result_entry_sprequest = $stmt->fetch(PDO::FETCH_ASSOC)) { ?> <tr valign="top" bgcolor="<?php $cellcolorcounter++; @@ -439,4 +440,4 @@ </script> <?php } -?> +?>

1 0

[tkreuzer] 40319: Implement delayed deletion of gdi objects. This is quite hacky and not 100% correct, but should hopefully fix the "Too many objects for process!!!" problem for now.
by tkreuzer＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: tkreuzer Date: Wed Apr 1 21:32:06 2009 New Revision: 40319 URL: http://svn.reactos.org/svn/reactos?rev=40319&view=rev Log: Implement delayed deletion of gdi objects. This is quite hacky and not 100% correct, but should hopefully fix the "Too many objects for process!!!" problem for now. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Wed Apr 1 21:32:06 2009 @@ -54,7 +54,10 @@ enum BASEFLAGS { - BASEFLAG_LOOKASIDE = 0x80 + BASEFLAG_LOOKASIDE = 0x80, + + /* ReactOS specific: */ + BASEFLAG_READY_TO_DIE = 0x1000 }; BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); @@ -103,8 +106,14 @@ FORCEINLINE GDIOBJ_ShareUnlockObjByPtr(POBJ Object) { + HGDIOBJ hobj = Object->hHmgr; + USHORT flags = Object->BaseFlags; INT cLocks = InterlockedDecrement((PLONG)&Object->ulShareCount); ASSERT(cLocks >= 0); + if ((flags & BASEFLAG_READY_TO_DIE) && (cLocks == 0)) + { + GDIOBJ_FreeObjByHandle(hobj, GDI_OBJECT_TYPE_DONTCARE); + } return cLocks; } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Apr 1 21:32:06 2009 @@ -574,6 +574,7 @@ } else if (Object->ulShareCount != 0) { + Object->BaseFlags |= BASEFLAG_READY_TO_DIE; DPRINT("Object %p, ulShareCount = %d\n", Object->hHmgr, Object->ulShareCount); GDIDBG_TRACECALLER(); GDIDBG_TRACESHARELOCKER(GDI_HANDLE_GET_INDEX(hObj));

1 0

[arty] 40318: [FORMATTING] no code change yet.
by arty＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: arty Date: Wed Apr 1 21:15:26 2009 New Revision: 40318 URL: http://svn.reactos.org/svn/reactos?rev=40318&view=rev Log: [FORMATTING] no code change yet. Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Wed Apr 1 21:15:26 2009 @@ -35,8 +35,8 @@ */ AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", - Irp->IoStatus.Status, - Irp->IoStatus.Information)); + Irp->IoStatus.Status, + Irp->IoStatus.Information)); ASSERT_IRQL(APC_LEVEL); @@ -52,108 +52,108 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { Irp->IoStatus.Status = STATUS_FILE_CLOSED; Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } if( !NT_SUCCESS(Status) ) { - /* Complete all following send IRPs with error */ - - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - SendReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - UnlockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - FALSE ); - - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = 0; - - if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - - SocketStateUnlock( FCB ); - - return STATUS_SUCCESS; + /* Complete all following send IRPs with error */ + + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + SendReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + UnlockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + FALSE ); + + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = 0; + + if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + + SocketStateUnlock( FCB ); + + return STATUS_SUCCESS; } RtlMoveMemory( FCB->Send.Window, - FCB->Send.Window + FCB->Send.BytesUsed, - FCB->Send.BytesUsed - Irp->IoStatus.Information ); + FCB->Send.Window + FCB->Send.BytesUsed, + FCB->Send.BytesUsed - Irp->IoStatus.Information ); FCB->Send.BytesUsed -= Irp->IoStatus.Information; if( !FCB->Send.BytesUsed && - !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - SendReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - Map = (PAFD_MAPBUF)(SendReq->BufferArray + SendReq->BufferCount); - - AFD_DbgPrint(MID_TRACE,("SendReq @ %x\n", SendReq)); - - SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; - - for( i = 0; i < SendReq->BufferCount; i++ ) { - Map[i].BufferAddress = - MmMapLockedPages( Map[i].Mdl, KernelMode ); - - CopySize = MIN( SpaceAvail, - SendReq->BufferArray[i].len ); - - RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, - Map[i].BufferAddress, - CopySize ); - - MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - - FCB->Send.BytesUsed += CopySize; - TotalBytesCopied += CopySize; - SpaceAvail -= CopySize; - } + !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + SendReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + Map = (PAFD_MAPBUF)(SendReq->BufferArray + SendReq->BufferCount); + + AFD_DbgPrint(MID_TRACE,("SendReq @ %x\n", SendReq)); + + SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; + + for( i = 0; i < SendReq->BufferCount; i++ ) { + Map[i].BufferAddress = + MmMapLockedPages( Map[i].Mdl, KernelMode ); + + CopySize = MIN( SpaceAvail, + SendReq->BufferArray[i].len ); + + RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, + Map[i].BufferAddress, + CopySize ); + + MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); + + FCB->Send.BytesUsed += CopySize; + TotalBytesCopied += CopySize; + SpaceAvail -= CopySize; + } } /* Some data is still waiting */ if( FCB->Send.BytesUsed ) { - FCB->PollState &= ~AFD_EVENT_SEND; - - Status = TdiSend( &FCB->SendIrp.InFlightRequest, - FCB->Connection.Object, - 0, - FCB->Send.Window, - FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, - SendComplete, - FCB ); + FCB->PollState &= ~AFD_EVENT_SEND; + + Status = TdiSend( &FCB->SendIrp.InFlightRequest, + FCB->Connection.Object, + 0, + FCB->Send.Window, + FCB->Send.BytesUsed, + &FCB->SendIrp.Iosb, + SendComplete, + FCB ); } else { - FCB->PollState |= AFD_EVENT_SEND; + FCB->PollState |= AFD_EVENT_SEND; } PollReeval( FCB->DeviceExt, FCB->FileObject ); if( TotalBytesCopied > 0 ) { - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - - if( Status == STATUS_PENDING ) - Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - - return UnlockAndMaybeComplete( FCB, Status, NextIrp, TotalBytesCopied ); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + + if( Status == STATUS_PENDING ) + Status = STATUS_SUCCESS; + + AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); + + return UnlockAndMaybeComplete( FCB, Status, NextIrp, TotalBytesCopied ); } else if( NextIrp ) { - AFD_DbgPrint(MID_TRACE,("Could not do any more with Irp %x\n", - NextIrp)); - InsertHeadList( &FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry ); + AFD_DbgPrint(MID_TRACE,("Could not do any more with Irp %x\n", + NextIrp)); + InsertHeadList( &FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry ); } SocketStateUnlock( FCB ); @@ -168,8 +168,8 @@ PAFD_FCB FCB = (PAFD_FCB)Context; AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", - Irp->IoStatus.Status, - Irp->IoStatus.Information)); + Irp->IoStatus.Status, + Irp->IoStatus.Information)); if( !SocketAcquireStateLock( FCB ) ) { Irp->IoStatus.Status = STATUS_FILE_CLOSED; @@ -186,8 +186,8 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { Irp->IoStatus.Status = STATUS_FILE_CLOSED; Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } SocketStateUnlock( FCB ); @@ -197,13 +197,13 @@ NTSTATUS NTAPI AfdConnectedSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp, BOOLEAN Short) { + PIO_STACK_LOCATION IrpSp, BOOLEAN Short) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; UINT TotalBytesCopied = 0, i, CopySize = 0, - SpaceAvail = 0, TotalBytesEncountered = 0; + SpaceAvail = 0, TotalBytesEncountered = 0; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -230,14 +230,14 @@ NULL, NULL, FALSE, FALSE ); - if( !SendReq->BufferArray ) { - return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + if( !SendReq->BufferArray ) { + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, Irp, 0 ); - } + } TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); - if( TargetAddress ) { + if( TargetAddress ) { Status = TdiSendDatagram ( &FCB->SendIrp.InFlightRequest, FCB->AddressFile.Object, @@ -248,8 +248,8 @@ PacketSocketSendComplete, FCB ); - ExFreePool( TargetAddress ); - } else Status = STATUS_NO_MEMORY; + ExFreePool( TargetAddress ); + } else Status = STATUS_NO_MEMORY; if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; @@ -260,13 +260,13 @@ } if( !(SendReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied ); + return UnlockAndMaybeComplete + ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied ); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - NULL, NULL, - FALSE, FALSE ); + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); if( !SendReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -276,95 +276,95 @@ AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { - if( SendReq->AfdFlags & AFD_IMMEDIATE ) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete - ( FCB, STATUS_CANT_WAIT, Irp, 0 ); - } else { - AFD_DbgPrint(MID_TRACE,("Queuing request\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); - } + if( SendReq->AfdFlags & AFD_IMMEDIATE ) { + AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete + ( FCB, STATUS_CANT_WAIT, Irp, 0 ); + } else { + AFD_DbgPrint(MID_TRACE,("Queuing request\n")); + return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); + } } AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n", - FCB->Send.BytesUsed)); + FCB->Send.BytesUsed)); if( !FCB->Send.BytesUsed ) { - SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; - - AFD_DbgPrint(MID_TRACE,("We can accept %d bytes\n", - SpaceAvail)); - - for( i = 0; FCB->Send.BytesUsed < FCB->Send.Size && - i < SendReq->BufferCount; i++ ) { - CopySize = MIN( SpaceAvail, - SendReq->BufferArray[i].len ); - - TotalBytesEncountered += SendReq->BufferArray[i].len; - - AFD_DbgPrint(MID_TRACE,("Copying Buffer %d, %x:%d to %x\n", - i, - SendReq->BufferArray[i].buf, - CopySize, - FCB->Send.Window + FCB->Send.BytesUsed)); - - RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, - SendReq->BufferArray[i].buf, - CopySize ); - - FCB->Send.BytesUsed += CopySize; - TotalBytesCopied += CopySize; - SpaceAvail -= CopySize; - } - - if( TotalBytesEncountered == 0 ) { - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - - AFD_DbgPrint(MID_TRACE,("Empty send\n")); - return UnlockAndMaybeComplete - ( FCB, Status, Irp, TotalBytesCopied ); - } - - AFD_DbgPrint(MID_TRACE,("Completed %d bytes\n", TotalBytesCopied)); - - if( TotalBytesCopied > 0 ) { - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - - Status = TdiSend( &FCB->SendIrp.InFlightRequest, - FCB->Connection.Object, - 0, - FCB->Send.Window, - FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, - SendComplete, - FCB ); - - if( Status == STATUS_PENDING ) - Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", - Status, TotalBytesCopied)); - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, TotalBytesCopied ); - } + SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; + + AFD_DbgPrint(MID_TRACE,("We can accept %d bytes\n", + SpaceAvail)); + + for( i = 0; FCB->Send.BytesUsed < FCB->Send.Size && + i < SendReq->BufferCount; i++ ) { + CopySize = MIN( SpaceAvail, + SendReq->BufferArray[i].len ); + + TotalBytesEncountered += SendReq->BufferArray[i].len; + + AFD_DbgPrint(MID_TRACE,("Copying Buffer %d, %x:%d to %x\n", + i, + SendReq->BufferArray[i].buf, + CopySize, + FCB->Send.Window + FCB->Send.BytesUsed)); + + RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, + SendReq->BufferArray[i].buf, + CopySize ); + + FCB->Send.BytesUsed += CopySize; + TotalBytesCopied += CopySize; + SpaceAvail -= CopySize; + } + + if( TotalBytesEncountered == 0 ) { + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + + AFD_DbgPrint(MID_TRACE,("Empty send\n")); + return UnlockAndMaybeComplete + ( FCB, Status, Irp, TotalBytesCopied ); + } + + AFD_DbgPrint(MID_TRACE,("Completed %d bytes\n", TotalBytesCopied)); + + if( TotalBytesCopied > 0 ) { + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + + Status = TdiSend( &FCB->SendIrp.InFlightRequest, + FCB->Connection.Object, + 0, + FCB->Send.Window, + FCB->Send.BytesUsed, + &FCB->SendIrp.Iosb, + SendComplete, + FCB ); + + if( Status == STATUS_PENDING ) + Status = STATUS_SUCCESS; + + AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", + Status, TotalBytesCopied)); + + return UnlockAndMaybeComplete + ( FCB, Status, Irp, TotalBytesCopied ); + } } if( SendReq->AfdFlags & AFD_IMMEDIATE ) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete - ( FCB, STATUS_CANT_WAIT, Irp, 0 ); + AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete + ( FCB, STATUS_CANT_WAIT, Irp, 0 ); } else { - AFD_DbgPrint(MID_TRACE,("Queuing request\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); + AFD_DbgPrint(MID_TRACE,("Queuing request\n")); + return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); } } NTSTATUS NTAPI AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp) { + PIO_STACK_LOCATION IrpSp) { NTSTATUS Status = STATUS_SUCCESS; PTDI_CONNECTION_INFORMATION TargetAddress; PFILE_OBJECT FileObject = IrpSp->FileObject; @@ -382,11 +382,11 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) - return UnlockAndMaybeComplete - ( FCB, STATUS_INVALID_PARAMETER, Irp, 0 ); + return UnlockAndMaybeComplete + ( FCB, STATUS_INVALID_PARAMETER, Irp, 0 ); if( !(SendReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, 0 ); + return UnlockAndMaybeComplete + ( FCB, STATUS_NO_MEMORY, Irp, 0 ); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, @@ -394,33 +394,33 @@ FALSE, FALSE ); if( !SendReq->BufferArray ) - return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, Irp, 0 ); AFD_DbgPrint - (MID_TRACE,("RemoteAddress #%d Type %d\n", - ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)-> - TAAddressCount, - ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)-> - Address[0].AddressType)); + (MID_TRACE,("RemoteAddress #%d Type %d\n", + ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)-> + TAAddressCount, + ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)-> + Address[0].AddressType)); TdiBuildConnectionInfo( &TargetAddress, - ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress) ); + ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress) ); /* Check the size of the Address given ... */ if( TargetAddress ) { - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); - - ExFreePool( TargetAddress ); + Status = TdiSendDatagram + ( &FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB ); + + ExFreePool( TargetAddress ); } else Status = STATUS_NO_MEMORY; if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; @@ -428,6 +428,6 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); return UnlockAndMaybeComplete - ( FCB, Status, Irp, SendReq->BufferArray[0].len ); + ( FCB, Status, Irp, SendReq->BufferArray[0].len ); }

1 0

[dchapyshev] 40317: - Ukrainian translation by Sakara Yevhen
by dchapyshev＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: dchapyshev Date: Wed Apr 1 20:27:55 2009 New Revision: 40317 URL: http://svn.reactos.org/svn/reactos?rev=40317&view=rev Log: - Ukrainian translation by Sakara Yevhen Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Wed Apr 1 20:27:55 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base\setup\reactos\lang\uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS Setup + * TRANSLATOR: Sakara Yevhen + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -5,112 +13,112 @@ CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Âàñ â³òàº ïðîãðàìà âñòàíîâëåííÿ ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Âè íå ìîæåòå âñòàíîâèòè ReactOS ïðÿìî ç öüîãî CD! Áóäü ëàñêà ïåðåçàïóñò³òü Âàø êîìïþòåð ç öüîãî CD äëÿ òîãî, ùîá âñòàíîâèòè ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Íàòèñí³òü êíîïêó Çàâåðøèòè äëÿ âèõîäó.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "Ìîâà ñèñòåìè:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "Ðîçêëàäêà êëàâ³àòóðè:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Äëÿ âèáîðó òèïó âñòàíîâëåííÿ íàòèñí³òü Äàë³.", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 + CONTROL "Òèï âñòàíîâëåííÿ", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Âñòàíîâëåííÿ ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Â³äíîâèòè àáî çì³íèòè âñòàíîâëåíèé ðàí³øå ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Äëÿ âñòàíîâëåííÿ ïðèñòðî¿â íàòèñí³òü Äàë³.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "Îñíîâí³ ïðèñòðî¿", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Êîìïþòåð:", IDC_STATIC, 20,15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 - LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + LTEXT "Åêðàí:", IDC_STATIC, 20,35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 - LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + LTEXT "Êëàâ³àòóðà:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ âñòàíîâëåííÿ ïðèñòðî¿â íàòèñí³òü Äàë³.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + CONTROL "Ðîçä³ëè äëÿ âñòàíîâëåííÿ ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "&Ñòâîðèòè", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Âèäàëèòè", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "Ä&ðàéâåð", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&Äîäàòêîâ³ ïàðàìåòðè...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Create Partition" +CAPTION "Ñòâîðåííÿ ðîçä³ëó" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 - LTEXT "Size:",IDC_STATIC, 13,24,27,9 + CONTROL "Ñòâîðèòè òà â³äôîðìàòóâàòè ðîçä³ë äèñêó",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Ðîçì³ð:",IDC_STATIC, 13,24,27,9 EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP - LTEXT "GB",IDC_UNIT, 117,24,14,9 - LTEXT "Filesystem:",IDC_STATIC,13,46,35,9 + LTEXT "Ãá",IDC_UNIT, 117,24,14,9 + LTEXT "Ôàéëîâà ñèñòåìà:",IDC_STATIC,13,46,35,9 CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 - PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP - PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Òàê",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Í³",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Advanced Partition Settings" +CAPTION "Äîäàòêîâ³ ïàðàìåòðè âñòàíîâëåííÿ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Áàçîâèé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Âñòàíîâëåííÿ çàâàíòàæóâà÷à", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Íå âñòàíîâëþâàòè çàâàíòàæóâà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&Òàê", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Í³", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + CONTROL "Âñòàíîâëåííÿ Àêàóíòà", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + CONTROL "Âèêîíóºòüñÿ âñòàíîâëåííÿ", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Êîï³þâàííÿ ôàéë³â...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -118,34 +126,34 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "Çàâåðøåííÿ âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "Çàâåðøåííÿ ïåðøîãî åòàïó âñòàíîâëåííÿ ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Ïåðøèé åòàï âñòàíîâëåííÿ ReactOS çàâåðøåíî.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Ï³ñëÿ íàòèñêàííÿ êëàâ³ø³ Çàâåðøèòè âàø êîìï'þòåð áóäå ïåðåçàâàíòàæåíèé.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Âè ìîæåòå âèòÿãíóòè ³íñòàëÿö³éíèé äèñê. Äëÿ ïåðåçàâàíòàæåííÿ êîìï'þòåðà íàòèñí³òü Çàâåðøèòè", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Language Selection" - IDS_LANGSUBTITLE "Choose language for setup and final system." - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." - IDS_DEVICETITLE "Setup the basic devices" - IDS_DEVICESUBTITLE "Set the settings of display and keyboard." - IDS_DRIVETITLE "Setup the installation partition and system folder" - IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" - IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" + IDS_LANGTITLE "Âèá³ð ìîâè" + IDS_LANGSUBTITLE "Âèáåð³òü ìîâó çà çàìîâ÷óâàííÿì â ñèñòåì³." + IDS_TYPETITLE "Âàñ â³òàº ïðîãðàìà âñòàíîâëåííÿ ReactOS" + IDS_TYPESUBTITLE "Âèáåð³òü òèï âñòàíîâëåííÿ." + IDS_DEVICETITLE "Âñòàíîâëåííÿ áàçîâèõ ïðèñòðî¿â" + IDS_DEVICESUBTITLE "Íàëàøòóâàííÿ ïàðàìåòð³â åêðàíó òà êëàâ³àòóðè." + IDS_DRIVETITLE "Âèá³ð ðîçòàøóâàííÿ íà äèñêó ³ ñèñòåìíîãî êàòàëîãó" + IDS_DRIVESUBTITLE "Ï³äãîòîâêà ðîçä³ëó äèñêà, ñèñòåìíîãî êàòàëîãó òà çàâàíòàæóâà÷à." + IDS_PROCESSTITLE "Ï³äãîòîâêà ðîçä³ëó äèñêà, êîï³þâàííÿ ñèñòåìíèõ ôàéë³â" + IDS_PROCESSSUBTITLE "Ñòâîðåííÿ ðîçä³ëó íà äèñêó, êîï³þâàííÿ ôàéë³â, âñòàíîâëåííÿ çàâàíòàæóâà÷à" + IDS_RESTARTTITLE "Ïåðøèé åòàï âñòàíîâëåííÿ çàâåðøåíî" + IDS_RESTARTSUBTITLE "Ïåðøèé åòàï çàâåðøåíî, äëÿ ïðîäîâæåííÿ ïîòð³áíå ïåðåçàâàíòàæåííÿ" + IDS_SUMMARYTITLE "Âñòàíîâëåííÿ Àêàóíòà" + IDS_SUMMARYSUBTITLE "Ñïèñîê âñòàíîâëåííÿ âëàñòèâîñòåé äëÿ ïåðåâ³ðêè, ïåðø í³æ çâåðíóòèñÿ ïðè âñòàíîâëåíí³ ïðèñòðî¿â" + IDS_ABORTSETUP "ReactOS âñòàíîâëåíèé íà êîìï'þòåð íå ïîâí³ñòþ. ßêùî âè çàêðèºòå ïðîãðàìó âñòàíîâëåííÿ çàðàç, â ïîäàëüøîìó âàì äîâåäåòüñÿ ïîâòîðèòè âñòàíîâëåííÿ ReactOS. Âè âïåâíåí³, ùî íåîáõ³äíî ïåðåðâàòè âñòàíîâëåííÿ?" + IDS_ABORTSETUP2 "Ïåðåðâàòè âñòàíîâëåííÿ?" END /* EOF */

1 0

[sginsberg] 40316: - Fix build breakage from 40056, caused by a missing new line at the end of ntddndis.h - Also remove the unnecessary _NTDDNDIS_ check from windot11.h
by sginsberg＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: sginsberg Date: Wed Apr 1 19:59:59 2009 New Revision: 40316 URL: http://svn.reactos.org/svn/reactos?rev=40316&view=rev Log: - Fix build breakage from 40056, caused by a missing new line at the end of ntddndis.h - Also remove the unnecessary _NTDDNDIS_ check from windot11.h Modified: trunk/reactos/include/psdk/ntddndis.h trunk/reactos/include/psdk/windot11.h Modified: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Wed Apr 1 19:59:59 2009 @@ -82,4 +82,4 @@ NDIS_WLAN_BSSID Bssid[1]; } NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; -#endif +#endif Modified: trunk/reactos/include/psdk/windot11.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windot11.h?re… ============================================================================== --- trunk/reactos/include/psdk/windot11.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windot11.h [iso-8859-1] Wed Apr 1 19:59:59 2009 @@ -1,10 +1,7 @@ #ifndef __WINDOT11_H__ #define __WINDOT11_H__ -#ifndef _NTDDNDIS_ #include <ntddndis.h> -#endif - #include <wlantypes.h> /* Enumerations */

1 0

[dgorbachev] 40315: Update Norwegian translations. Patches from LMH1, bug #2482, bug #4325.
by dgorbachev＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: dgorbachev Date: Wed Apr 1 19:27:44 2009 New Revision: 40315 URL: http://svn.reactos.org/svn/reactos?rev=40315&view=rev Log: Update Norwegian translations. Patches from LMH1, bug #2482, bug #4325. Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Wed Apr 1 19:27:44 2009 @@ -55,7 +55,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Effekter...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -100,24 +100,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Effekter" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Bruk følgende overgang effekter for menyer og verktøytips:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "B&ruk følgende metode for kantutjevning av skjerm skifter:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Br&uk store ikoner",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Vis sk&ygger under menyer",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Vis &vindu innholdet ved flytting",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker på Alt tasten",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -134,7 +134,7 @@ CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP - LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP + LTEXT "Større",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farger",1817,125,127,115,43 COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -171,7 +171,7 @@ POPUP "" BEGIN MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Primær", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "E&genskaper", ID_MENU_PROPERTIES @@ -180,14 +180,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_SLIDEEFFECT "Slide effekter" + IDS_FADEEFFECT "Fade effekter" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Vanlig" + IDS_CLEARTYPEEFFECT "Klartype" END STRINGTABLE @@ -228,8 +228,8 @@ IDS_INACTWIN "Uaktiv vindu" IDS_ACTWIN "Aktiv vindu" IDS_WINTEXT "Vindu tekst" - IDS_MESSBOX "Melding boks" - IDS_MESSTEXT "Melding tekst" + IDS_MESSBOX "Meldingboks" + IDS_MESSTEXT "Meldingtekst" IDS_BUTTEXT "OK" END @@ -244,18 +244,18 @@ IDS_ELEMENT_7 "Valgt enhet" IDS_ELEMENT_8 "Vindu" IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_10 "3D objekter" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Tegn tittel" IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_14 "Deaktivert meny elementer" IDS_ELEMENT_15 "Dialog" IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_17 "Program bakgrunn" IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_19 "Tegn avstand (horisontalt)" + IDS_ELEMENT_20 "Tegn avstand (vertikalt)" + IDS_ELEMENT_21 "Rask infomasjon" IDS_ELEMENT_22 "Symbol" END Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Wed Apr 1 19:27:44 2009 @@ -201,8 +201,8 @@ BEGIN IDS_ACCESSORIES "Tilbehør" IDS_CMT_CALC "Start Kalkulator" - IDS_CMT_CMD "Åpne command prompt" - IDS_CMT_EXPLORER "Start Explorer" + IDS_CMT_CMD "Åpne Kommandolinje" + IDS_CMT_EXPLORER "Start Utforsker" IDS_CMT_NOTEPAD "Start Tekstredigering" IDS_CMT_REGEDIT "Start Registerredigering" IDS_CMT_WORDPAD "Start Dokument redigering" @@ -210,8 +210,8 @@ IDS_CMT_DEVMGMT "Start Enhetsbehandler" IDS_CMT_SERVMAN "Start Tjenestebehandler" IDS_CMT_RDESKTOP "Start Ekstern skrivebord" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_EVENTVIEW "Start Hendelseliste" + IDS_CMT_MSCONFIG "Start Systemkonfigurasjon" END STRINGTABLE @@ -223,10 +223,10 @@ STRINGTABLE BEGIN - IDS_SYS_TOOLS "System verktøy" + IDS_SYS_TOOLS "Systemverktøy" IDS_CMT_CHARMAP "Tegnkart" - IDS_CMT_KBSWITCH "Endre tastatur valg" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" + IDS_CMT_KBSWITCH "Endre tastaturvalg" + IDS_CMT_DXDIAG "Kjør ReactX-Diagnose program" END STRINGTABLE @@ -237,9 +237,9 @@ STRINGTABLE BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_SYS_ENTERTAINMENT "Underholdning" + IDS_CMT_MPLAY32 "Start Multimedia avspiller" + IDS_CMT_SNDVOL32 "Start Volumkontroll" END STRINGTABLE Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Wed Apr 1 19:27:44 2009 @@ -23,7 +23,7 @@ STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger" IDS_APPDATA "Programdata" IDS_DESKTOP "Skrivebord" IDS_FAVORITES "Favoritter" @@ -31,20 +31,20 @@ IDS_PROGRAMS "Start-Meny\\Programmer" IDS_ADMINTOOLS "Start-Meny\\Programmer\\Administrative verktøy" IDS_STARTUP "Start-Meny\\Programmer\\Oppstart" - IDS_MYDOCUMENTS "Mine Dokumenter" - IDS_MYPICTURES "Mine Dokumenter\\Mine Bilder" - IDS_MYMUSIC "Mine Dokumenter\\Min Musikk" - IDS_MYVIDEOS "Mine Dokumenter\\Mine Filmer" + IDS_MYDOCUMENTS "Mine dokumenter" + IDS_MYPICTURES "Mine dokumenter\\Mine bilder" + IDS_MYMUSIC "Mine dokumenter\\Min musikk" + IDS_MYVIDEOS "Mine dokumenter\\Mine filmer" IDS_TEMPLATES "Templates" IDS_RECENT "Siste" - IDS_SENDTO "SendTo" + IDS_SENDTO "Send til" IDS_PRINTHOOD "PrintHood" IDS_NETHOOD "NetHood" IDS_LOCALSETTINGS "Lokale innstillinger" IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata" - IDS_TEMP "Lokale innstillinger\\Temp" - IDS_CACHE "Lokale innstillinger\\Temporary Internet Files" + IDS_TEMP "Lokale innstillinger\\Midlertidig" + IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer" IDS_HISTORY "Lokale innstillinger\\Logg" - IDS_COOKIES "Cookies" + IDS_COOKIES "Informasjonkapsel" IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" END

1 0

[cwittich] 40314: fix include guard See issue #4322 for more details.
by cwittich＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: cwittich Date: Wed Apr 1 17:56:53 2009 New Revision: 40314 URL: http://svn.reactos.org/svn/reactos?rev=40314&view=rev Log: fix include guard See issue #4322 for more details. Modified: trunk/reactos/include/psdk/ntddndis.h Modified: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Wed Apr 1 17:56:53 2009 @@ -1,6 +1,5 @@ #ifndef _NTDDNDIS_ #define _NTDDNDIS_ -#endif /* Defines */ #define NDIS_802_11_LENGTH_SSID 32 @@ -83,3 +82,4 @@ NDIS_WLAN_BSSID Bssid[1]; } NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; +#endif

1 0

[cgutman] 40313: - Handle IRP_MN_FILTER_RESOURCE_REQUIREMENTS - Now isapnp receives IRP_MN_START_DEVICE but it still doesn't work
by cgutman＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: cgutman Date: Wed Apr 1 13:01:26 2009 New Revision: 40313 URL: http://svn.reactos.org/svn/reactos?rev=40313&view=rev Log: - Handle IRP_MN_FILTER_RESOURCE_REQUIREMENTS - Now isapnp receives IRP_MN_START_DEVICE but it still doesn't work Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] Wed Apr 1 13:01:26 2009 @@ -1662,6 +1662,12 @@ Status = ISAPNPStopDevice(DeviceObject, Irp, IrpSp); break; + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + /* Nothing to do here */ + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + Status = Irp->IoStatus.Status; + break; + default: DPRINT("Unknown IOCTL 0x%X\n", IrpSp->MinorFunction); Status = STATUS_NOT_IMPLEMENTED;

1 0

[gedmurphy] 40312: reapply the icon cache init code
by gedmurphy＠svn.reactos.org 01 Apr '09

01 Apr '09

Author: gedmurphy Date: Wed Apr 1 11:27:23 2009 New Revision: 40312 URL: http://svn.reactos.org/svn/reactos?rev=40312&view=rev Log: reapply the icon cache init code Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Wed Apr 1 11:27:23 2009 @@ -384,8 +384,9 @@ TRACE("Entered SIC_Initialize\n"); - if (sic_hdpa) /* already initialized?*/ + if (sic_hdpa) { + TRACE("Icon cache already initialized\n"); return TRUE; } @@ -429,25 +430,56 @@ ilMask, 100, 100); + ShellBigIconList = ImageList_Create(cx_large, cy_large, ilMask, 100, 100); - /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), - IMAGE_ICON, cx_small, cy_small, LR_SHARED); - hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), - IMAGE_ICON, cx_large, cy_large, LR_SHARED); - - if (!hSm || !hLg) + if (ShellSmallIconList) + { + /* Load the document icon, which is used as the default if an icon isn't found. */ + hSm = (HICON)LoadImageW(shell32_hInstance, + MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, + cx_small, + cy_small, + LR_SHARED | LR_DEFAULTCOLOR); + if (!hSm) { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); - return FALSE; + ERR("Failed to load IDI_SHELL_DOCUMENT icon1!\n"); + return FALSE; } - - SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); - SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + } + else + { + ERR("Failed to load ShellSmallIconList\n"); + return FALSE; + } + + if (ShellBigIconList) + { + hLg = (HICON)LoadImageW(shell32_hInstance, + MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, + cx_large, + cy_large, + LR_SHARED | LR_DEFAULTCOLOR); + if (!hLg) + { + ERR("Failed to load IDI_SHELL_DOCUMENT icon2!\n"); + DestroyIcon(hSm); + return FALSE; + } + } + else + { + ERR("Failed to load ShellBigIconList\n"); + return FALSE; + } + + SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); + SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009