Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cgutman] 40706: - Also copy AllocatedResources from the stack to NdisMiniportBlock.Resources
by cgutman＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: cgutman Date: Sun Apr 26 09:35:24 2009 New Revision: 40706 URL: http://svn.reactos.org/svn/reactos?rev=40706&view=rev Log: - Also copy AllocatedResources from the stack to NdisMiniportBlock.Resources Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 09:35:24 2009 @@ -1727,6 +1727,19 @@ return STATUS_INSUFFICIENT_RESOURCES; } + Adapter->NdisMiniportBlock.Resources = + ExAllocatePool(PagedPool, ResourceListSize); + if (!Adapter->NdisMiniportBlock.Resources) + { + ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); + ExInterlockedRemoveEntryList(&Adapter->ListEntry, &AdapterListLock); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(Adapter->NdisMiniportBlock.Resources, + Stack->Parameters.StartDevice.AllocatedResources, + ResourceListSize); + RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResources, Stack->Parameters.StartDevice.AllocatedResources, ResourceListSize);

1 0

[cfinck] 392: Link source files and line numbers mentioned in the test log with the source files in their exact revisions in ViewVC Based on a patch by Alwyn Tan (alwyn.tan@gmail.com)
by cfinck＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: cfinck Date: Sun Apr 26 04:11:43 2009 New Revision: 392 URL: http://svn.reactos.org/svn/reactos?rev=392&view=rev Log: Link source files and line numbers mentioned in the test log with the source files in their exact revisions in ViewVC Based on a patch by Alwyn Tan (alwyn.tan(a)gmail.com) Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php branches/danny-web/www/www.reactos.org/testman/detail.php Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] Sun Apr 26 04:11:43 2009 @@ -12,4 +12,5 @@ define("RESULTS_PER_PAGE", 100); define("MAX_COMPARE_RESULTS", 5); + define("VIEWVC_TRUNK", "http://svn.reactos.org/svn/reactos/trunk"); ?> Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Sun Apr 26 04:11:43 2009 @@ -88,7 +88,15 @@ </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["log"]; ?>:</td> - <td><pre><?php echo htmlspecialchars($row["log"]); ?></pre></td> + <td><pre><?php + $patterns[0] = "#^([a-z]*:?$)([a-zA-Z0-9\/]+.[a-z]+):([0-9]+)($)#m"; + $patterns[1] = "#^([a-zA-Z0-9]+.[a-z]+):([0-9]+)(: )#m"; + + $replacements[0] = '$1<a href="' . VIEWVC_TRUNK . '/reactos/$2?revision=' . $row["revision"] . '&view=markup#l_$3">$2:$3</a>$4'; + $replacements[1] = '<a href="' . VIEWVC_TRUNK . '/rostests/winetests/' . $row["module"] . '/$1?revision=' . $row["revision"] . '&view=markup#l_$2">$1:$2</a>$3'; + + echo preg_replace($patterns, $replacements, htmlspecialchars($row["log"])); + ?></pre></td> </tr> </table><br />

1 0

[janderwald] 40705: - Pass KSPROPERTY_SET to subdevice constructor - Add debug traces on error case
by janderwald＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: janderwald Date: Sun Apr 26 04:07:33 2009 New Revision: 40705 URL: http://svn.reactos.org/svn/reactos?rev=40705&view=rev Log: - Pass KSPROPERTY_SET to subdevice constructor - Add debug traces on error case Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sun Apr 26 04:07:33 2009 @@ -49,6 +49,27 @@ } }; +DEFINE_KSPROPERTY_TOPOLOGYSET(PortFilterWavePciTopologySet, TopologyPropertyHandler); +DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PortFilterWavePciPinSet, PinPropertyHandler, PinPropertyHandler, PinPropertyHandler); + +KSPROPERTY_SET WavePciPropertySet[] = +{ + { + &KSPROPSETID_Topology, + sizeof(PortFilterWavePciTopologySet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PortFilterWavePciTopologySet, + 0, + NULL + }, + { + &KSPROPSETID_Pin, + sizeof(PortFilterWavePciPinSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PortFilterWavePciPinSet, + 0, + NULL + } +}; + //--------------------------------------------------------------- // IPortEvents @@ -401,14 +422,14 @@ return Status; } - /* create the subdevice descriptor */ + /* create the subdevice descriptor */ Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, 3, - InterfaceGuids, + InterfaceGuids, 0, NULL, - 0, - NULL, + 2, + WavePciPropertySet, 0, 0, 0, @@ -416,6 +437,7 @@ 0, NULL, This->pDescriptor); + if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Sun Apr 26 04:07:33 2009 @@ -224,6 +224,7 @@ if (!IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Pin)) { /* the fast handler only supports pin properties */ + DPRINT("Only KSPROPSETID_Pin is supported\n"); return Status; } @@ -231,6 +232,7 @@ Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, &PropertyHandler); if (!NT_SUCCESS(Status)) { + DPRINT("FindPropertyHandler failed with %x\n", Status); return Status; }

1 0

[cgutman] 40704: - Fix support for asynchronously completed requests
by cgutman＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cgutman Date: Sun Apr 26 03:31:49 2009 New Revision: 40704 URL: http://svn.reactos.org/svn/reactos?rev=40704&view=rev Log: - Fix support for asynchronously completed requests Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 03:31:49 2009 @@ -257,22 +257,6 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - -VOID NTAPI -MiniQueryComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_STATUS Status) -{ - UNIMPLEMENTED; -} - -VOID NTAPI -MiniSetComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_STATUS Status) -{ - UNIMPLEMENTED; } @@ -409,16 +393,14 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - - VOID NTAPI MiniRequestComplete( - IN PNDIS_HANDLE MiniportAdapterHandle, - IN PNDIS_REQUEST Request, + IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status) { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; - PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; + PNDIS_REQUEST Request; + PNDIS_REQUEST_MAC_BLOCK MacBlock; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); @@ -426,8 +408,10 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.PendingRequest = NULL; + Request = Adapter->NdisMiniportBlock.PendingRequest; KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + + MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( @@ -435,6 +419,11 @@ Request, Status); } + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeLowerIrql(OldIrql); } @@ -1148,17 +1137,14 @@ { case NdisRequestQueryInformation: NdisMQueryInformationComplete((NDIS_HANDLE)Adapter, NdisStatus); - MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; case NdisRequestSetInformation: NdisMSetInformationComplete((NDIS_HANDLE)Adapter, NdisStatus); - MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); - MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; } break; @@ -1842,8 +1828,8 @@ Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; Adapter->NdisMiniportBlock.SendPacketsHandler = ProSendPackets; - Adapter->NdisMiniportBlock.QueryCompleteHandler = MiniQueryComplete; - Adapter->NdisMiniportBlock.SetCompleteHandler = MiniSetComplete; + Adapter->NdisMiniportBlock.QueryCompleteHandler = MiniRequestComplete; + Adapter->NdisMiniportBlock.SetCompleteHandler = MiniRequestComplete; /* * Call MiniportInitialize.

1 0

[dgoette] 391: initial version of the new submit interface
by dgoette＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: dgoette Date: Sun Apr 26 03:09:46 2009 New Revision: 391 URL: http://svn.reactos.org/svn/reactos?rev=391&view=rev Log: initial version of the new submit interface Added: branches/danny-web/www/www.reactos.org/compat/js/submit.js branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php Modified: branches/danny-web/www/www.reactos.org/compat/config.php branches/danny-web/www/www.reactos.org/compat/convert1to2.sql branches/danny-web/www/www.reactos.org/compat/index.php branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php Modified: branches/danny-web/www/www.reactos.org/compat/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/config.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/config.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -8,5 +8,6 @@ define('CDBT_LANGUAGES' , 'cdb_languages'); define('CDBT_LOGS' , 'cdb_logs'); define('CDBT_TAGS' , 'cdb_tags'); +define('CDBT_VERSIONS' , 'cdb_entries_tags'); ?> Modified: branches/danny-web/www/www.reactos.org/compat/convert1to2.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/convert1to2.sql [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/convert1to2.sql [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -37,17 +37,7 @@ cat_icon, TRUE FROM rsdb_categories - WHERE cat_visible = '1' -UNION - SELECT - cat_id, - cat_path, - cat_name, - cat_description, - cat_icon, - FALSE - FROM rsdb_categories - WHERE cat_visible = '0'; + WHERE cat_visible = '1' AND cat_comp = '1'; ALTER TABLE cdb_categories ORDER BY id; DROP TABLE rsdb_categories; @@ -63,7 +53,7 @@ user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.accounts(id)', title VARCHAR( 100 ) NOT NULL , content TEXT NOT NULL , - creation DATETIME NOT NULL , + created DATETIME NOT NULL , visible BOOL NOT NULL DEFAULT FALSE ) ENGINE = MYISAM COMMENT = 'parent xor entry_id has to be NULL'; @@ -265,6 +255,7 @@ id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ) NOT NULL, version VARCHAR( 100 ) NOT NULL, + category_id BIGINT NOT NULL, description TEXT NOT NULL, created DATETIME NOT NULL, modified DATETIME NOT NULL, @@ -279,6 +270,7 @@ NULL, old_name, old_version, + 0, old_description, created, modified, @@ -303,7 +295,8 @@ ALTER TABLE cdb_entries_reports DROP old_name, DROP old_description, - DROP old_groupid; + DROP old_groupid, + DROP old_version; DROP TABLE rsdb_item_comp; @@ -314,7 +307,6 @@ -- ----------------------------------------------------------------- CREATE TABLE cdb_tags ( id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - category_id BIGINT COMMENT '->categories(id)', name VARCHAR( 100 ) NOT NULL , description TEXT NOT NULL , user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.users(id)', @@ -325,22 +317,6 @@ old_groupid BIGINT ) ENGINE = MYISAM; --- groups -INSERT INTO cdb_tags -SELECT DISTINCT - NULL, - (SELECT grpentr_category FROM rsdb_groups WHERE grpentr_name=g.grpentr_name ORDER BY grpentr_date DESC LIMIT 1), - grpentr_name, - grpentr_description, - grpentr_usrid, - (SELECT grpentr_date FROM rsdb_groups WHERE grpentr_name=g.grpentr_name ORDER BY grpentr_date DESC LIMIT 1), - TRUE, - FALSE, - (SELECT grpentr_vendor FROM rsdb_groups WHERE grpentr_name=g.grpentr_name ORDER BY grpentr_date DESC LIMIT 1), - grpentr_id -FROM rsdb_groups g -WHERE grpentr_comp = '1' AND grpentr_visible = '1'; - -- vendors INSERT INTO cdb_tags SELECT DISTINCT @@ -370,7 +346,7 @@ id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.users(id)', content TEXT NOT NULL , - creation DATETIME NOT NULL + created DATETIME NOT NULL ) ENGINE = MYISAM; INSERT INTO cdb_logs @@ -401,7 +377,7 @@ e.id, t.id FROM cdb_entries e -JOIN cdb_tags t ON (t.old_groupid = e.old_groupid OR t.old_vendor =e.old_vendorid); +JOIN cdb_tags t ON (t.old_vendor = e.old_vendorid); ALTER TABLE cdb_entries DROP old_groupid; ALTER TABLE cdb_entries DROP old_vendorid; @@ -459,7 +435,7 @@ (NULL, 35137, 'ReactOS 0.3.6', TRUE, '000360'), (NULL, 37181, 'ReactOS 0.3.7', TRUE, '000370'), (NULL, 39330, 'ReactOS 0.3.8', TRUE, '000380'), -(NULL, 66666, 'ReactOS 0.3.9', TRUE, '000390'); +(NULL, 40702, 'ReactOS 0.3.9', TRUE, '000390'); Modified: branches/danny-web/www/www.reactos.org/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/index.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/index.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -131,7 +131,6 @@ switch (@$_GET['page']) { // Frontpage - case '': case 'home': new Home(); break; @@ -240,9 +239,9 @@ new HTML_Search(); break; - // Category + // Submit case 'submit': - new Submit_Item(); + new HTML_Submit(); break; // Help @@ -251,7 +250,10 @@ break; default: - echo '404'; + // just show 404, if no request for 'get=' is given + if (!isset($_GET['get'])) { + echo '404'; + } break; // export data @@ -280,4 +282,13 @@ } // end switch export break; } // end switch page + +switch (@$_GET['get']) { + + // Suggestions + case 'suggestions': + new List_Suggestions(); + break; + +} // end switch get ?> Added: branches/danny-web/www/www.reactos.org/compat/js/submit.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/js/submit.js (added) +++ branches/danny-web/www/www.reactos.org/compat/js/submit.js [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,165 @@ +var namesuggestion = false; +var xmldoc; + + +function suggestName( name ) +{ + if (name.length>1) { + makeRequest('?get=suggestions&for=names&search='+encodeURIComponent(name), 'name'); + } +} + + + +/** + * starts a new AJAX request + * + * @param string url + * @param string action + * @param string objid + * @param string format + * @param string kind + * @param string parameters + */ +function makeRequest( url, action ) +{ + var http_request = false; + + if (window.XMLHttpRequest) { // Mozilla, Safari,... + http_request = new XMLHttpRequest(); + } + else if (window.ActiveXObject) { // IE + try { + http_request = new ActiveXObject("Msxml2.XMLHTTP"); + } catch (e) { + try { + http_request = new ActiveXObject("Microsoft.XMLHTTP"); + } catch (e2) { + } + } + } + http_request.overrideMimeType('text/xml'); + + http_request.onreadystatechange = function() + { + try { + if (http_request.readyState === 4) { + if (http_request.status === 200) { + switch (action) { + + case 'name': + showSuggestions(http_request, 'suggestedNames'); + break; + + case 'version': + showSuggestions(http_request, 'suggestedVersions'); + break; + } + } + } + } + catch (e) { + } + + }; + + // internal function end + http_request.open('GET', url, true); + http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache + http_request.send(null); + + return true; +} // end of function makeRequest + + + +function showSuggestions( http_request, id ) +{ + var show=''; + + xmldoc = http_request.responseXML; + var entries = xmldoc.getElementsByTagName('entry'); + + if (entries.length > 0) { + document.getElementById(id).style.display = 'block'; + namesuggestion = true; + + for (var i=0; i < entries.length; i++) { + show += '<li> <a onclick="useSuggestion(this, \'name\', '+i+');">'+entries[i].getAttribute('name')+'</a></li>'; + } + + document.getElementById(id).innerHTML='<ul>'+show+'</ul>'; + } + else { + namesuggestion = false; + hideSuggestions(id); + } +} + + + +function hideSuggestions( id ) +{ + document.getElementById(id).style.display = 'none'; +} + + + +function useSuggestion( from, type, index ) +{ + var id; + var show=''; + + if (type == 'name') { + id = 'title'; + hideSuggestions('suggestedNames'); + disableDetails(); + + var entries = xmldoc.getElementsByTagName('entry'); + var versions = entries[index].getElementsByTagName('version'); + + for (var i=0; i < versions.length; i++) { + show += '<li> <a onclick="useSuggestion(this, \'version\');">'+versions[i].firstChild.nodeValue+'</a></li>'; + } + + document.getElementById('suggestedVersions').style.display='block'; + document.getElementById('suggestedVersions').innerHTML='<ul>'+show+'</ul>'; + } + else if (type == 'version') { + id = 'version'; + hideSuggestions('suggestedVersions'); + } + document.getElementById(id).value=from.innerHTML; +} + + + +function toggleDetails( ) +{ + if (!document.getElementById('iCheck').checked) { + enableDetails() + } + else { + disableDetails() + } +} + + + +function disableDetails( ) +{ + document.getElementById('iCheck').checked = true; + document.getElementById('cat').disabled = true; + document.getElementById('description').disabled = true; + document.getElementById('tags').disabled = true; +} + + + +function enableDetails( ) +{ + document.getElementById('iCheck').checked = false; + document.getElementById('cat').disabled = false; + document.getElementById('description').disabled = false; + document.getElementById('tags').disabled = false; +} Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -44,7 +44,7 @@ $this->title = $page_title; $this->register_css('style.css'); $this->register_js('smoothscroll.js'); - $this->register_js('search.js'); + //$this->register_js('search.js'); // get output $this->build(); @@ -57,7 +57,7 @@ * * @access private */ - private function build( ) + protected function build( ) { $this->header(); $this->navigation(); Added: branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… (added) +++ branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,69 @@ +<?php + /* + RSDB - ReactOS Support Database + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +class List_Suggestions +{ + + + + public function __construct( ) + { + header("Content-Type: Text/XML"); + echo '<root>'; + switch (@$_GET['for']) { + case 'name': + default: + $stmt=CDBConnection::getInstance()->prepare("SELECT name, version FROM ".CDBT_ENTRIES." WHERE name LIKE :search ORDER BY name ASC, version DESC"); + + } + $stmt->bindValue('search',@$_GET['search'].'%',PDO::PARAM_STR); + $stmt->execute(); + $oldname = null; + + // build list of entries and their versions + while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { + + // open / close entry + if ($oldname === null || $oldname != $entry['name']) { + if ($oldname !== null) { + echo '</entry>'; + } + echo '<entry name="'.htmlspecialchars($entry['name']).'">'; + } + + // version + echo '<version>'.htmlspecialchars($entry['version']).'</version>'; + + // update last entry name + $oldname = $entry['name']; + } // end while entry + + // close entry + if ($oldname !== null) { + echo '</entry>'; + } + + echo '</root>'; + } // end of constructor + + + +} // end of List_Suggestions +?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -2,6 +2,7 @@ /* CompatDB - ReactOS Compatability Database Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> + 2009 Danny Götte <dangerground(a)web.de> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,24 +34,36 @@ * * @access public */ - public static function showTree($RSDB_TEMP_cat_path, $RSDB_TEMP_cat_id, $RSDB_TEMP_cat_level, $RSDB_TEMP_cat_level_newmain, $option) { - global $RSDB_intern_link_category_cat; + public static function showTreeAsOption($category_id = 0, $level = 0) + { + $output = ''; - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".CDBT_CATEGORIES." WHERE parent = :cat_path AND visible IS TRUE ORDER BY name ASC"); - $stmt->bindParam('cat_path',$RSDB_TEMP_cat_id,PDO::PARAM_STR); + $categories=self::getChilds($category_id); + if (count($categories) > 0) { + foreach($categories as $category) { + $output .= ' + <option value="'.$category['id'].'">'.str_repeat('   ',$level).htmlspecialchars($category['name']).'</option>'; + $output .= self::showTreeAsOption($category['id'],$level+1); + } + } + + return $output; + } // end of member function showTree + + + + /** + * @FILLME + * + * @access private + */ + private static function getChilds($category_id) + { + $stmt=CDBConnection::getInstance()->prepare("SELECT id, name FROM ".CDBT_CATEGORIES." WHERE parent = :cat_path AND visible IS TRUE ORDER BY name ASC"); + $stmt->bindParam('cat_path',$category_id,PDO::PARAM_INT); $stmt->execute(); - - while($result_create_historybar=$stmt->fetch(PDO::FETCH_ASSOC)) { - if ($option) { - self::showLeafAsOption($result_create_historybar['id'], $RSDB_TEMP_cat_level_newmain); - } - else { - self::showLeafAsRow($result_create_historybar['id'], $RSDB_TEMP_cat_level_newmain); - } - self::showTree($result_create_historybar['parent'], $result_create_historybar['id'], $RSDB_TEMP_cat_level, $RSDB_TEMP_cat_level_newmain,$option); - } - } // end of member function showTree - + return $stmt->fetchAll(PDO::FETCH_ASSOC); + } /** @@ -58,10 +71,10 @@ * * @access public */ - public static function showLeafAsOption($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) { + public static function showLeafAsOption($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) + { global $RSDB_intern_selected; - global $RSDB_intern_link_category_cat; global $cellcolor2; $cellcolor=$cellcolor2; @@ -115,7 +128,8 @@ * * @access public */ - public static function showLeafAsRow($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) { + public static function showLeafAsRow($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) + { global $RSDB_intern_link_category_cat; global $cellcolor2; @@ -176,7 +190,7 @@ echo "</font></div></td><td width='10%' valign='top' bgcolor='".$cellcolor."'><font size='2'>".Count::entriesInGroup($result_create_tree_entry['id'])."</font></td></tr>"; - } // end of member function showLeafAsOption + } // end of member function showLeafAsRow Added: branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php (added) +++ branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,149 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <gvg(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Entry + * + */ +class Entry +{ + + + + /** + * @FILLME + * + * @access public + */ + public static function add( $title, $version, $category, $description, $tags, $update = false ) + { + // search for existing entry + $entry_id = self::getId($title, $version); + + // insert new entry + if ($entry_id === false) { + + // check category type + if (!ctype_digit((string)$category) || $category == 0) { + echo 'Error: Unknown Categorie'; + return false; + } + + // insert + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO ".CDBT_ENTRIES." (name, version, category_id, description, created, modified, visible) VALUES (:name, :version, :category, :description, NOW(), NOW(), TRUE)"); + $stmt->bindParam('name',$title,PDO::PARAM_STR); + $stmt->bindParam('version',$version,PDO::PARAM_STR); + $stmt->bindParam('category',$category,PDO::PARAM_INT); + $stmt->bindParam('description',$description,PDO::PARAM_STR); + if(!$stmt->execute()) { + return false; + } + + $entry_id = self::getId($title, $version); + } + + // update entry + elseif ($update) { + $stmt=CDBConnection::getInstance()->prepare("UPDATE ".CDBT_ENTRIES." SET category=:category, description=:description, modified=NOW() WHERE id=:entry_id"); + $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_STR); + $stmt->bindParam('category',$category,PDO::PARAM_INT); + $stmt->bindParam('description',$description,PDO::PARAM_STR); + if(!$stmt->execute()) { + return false; + } + } + + return $entry_id; + } // end of member function add + + + + /** + * @FILLME + * + * @access public + */ + public static function addReport( $entry_id, $revision, $status = false ) + { + global $RSDB_intern_user_id; + + // check if entry exists + if ($entry_id === false) { + echo 'Error: Unknown entry'; + return false; + } + + // insert + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO ".CDBT_REPORTS." (entry_id, user_id, revision, works, created, visible, disabled) VALUES (:entry_id, :user_id, :revision, :status, NOW(), TRUE, FALSE)"); + $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_INT); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_INT); + $stmt->bindParam('revision',$revision,PDO::PARAM_INT); + $stmt->bindParam('status',$status,PDO::PARAM_BOOL); + return $stmt->execute(); + } // end of member function addReport + + + + /** + * @FILLME + * + * @access public + */ + public static function addComment( $entry_id, $title, $content ) + { + global $RSDB_intern_user_id; + + // check if entry exists + if ($entry_id === false) { + echo 'Error: Unknown entry'; + return false; + } + + // insert + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO ".CDBT_COMMENTS." (entry_id, user_id, parent, title, content, created, visible) VALUES (:entry_id, :user_id, NULL, :title, :content, NOW(), TRUE)"); + $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_INT); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_INT); + $stmt->bindParam('title',$title,PDO::PARAM_STR); + $stmt->bindParam('status',$content,PDO::PARAM_STR); + return $stmt->execute(); + } // end of member function add + + + + /** + * @FILLME + * + * @access public + */ + public static function getId( $title, $version ) + { + // search for existing entry + $stmt=CDBConnection::getInstance()->prepare("SELECT id FROM ".CDBT_ENTRIES." WHERE name LIKE :name AND version LIKE :version LIMIT 1"); + $stmt->bindParam('name',$title,PDO::PARAM_STR); + $stmt->bindParam('version',$version,PDO::PARAM_STR); + $stmt->execute(); + return $stmt->fetchColumn(); + } // end of member function add + + + +} // end of Entry +?> Added: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php (added) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,191 @@ +<?php + /* + RSDB - ReactOS Support Database + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +class HTML_Submit extends HTML +{ + + + public function __construct( ) + { + $this->register_js('submit.js'); + + parent::__construct(); + } + + + protected function build( ) + { + $this->header(); + $this->navigation(); + if (isset($_REQUEST['submit']) && $_REQUEST['submit'] == 'yes') { + $this->submit(); + } + $this->body(); + $this->footer(); + } + + + private function submit( ) + { + // get used revision number + if ($_POST['ver'] == 'R') { + $revision = $_POST['rev']; + } + else { + $revision = $_POST['ver']; + } + + // try to insert a new entry + if (isset($_POST['cat']) && isset($_POST['description'])) { + $entry_id = Entry::add($_POST['title'], $_POST['version'], $_POST['cat'], $_POST['description'], $_POST['tags'], (isset($_POST['iCheck']) && $_POST['iCheck'] == 'yes')); + } + + // search entry + else { + $entry_id = Entry::getId($_POST['title'], $_POST['version']); + } + + // insert new report/comment + if ($entry_id !== false) { + Entry::addReport($entry_id, $revision, ($_POST['status']=='yes')); + + // insert new comment + if (isset($_POST['comment']) && $_POST['comment'] != '') { + Entry::addComment($entry_id, 'test of r'.$revision, $_POST['comment']); + } + } + } // end of member function submit + + + + protected function body( ) + { + $used_again = (isset($_POST['next']) && $_POST['next']=='again'); + + echo ' + <form action="?page=submit&submit=yes" method="post"> + <fieldset> + <legend>App Details</legend> + <ul style="list-style-type: none;"> + <li style="float: left;"> + <label for="title">Application Name:</label><br /> + <input type="text" name="title" id="title" onkeyup="suggestName(this.value);" /> + <div id="suggestedNames" style="display:none;border: 1px solid red;"></div> + </li> + + <li style="float: right;"> + <label for="version">Version:</label><br /> + <input type="text" name="version" id="version" /> + <div id="suggestedVersions" style="display:none;border: 1px solid red;"></div> + </li> + + <li style="clear: both;"> + <fieldset> + <legend> + <input type="checkbox" name="iCheck" id="iCheck" value="yes" onclick="toggleDetails();" /> + <label for="iCheck">I don\'t want to modify the additional information</label> + </legend> + <ul style="list-style-type: none;"> + <li> + <label for="cat">Category:</label><br /> + <select name="cat" id="cat"> + <option value="0">&nbsp</option> + '.Category::showTreeAsOption().' + </select> + </li> + <li> + <label for="description">Short Description:</label><br /> + <input type="text" name="description" id="description" /> + </li> + + <li style="display:none;"> + <label for="tags">Tags: (seperate them by <em>,</em>)</label><br /> + <input type="text" name="tags" id="tags" /> + </li> + </ul> + </li> + + </ul> + </fieldset> + + <fieldset> + <legend>Test</legend> + <ul style="list-style-type: none;"> + <li> + Status:<br /> + <input type="radio" name="status" id="noworks" value="no" /> + <label for="noworks" style="color: red;">Doesn\'t Work</label> + <br /> + <input type="radio" name="status" id="doesn\'t work" value="yes" /> + <label for="works" style="color: green;">Works</label> + <br /> + <br /> + </li> + <li> + <label for="ver">Tested Version</label><br /> + <select name="ver" id="ver"> + <option value="R"'.(($used_again && $_POST['ver'] == 'R') ? ' selected="selected"' : '').'>Use Revision</option>'; + + $stmt=CDBConnection::getInstance()->prepare("SELECT revision, name FROM ".CDBT_VERSIONS." WHERE VISIBLE IS TRUE ORDER BY revision DESC"); + $stmt->execute(); + $x = 0; + while ($version = $stmt->fetch(PDO::FETCH_ASSOC) ) { + ++$x; + echo ' + <option value="'.$version['revision'].'"'.((($used_again && $_POST['ver'] == $version['revision']) || (!$used_again && $x===1)) ? ' selected="selected"' : '').'>'.$version['name'].'</option>'; + } + echo ' + </select> + </li> + + <li> + <label for="rev">Tested Revision (only trunk revisions are allowed, please don\'t enter revisions of tags or branches)</label><br /> + <input type="text" name="rev" id="rev"'.(($used_again && $_POST['ver'] == 'R') ? ' value="'.htmlspecialchars($_POST['revision']).'"' : '').' /> + </li> + </ul> + </fieldset> + + <fieldset> + <legend>Additional</legend> + <ul style="list-style-type: none;"> + <li> + <label for="comment">Comment</label><br /> + <textarea rows="6" cols="80" name="comment" id="comment"></textarea> + </li> + <li> + next action:<br /> + <input type="radio" name="next" id="again" value="again" '.($used_again ? 'checked="checked"' : '').' /> + <label for="again">Insert another entry/report</label> + <br /> + <input type="radio" name="next" id="entry" value="entry" '.(!$used_again ? 'checked="checked"' : '').' /> + <label for="entry">Jump to inserted entry/report</label> + </li> + </ul> + </fieldset> + <div> + <button type="submit">Submit new Compatibility Report</button> + </div> + </form>'; + } // end of member function body + + + +} // end of HTML_Submit +?>

1 0

[cgutman] 40703: - Use Int32x32To64 to calculate timeout
by cgutman＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cgutman Date: Sun Apr 26 02:02:50 2009 New Revision: 40703 URL: http://svn.reactos.org/svn/reactos?rev=40703&view=rev Log: - Use Int32x32To64 to calculate timeout Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 02:02:50 2009 @@ -1923,7 +1923,7 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStarted; - Timeout.QuadPart = (LONGLONG)Adapter->NdisMiniportBlock.CheckForHangSeconds * -1000000; + Timeout.QuadPart = Int32x32To64(Adapter->NdisMiniportBlock.CheckForHangSeconds, -1000000); KeSetTimerEx(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer, Timeout, Adapter->NdisMiniportBlock.CheckForHangSeconds * 1000, &Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc);

1 0

[cfinck] 40702: ReactOS 0.3.9 is done!
by cfinck＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cfinck Date: Sun Apr 26 00:50:47 2009 New Revision: 40702 URL: http://svn.reactos.org/svn/reactos?rev=40702&view=rev Log: ReactOS 0.3.9 is done! Added: tags/ReactOS-0.3.9/ - copied from r40701, branches/ros-branch-0_3_9/ Removed: branches/ros-branch-0_3_9/

1 0

[cfinck] 40701: Remove the non-working apps based on http://www.reactos.org/wiki/index.php/Tests_for_0.3.9
by cfinck＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cfinck Date: Sat Apr 25 23:03:37 2009 New Revision: 40701 URL: http://svn.reactos.org/svn/reactos?rev=40701&view=rev Log: Remove the non-working apps based on http://www.reactos.org/wiki/index.php/Tests_for_0.3.9 Modified: branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Sat Apr 25 23:03:37 2009 @@ -13,13 +13,6 @@ <version>3.0.9</version> <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en…</location> - </application> - <application name="Opera"> - <regname>Opera</regname> - <licence>Freeware</licence> - <version>9.63</version> - <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> - <location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location> </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.19)</regname> @@ -50,12 +43,6 @@ <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location> </application> - <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.7.4</version> - <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode…</location> - </application> <application name="Putty"> <regname>PuTTY version 0.60</regname> <licence>MIT</licence> @@ -70,18 +57,6 @@ <version>2.6.4</version> <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> - </application> - <application name="OpenOffice 2.4"> - <regname>OpenOffice.org 2.4.2</regname> - <version>2.4.2</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.plusline.de/OpenOffice/stable/2.4.2/OOo_2.4.2_Win32Intel_install…</location> - </application> - <application name="OpenOffice 3.0"> - <regname>OpenOffice.org 3.0.1</regname> - <version>3.0.1</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.0.1/OOo_3.0.1_Win32Intel_…</location> </application> </category> <category name="Graphics" icon="3"> @@ -109,77 +84,7 @@ <location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location> </application> </category> - <category name="Libraries" icon="4"> - <application name="Microsoft XML 3"> - <regname>msxml3</regname> - <version>3.0</version> - <description>MSXML3 is needed for some MSI Installers.</description> - <location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b1…</location> - </application> - <application name="OLE Viewer and Microsoft Foundation Classes version 4"> - <regname>mfc40</regname> - <version>4.0</version> - <description>MFC 4 is needed by some applications</description> - <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> - </application> - - <application name="Visual Basic 5 Runtime"> - <regname>vb5run</regname> - <version>5.0</version> - <description>Visual Basic 5 Runtime</description> - <location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm…</location> - </application> - - <application name="Visual Basic 6 Runtime"> - <regname>vb6run</regname> - <version>6.0</version> - <description>Visual Basic 6 Runtime</description> - <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> - </application> - - <application name="Visual Studio 6 Runtime"> - <regname>vc6run</regname> - <version>6.0</version> - <description>Visual Studio 6 Runtime</description> - <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> - </application> - - <application name="Visual Studio 2005 Runtime"> - <regname>vc2005run</regname> - <version>7.0</version> - <description>Visual Studio 2005 Runtime</description> - <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> - </application> - - <application name="Visual Studio 2005 Runtime SP1"> - <regname>vc2005sp1run</regname> - <version>7.1</version> - <description>Visual Studio 2005 Runtime SP1</description> - <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> - </application> - - <application name="Visual Studio 2008 Runtime"> - <regname>vc2008run</regname> - <version>8.0</version> - <description>Visual Studio 2008 Runtime</description> - <location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5…</location> - </application> - </category> - <category name="Multimedia" icon="4"> - </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> - </application> - <application name="MinGW"> - <regname>MinGW 5.1.3</regname> - <version>5.1.3</version> - <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> - </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname> <version>0.18.4b</version> @@ -212,23 +117,11 @@ <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location> </application> - <application name="LBreakout2"> - <regname>LBreakout2 2.4.1</regname> - <version>2.4.1</version> - <description>Breakout Clone using SDL libs.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location> - </application> <application name="LGeneral"> <regname>LGeneral 1.1</regname> <version>1.1</version> <description>Panzer General Clone using SDL libs.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> - </application> - <application name="LMarbles"> - <regname>LMarbles 1.0.6</regname> - <version>1.0.6</version> - <description>Atomix Clone using SDL libs.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> </application> <application name="WinBoard"> <regname>WinBoard 4.2.7b</regname> @@ -237,12 +130,6 @@ <description>WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess.</description> <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location> </application> - </category> - <category name="Science" icon="11"> - </category> - <category name="Edutainment" icon="12"> - </category> - <category name="Engineering" icon="13"> </category> <category name="Tools" icon="7"> <application name="7-Zip"> @@ -256,19 +143,6 @@ <version>1.8</version> <description>Small and fast BitTorrent Client</description> <location>http://download.utorrent.com/1.8.2/utorrent-1.8.2.upx.exe</location> - </application> - <application name="Audio Grabber"> - <regname>Audiograbber 1.83 SE</regname> - <version>1.83 SE</version> - <description>A very good CD Ripper/Audio File Converter.</description> - <location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location> - </application> - </category> - <category name="Drivers" icon="8"> - <application name="AC97 Driver for VirtualBox"> - <version>5.10.00.3610</version> - <description>Unzip in the "ReactOS" folder then restart ReactOS twice.</description> - <location>http://svn.reactos.org/packages/ac97_vbox.exe</location> </application> </category> <category name="Others" icon="8">

1 0

[cfinck] 40700: Merge 40679-40681
by cfinck＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cfinck Date: Sat Apr 25 22:29:01 2009 New Revision: 40700 URL: http://svn.reactos.org/svn/reactos?rev=40700&view=rev Log: Merge 40679-40681 Modified: branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Sat Apr 25 22:29:01 2009 @@ -1,12 +1,5 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> - <application name="Firefox 1.5"> - <regname>Mozilla Firefox (1.5)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.12</version> - <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location> - </application> <application name="Firefox 2.0"> <regname>Mozilla Firefox (2.0.0.20)</regname> <licence>MPL/GPL/LGPL</licence> @@ -14,6 +7,13 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32…</location> </application> + <application name="Firefox 3.0"> + <regname>Mozilla Firefox (3.0.9)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>3.0.9</version> + <description>The most popular and one of the best free Web Browsers out there.</description> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en…</location> + </application> <application name="Opera"> <regname>Opera</regname> <licence>Freeware</licence> @@ -29,16 +29,10 @@ <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w…</location> </application> <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.14)</regname> - <version>1.1.14</version> + <regname>SeaMonkey (1.1.16)</regname> + <version>1.1.16</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14/seamo…</location> - </application> - <application name="Mozilla ActiveX Control"> - <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> - <version>1.7.12</version> - <description>Essential Component to get ReactOS Explorer's and other applications' Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + <location>http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-…</location> </application> <application name="Off By One Browser"> <regname>The Off By One Web Browser</regname>

1 0

[dgorbachev] 40699: Simplified Chinese translations by Jingjing Fu (jingjingf AT 188.com). Bug #4417
by dgorbachev＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: dgorbachev Date: Sat Apr 25 22:07:48 2009 New Revision: 40699 URL: http://svn.reactos.org/svn/reactos?rev=40699&view=rev Log: Simplified Chinese translations by Jingjing Fu (jingjingf AT 188.com). Bug #4417 Added: trunk/reactos/dll/cpl/appwiz-new/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc Added: trunk/reactos/dll/cpl/appwiz-new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/zh… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/zh-CN.rc [iso-8859-1] Sat Apr 25 22:07:48 2009 @@ -1,0 +1,206 @@ +/* + * Simplified Chinese resource for appwiz-new (dll/cpl/appwiz-new/lang/zh-CN.rc) + * + * TRANSLATOR: Jingjing Fu (jingjingf AT 188.com) + * CREATED: 2009-04-25 + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "É¾³ý(&R)", ID_APP_REMOVE + MENUITEM "ÐÞ¸Ä(&M)", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÍøÂç°²×°" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "°²×°(&I)...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "ReactOS¿ÉÒÔ×Ô¶¯°²×°ÏÂÁÐÈí¼þ¡£Òª°²×°Ä³¸ö³ÌÐò£¬ÇëÔÚÁÐ±íÖÐÑ¡¶¨¸Ã³ÌÐò£¬È»ºóµ¥»÷¡°°²×°¡±°´Å¥(&T)", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÐÂ½¨¿ì½Ý·½Ê½" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "´ËÏòµ¼°ïÖúÄú´´½¨±¾µØ»òÍøÂç³ÌÐò¡¢ÎÄ¼þ¡¢Ä¿Â¼¡¢¼ÆËã»ú»òInternetµØÖ·µÄ¿ì½Ý·½Ê½¡£", -1, 97, 7, 195, 28 + LTEXT "ÊäÈëÏîÄ¿Î»ÖÃ(&T)£º", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "ä¯ÀÀ(&R)...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø¡£", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñ¡Ôñ³ÌÐòÎÄ¼þ¼Ð" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÇëÑ¡Ôñ´æ·Å¸Ã¿ì½Ý·½Ê½µÄÎÄ¼þ¼Ð(&S):", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "ÐÂ½¨ÎÄ¼þ¼Ð(&F)...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñ¡Ôñ³ÌÐò±êÌâ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¼üÈë¸Ã¿ì½Ý·½Ê½µÄÃû³Æ(&T):", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "µ¥»÷¡°Íê³É¡±´´½¨¿ì½Ý·½Ê½¡£", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñ¡ÔñÍ¼±ê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñ¡Ôñ¿ì½Ý·½Ê½µÄÍ¼±ê(&S):", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "´ÓÈíÅÌ»ò¹âÅÌ°²×°³ÌÐò" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÔËÐÐ°²×°³ÌÐò" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "´ò¿ª(&O)£º", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "ä¯ÀÀ(&R)...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "¸ü¸ÄÓÃ»§Ñ¡Ïî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Äú¿ÉÒÔÑ¡ÔñÊÇ·ñÈÃËùÓÐÈË¶¼¿ÉÒÔÊ¹ÓÃ¸Ã³ÌÐò¡£", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Install", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Execute", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "¹ÜÀíÔ±°²×°Íê±Ï" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "µ¥»÷¡°Íê³É¡±½« ini Ó³Éä»ØÀ´¡£", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "°²×°Ö®ºó" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Çë°´¡°ÏÂÒ»²½¡±¡£", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÔËÐÐ°²×°³ÌÐò" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÇëÖ¸¶¨Ð¶ÔØ³ÌÐòµÄÎ»ÖÃ", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "Ð¶ÔØ³ÌÐòÃüÁîÐÐ(&C):", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "ä¯ÀÀ(&R)...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "È·¶¨", IDOK, 118, 100, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "¾¯¸æ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "ÓÐÆäËûÓÃ»§µÇÂ¼µ½´Ë¼ÆËã»ú¡£", -1, 37, 8, 214, 10 + LTEXT "Èç¹ûÄúÔÚÆäËûÓÃ»§»¹ÔÚÔËÐÐ´Ë³ÌÐòÊ±Ð¶ÔØËü£¬´Ë³ÌÐò¿ÉÄÜ²»ÄÜÍêÈ«Ð¶ÔØ¡£", -1, 37, 23, 212, 22 + LTEXT "ÒªÕýÈ·µØ¸ü¸Ä»òÉ¾³ý´Ë³ÌÐò£¬ÔÚ¼ÌÐøÇ°ÇëÇÐ»»µ½²¢×¢ÏúÃ¿¸öÓÃ»§¡£", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "ÇÐ»»ÓÃ»§(&S)", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "¼ÌÐø(&C)", IDOK, 125, 81, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "É¾³ý¿ì½Ý·½Ê½/ÎÄ¼þ¼Ð" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÒªÉ¾³ý¡¸¿ªÊ¼¡¹²Ëµ¥ÖÐµÄÏîÄ¿£¬ÇëÑ¡¶¨¸ÃÏîÄ¿È»ºóµ¥»÷¡°É¾³ý¡±°´Å¥(&T)", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "É¾³ý(&R)", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "¹Ø±Õ", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÒÔºóÌí¼Ó" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Äú¿ÉÒÔÑ¡ÔñÏë½«¸Ã³ÌÐòÌí¼Óµ½¼ÆËã»úÉÏµÄÈÕÆÚºÍÊ±¼ä¡£ÀýÈç£¬Äú¿ÉÒÔ°²ÅÅÔÚÀë¿ª¼ÆËã»úÊ±Ö´ÐÐ¸Ã²Ù×÷¡£", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "ÒÔºóÌí¼Ó³ÌÐò (&A)", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "²»Ìí¼Ó³ÌÐò(&D)", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "È·¶¨", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "È¡Ïû", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ìí¼Ó»òÉ¾³ý³ÌÐò" + IDS_CPLSYSTEMDESCRIPTION "°²×°»òÉ¾³ý³ÌÐò¼°ReactOS×é¼þ" + IDS_UNABLEOPEN_UNINSTKEY "ÎÞ·¨´ò¿ªÐ¶ÔØ¼ü" + IDS_LIST_TITLE "ÁÐ±í" + IDS_SIZE_TITLE "´óÐ¡ (MB)" + IDS_LAST_USED "×îºóÊ¹ÓÃ" + IDS_PROGANDUPDATES "³ÌÐòºÍ¸üÐÂ" + IDS_PROGRAMS_ONLY "½ö³ÌÐò" + IDS_UPDATES_ONLY "½ö¸üÐÂ" + IDS_WELCOME_TITLE "»¶ÓÊ¹ÓÃÌí¼ÓÉ¾³ý³ÌÐòÖúÊÖ" + IDS_WELCOME_MSG "Çë´Ó×ó±ßÀ¸Ñ¡Ôñ¹¦ÄÜÏî»òÔÚÁÐ±íÖÐÑ¡ÔñÐèÒªÉ¾³ý»ò²é¿´ÐÅÏ¢µÄ³ÌÐò¡£" + IDS_SEARCH_TEXT "ÔÚÁÐ±íÖÐ²éÕÒ..." + IDS_REMOVE_BTN "É¾³ý(&R)" + IDS_MODIFY_BTN "¸ü¸Ä(&M)" + IDS_UNABLEREAD_UNINSTSTR "ÎÞ·¨¶ÁÈ¡Ð¶ÔØ×Ö·û´®¡£´ËÏîÄ¿ÎÞÐ§»òÓÉMSI Installer½¨Á¢¡£" + IDS_INF_REG_OWNER "×¢²áËùÓÐÈË£º" + IDS_INF_PRODUCT_ID "²úÆ·ID£º" + IDS_INF_PUBLISHER "·¢ÐÐÉÌ£º" + IDS_INF_VERSION "°æ±¾£º" + IDS_INF_CONTACT "ÁªÏµÈË£º" + IDS_INF_SUP_INFO "Ö§³ÖÐÅÏ¢£º" + IDS_INF_SUP_PHONE "Ö§³Öµç»°£º" + IDS_INF_PRODUCT_UPD "²úÆ·¸üÐÂ£º" + IDS_INF_README "×ÔÊöÎÄ¼þ£º" + IDS_INF_COMMENTS "±¸×¢£º" + IDS_NO_INFORMATION "ÎÞ¹ØÓÚ´Ë³ÌÐòµÄÐÅÏ¢¡£" +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc [iso-8859-1] Sat Apr 25 22:07:48 2009 @@ -12,3 +12,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" Added: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] Sat Apr 25 22:07:48 2009 @@ -1,0 +1,176 @@ +/* + * Simplified Chinese resource for appwiz (dll/cpl/appwiz/lang/zh-CN.rc) + * + * TRANSLATOR: Jingjing Fu (jingjingf AT 188.com) + * CREATED: 2009-04-25 + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "¸ü¸Ä/É¾³ý(&R)",ID_APP_MODIFYREMOVE + MENUITEM "ÐÅÏ¢(&I)", ID_APP_INFORMATION + END +END + +IDR_POPUP_UPD MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "É¾³ý(&R)", ID_UPD_REMOVE + MENUITEM "ÐÅÏ¢(&I)", ID_UPD_INFORMATION + END +END + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¸ü¸Ä»òÉ¾³ý³ÌÐò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,6,16,16 + LTEXT "ÏÂÁÐ³ÌÐò¿ÉÒÔ±»×Ô¶¯É¾³ý¡£´ÓÏÂÃæµÄÁÐ±íÖÐÑ¡ÖÐ³ÌÐò²¢µã»÷¡°Ìí¼Ó/É¾³ý¡±°´Å¥ÒÔÉ¾³ý¸Ã³ÌÐò»òÐÞ¸ÄÆä×é¼þ¡£",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "²éÕÒ£º",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "ÊÓÍ¼£º",-1,250,33,30,8 + COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "¸ü¸Ä/É¾³ý(&R)", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "ÐÅÏ¢(&I)", IDC_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEUPDATES DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "É¾³ý¸üÐÂ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 + LTEXT "ÏÂÁÐ¸üÐÂ¿ÉÒÔ±»×Ô¶¯É¾³ý¡£´ÓÏÂÃæµÄÁÐ±íÖÐÑ¡ÖÐ¸üÐÂ²¢µã»÷¡°É¾³ý¡±°´Å¥ÒÔÉ¾³ý¸Ã¸üÐÂ¡£",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "²éÕÒ£º",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "ÊÓÍ¼£º",-1,250,33,30,8 + COMBOBOX IDC_UPD_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_UPDATESLIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "É¾³ý(&R)", IDC_UPD_REMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "ÐÅÏ¢(&I)", IDC_UPD_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEADD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ìí¼ÓÐÂ³ÌÐò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,10,32,32 + LTEXT "µã»÷¡°°²×°¡±°´Å¥ÒÔÌí¼ÓÐÂ³ÌÐò¡£",-1,36,11,PROPSHEETWIDTH-48,8 + PUSHBUTTON "°²×°(&I)...", IDC_INSTALL, PROPSHEETWIDTH-(90), 46, 80, 14 + LTEXT "", -1, PROPSHEETPADDING, 70, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_DOWNLOADICO,-1,PROPSHEETPADDING,80,32,32 + LTEXT "µã»÷¡°ÏÂÔØ¡±°´Å¥ÒÔÏÂÔØ²¢°²×°ÐÂ³ÌÐò¡£",-1,36,83,PROPSHEETWIDTH-48,17 + PUSHBUTTON "ÏÂÔØ£¡(&D)", IDC_ADD_DOWNLOAD_BUTTON, PROPSHEETWIDTH-(90), 125, 80, 14, WS_DISABLED + LTEXT "", -1, PROPSHEETPADDING, 150, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_APPINETICO,-1,PROPSHEETPADDING,160,32,32 + LTEXT "µã»÷¡°²éÕÒInternet¡±ÒÔÍ¨¹ýInternetÁ¬½Ó²éÕÒ¿ÉÓÃ³ÌÐò¡£",-1,36,161,PROPSHEETWIDTH-48,17 + PUSHBUTTON "ÊôÐÔ(&P)...", IDC_ADD_PROP_BUTTON, PROPSHEETWIDTH-(175), 205, 80, 14, WS_DISABLED + PUSHBUTTON "²éÕÒInternet", IDC_ADD_FIND_BUTTON, PROPSHEETWIDTH-(90), 205, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ReactOS ÉèÖÃ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_REACTOS,-1,PROPSHEETPADDING,6,16,16 + LTEXT "",-1,36,7,PROPSHEETWIDTH-48,22 +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÂ½¨Á¬½Ó" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÂ½¨Á¬½Ó" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÂ½¨¿ì½Ý·½Ê½" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "´ËÏòµ¼°ïÖúÄú´´½¨±¾µØ»òÍøÂç³ÌÐò¡¢ÎÄ¼þ¡¢Ä¿Â¼¡¢¼ÆËã»ú»òInternetµØÖ·µÄ¿ì½Ý·½Ê½¡£", -1, 120, 15, 200, 30 + LTEXT "ÊäÈëÏîÄ¿Î»ÖÃ£º", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "ä¯ÀÀ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø¡£", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñ¡Ôñ³ÌÐò±êÌâ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÊäÈë¿ì½Ý·½Ê½Ãû³Æ(&T)£º", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "µã»÷¡°Íê³É¡±´´½¨¿ì½Ý·½Ê½", -1, 118, 97, 178, 17 +END + +IDD_INFORMATION DIALOGEX 5, 100, 269, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÐÅÏ¢" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDS_INFO_DISPNAME, PROPSHEETPADDING, 6, 258, 15, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "×¢²áËùÓÐÈË£º", -1, PROPSHEETPADDING, 27, 97, 8 + EDITTEXT IDS_INFO_REGOWNER, PROPSHEETPADDING+97, 25, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "²úÆ·ID£º", -1, PROPSHEETPADDING, 44, 97, 8 + EDITTEXT IDS_INFO_PRODUCTID, PROPSHEETPADDING+97, 42, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "·¢ÐÐÉÌ£º", -1, PROPSHEETPADDING, 61, 97, 8 + EDITTEXT IDS_INFO_PUBLISHER, PROPSHEETPADDING+97, 59, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "°æ±¾£º", -1, PROPSHEETPADDING, 78, 97, 8 + EDITTEXT IDS_INFO_VERSION, PROPSHEETPADDING+97, 76, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÁªÏµÈË£º", -1, PROPSHEETPADDING, 95, 97, 8 + EDITTEXT IDS_INFO_CONTACT, PROPSHEETPADDING+97, 93, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ö§³ÖÐÅÏ¢£º", -1, PROPSHEETPADDING, 112, 97, 8 + EDITTEXT IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+97, 110, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ö§³Öµç»°£º", -1, PROPSHEETPADDING, 129, 97, 8 + EDITTEXT IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+97, 127, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "²úÆ·¸üÐÂ£º", -1, PROPSHEETPADDING, 146, 97, 8 + EDITTEXT IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+97, 144, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "×ÔÊöÎÄ¼þ£º", -1, PROPSHEETPADDING, 163, 97, 8 + EDITTEXT IDS_INFO_README, PROPSHEETPADDING+97, 161, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "±¸×¢£º", -1, PROPSHEETPADDING, 180, 97, 8 + EDITTEXT IDS_INFO_COMMENTS, PROPSHEETPADDING+97, 178, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL, 212, 198, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ìí¼Ó/É¾³ý³ÌÐò" + IDS_CPLSYSTEMDESCRIPTION "ÉèÖÃ³ÌÐòºÍ¿ì½Ý·½Ê½" + IDS_ERROR "´íÎó" + IDS_UNABLEREAD_UNINSTSTR "ÎÞ·¨¶ÁÈ¡Ð¶ÔØ×Ö·û´®¡£´ËÏîÄ¿ÎÞÐ§»òÓÉMSI Installer½¨Á¢¡£" + IDS_UNABLEOPEN_UNINSTKEY "ÎÞ·¨´ò¿ªÐ¶ÔØ¼ü" + IDS_APPLIST "ÒÑ°²×°³ÌÐò" + IDS_UPDATESLIST "ÒÑ°²×°¸üÐÂ" + IDS_LARGEICONS "´óÍ¼±ê" + IDS_LIST "ÁÐ±í" + IDS_DETAILS "ÏêÏ¸" + IDS_CREATE_SHORTCUT "½¨Á¢¿ì½Ý·½Ê½" + IDS_ERROR_NOT_FOUND "ÕÒ²»µ½ÎÄ¼þ %s" + IDS_UNABLEREAD_INFORMATION "ÎÞ·¨´ò¿ªÐÅÏ¢¼ü" + IDS_NO_INFORMATION "ÎÞÐÅÏ¢" + IDS_NONE_APP "ÎÞÒÑ°²×°³ÌÐò¡£" + IDS_NONE_UPD "ÎÞÒÑ°²×°¸üÐÂ¡£" +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] Sat Apr 25 22:07:48 2009 @@ -14,6 +14,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" - - - +#include "lang/zh-CN.rc"

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
48
Older →

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