Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 41290: Netshell: update Dutch translation. Oscar van Egmond (oscar_04*AT*live*DOT*nl), bug #4582.
by dgorbachev＠svn.reactos.org 05 Jun '09

05 Jun '09

Author: dgorbachev Date: Fri Jun 5 19:20:04 2009 New Revision: 41290 URL: http://svn.reactos.org/svn/reactos?rev=41290&view=rev Log: Netshell: update Dutch translation. Oscar van Egmond (oscar_04*AT*live*DOT*nl), bug #4582. Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Fri Jun 5 19:20:04 2009 @@ -1,4 +1,4 @@ -// vertaald door Lionel Lowie +// vertaald door Lionel Lowie, Oscar van Egmond LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -15,15 +15,15 @@ PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Beschrijving", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Beschrijving gaat hier...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Toon Pictogram in taskbar wanneer verbonden", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Breng me op de hoogte wanneer deze verbinding geen of beperkte connectiviteit heeft", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Allgemein" +CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN END @@ -56,11 +56,11 @@ CAPTION "Support" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX - LTEXT "Address type:", -1, 22, 20, 80, 8 - LTEXT "IP address:", -1, 22, 34, 80, 8 + GROUPBOX "Verbinding Status", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Adres type:", -1, 22, 20, 80, 8 + LTEXT "IP adres:", -1, 22, 34, 80, 8 LTEXT "SubNet mask:", -1, 22, 48, 80, 8 - LTEXT "Default gateway:", -1, 22, 62, 80, 8 + LTEXT "Standaard gateway:", -1, 22, 62, 80, 8 RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 @@ -72,57 +72,57 @@ IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Netwerk Verbinding Details" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "Netwerk Verbinding &Details:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" + IDS_PHYSICAL_ADDRESS "Fysieke Adres" + IDS_IP_ADDRESS "IP Adres" IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" + IDS_DEF_GATEWAY "Standaard Gateway" IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" + IDS_LEASE_OBTAINED "Lease Verkregen" + IDS_LEASE_EXPIRES "Lease Verloopt" IDS_DNS_SERVERS "DNS Servers" IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" - IDS_NETWORKCONNECTION "Network Connection" - IDS_SHV_COLUMN_NAME "Name" + IDS_PROPERTY "Eigenschap" + IDS_VALUE "Waarde" + IDS_NETWORKCONNECTION "Netwerk Verbinding" + IDS_SHV_COLUMN_NAME "Naam" IDS_SHV_COLUMN_TYPE "Type" IDS_SHV_COLUMN_STATE "Status" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" - IDS_STATUS_NON_OPERATIONAL "Disabled" - IDS_STATUS_UNREACHABLE "Not Connected" - IDS_STATUS_DISCONNECTED "Network cable unplugged" - IDS_STATUS_CONNECTING "Acquiring network address" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_SHV_COLUMN_DEVNAME "Apparaat Naam" + IDS_SHV_COLUMN_PHONE "Telefoon # of Host Adres" + IDS_SHV_COLUMN_OWNER "Eigenaar" + IDS_TYPE_ETHERNET "LAN of Hoge snelheid Internet" + IDS_STATUS_NON_OPERATIONAL "Uitgeschakeld" + IDS_STATUS_UNREACHABLE "Niet Verbonden" + IDS_STATUS_DISCONNECTED "Netwerk kabel afgesloten" + IDS_STATUS_CONNECTING "Netwerkadres verwerven" + IDS_STATUS_CONNECTED "Verbonden" + IDS_STATUS_OPERATIONAL "Verbonden" - IDS_NET_ACTIVATE "Enable" - IDS_NET_DEACTIVATE "Disable" + IDS_NET_ACTIVATE "Schakel in" + IDS_NET_DEACTIVATE "Schakel uit" IDS_NET_STATUS "Status" - IDS_NET_REPAIR "Repair" - IDS_NET_CREATELINK "Create Shortcut" - IDS_NET_DELETE "Delete" - IDS_NET_RENAME "Rename" - IDS_NET_PROPERTIES "Properties" + IDS_NET_REPAIR "Repareren" + IDS_NET_CREATELINK "Maak snelkoppeling" + IDS_NET_DELETE "Verwijderen" + IDS_NET_RENAME "Hernoemen" + IDS_NET_PROPERTIES "Eigenschappen" IDS_FORMAT_BIT "%u Bit/s" IDS_FORMAT_KBIT "%u KBit/s" IDS_FORMAT_MBIT "%u MBit/s" IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" - IDS_ASSIGNED_DHCP "Assigned by DHCP" - IDS_ASSIGNED_MANUAL "Manually configured" -END + IDS_DURATION_DAY "%d Dag %s" + IDS_DURATION_DAYS "%d Dagen %s" + IDS_ASSIGNED_DHCP "Toegekend door DHCP" + IDS_ASSIGNED_MANUAL "Handmatig geconfigureerd" +END

1 0

[cgutman] 41289: - Revert r41287
by cgutman＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: cgutman Date: Fri Jun 5 00:11:01 2009 New Revision: 41289 URL: http://svn.reactos.org/svn/reactos?rev=41289&view=rev Log: - Revert r41287 Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Jun 5 00:11:01 2009 @@ -322,10 +322,10 @@ Adapter->NdisMiniportBlock.SystemAdapterObject = AdapterObject; - if(AvailableMapRegisters < MapRegistersPerBaseRegister * BaseMapRegistersNeeded) + if(AvailableMapRegisters < MapRegistersPerBaseRegister) { NDIS_DbgPrint(MIN_TRACE, ("Didn't get enough map registers from hal - requested 0x%x, got 0x%x\n", - MapRegistersPerBaseRegister * BaseMapRegistersNeeded, AvailableMapRegisters)); + MapRegistersPerBaseRegister, AvailableMapRegisters)); AdapterObject->DmaOperations->PutDmaAdapter(AdapterObject); Adapter->NdisMiniportBlock.SystemAdapterObject = NULL;

1 0

[dgorbachev] 41288: Sync French translation with English original.
by dgorbachev＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: dgorbachev Date: Thu Jun 4 22:10:18 2009 New Revision: 41288 URL: http://svn.reactos.org/svn/reactos?rev=41288&view=rev Log: Sync French translation with English original. Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Thu Jun 4 22:10:18 2009 @@ -1,21 +1,22 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Se connecter en utilisant :", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&Configurer", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Les composants cochés sont utilisés par cette connexion :", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&Installer", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Désinstaller", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Afficher l'icône dans la barre des tâches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Se connecter en utilisant :", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY + PUSHBUTTON "&Configurer", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Les composants cochés sont utilisés par cette connexion :", -1, 9, 59, 217, 8 + PUSHBUTTON "&Installer", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Désinstaller", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Afficher l'icône dans la barre des tâches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 @@ -26,26 +27,26 @@ END IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Connexion", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "État :", -1, 19, 20, 60, 8 - LTEXT "Durée :", -1, 19, 34, 60, 8 - LTEXT "Vitesse :", -1, 19, 48, 60, 8 - GROUPBOX "Activité", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Envoyés", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 - LTEXT "Reçus", -1, 149, 90, 37, 8 - LTEXT "Octets :", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Désactiver", IDC_ENDISABLE, 66, 150, 50, 14 - RTEXT "",IDC_STATUS,83,20,98,8 - RTEXT "",IDC_DURATION,83,34,98,8 - RTEXT "",IDC_SPEED,83,48,98,8 + GROUPBOX "Connexion", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "État :", -1, 19, 20, 60, 8 + LTEXT "Durée :", -1, 19, 34, 60, 8 + LTEXT "Vitesse :", -1, 19, 48, 60, 8 + GROUPBOX "Activité", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Envoyés", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Reçus", -1, 149, 90, 37, 8 + LTEXT "Octets :", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propriétés", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Désactiver", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 @@ -53,18 +54,18 @@ CAPTION "Support" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Statut de la connexion", -1, 9, 8, 200, 88, BS_GROUPBOX - LTEXT "Type d'adresse :", -1, 22, 20, 80, 8 - LTEXT "Adresse IP :", -1, 22, 34, 80, 8 - LTEXT "Masque de sous-réseau :", -1, 22, 48, 80, 8 - LTEXT "Passerelle par défaut :", -1, 22, 62, 80, 8 + GROUPBOX "Statut de la connexion", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Type d'adresse :", -1, 22, 20, 80, 8 + LTEXT "Adresse IP :", -1, 22, 34, 80, 8 + LTEXT "Masque de sous-réseau :", -1, 22, 48, 80, 8 + LTEXT "Passerelle par défaut :", -1, 22, 62, 80, 8 - RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14 END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 @@ -72,53 +73,54 @@ CAPTION "Détails de connexion réseau" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Détails de connexion réseau :", -1, 15, 9, 170, 12 - CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "Fermer", IDC_CLOSE, 125, 165, 62, 14 + LTEXT "&Détails de connexion réseau :", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "Fermer", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Adresse physique" - IDS_IP_ADDRESS "Adresse IP" - IDS_SUBNET_MASK "Masque de sous-réseau" - IDS_DEF_GATEWAY "Passerelle par défaut" - IDS_DHCP_SERVER "Serveur DHCP" - IDS_LEASE_OBTAINED "Bail obtenu" - IDS_LEASE_EXPIRES "Bail expirant" - IDS_DNS_SERVERS "Serveur DNS" - IDS_WINS_SERVERS "Serveur WINS" - IDS_PROPERTY "Propriété" - IDS_VALUE "Valeur" - IDS_NETWORKCONNECTION "Connexion réseau" - IDS_SHV_COLUMN_NAME "Nom" - IDS_SHV_COLUMN_TYPE "Type" - IDS_SHV_COLUMN_STATE "État" - IDS_SHV_COLUMN_DEVNAME "Nom du périphérique" - IDS_SHV_COLUMN_PHONE "N° de téléphone ou adresse d'hôte" - IDS_SHV_COLUMN_OWNER "Propriétaire" - IDS_TYPE_ETHERNET "Réseau local ou Internet à haut débit" - IDS_STATUS_NON_OPERATIONAL "Désactivé" - IDS_STATUS_UNREACHABLE "Déconnecté" - IDS_STATUS_DISCONNECTED "Câble réseau débranché" - IDS_STATUS_CONNECTING "Acquisition de l'adresse réseau" - IDS_STATUS_CONNECTED "Connecté" - IDS_STATUS_OPERATIONAL "Connecté" + IDS_PHYSICAL_ADDRESS "Adresse physique" + IDS_IP_ADDRESS "Adresse IP" + IDS_SUBNET_MASK "Masque de sous-réseau" + IDS_DEF_GATEWAY "Passerelle par défaut" + IDS_DHCP_SERVER "Serveur DHCP" + IDS_LEASE_OBTAINED "Bail obtenu" + IDS_LEASE_EXPIRES "Bail expirant" + IDS_DNS_SERVERS "Serveur DNS" + IDS_WINS_SERVERS "Serveur WINS" + IDS_PROPERTY "Propriété" + IDS_VALUE "Valeur" + IDS_NETWORKCONNECTION "Connexion réseau" + IDS_SHV_COLUMN_NAME "Nom" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "État" + IDS_SHV_COLUMN_DEVNAME "Nom du périphérique" + IDS_SHV_COLUMN_PHONE "N° de téléphone ou adresse d'hôte" + IDS_SHV_COLUMN_OWNER "Propriétaire" + IDS_TYPE_ETHERNET "Réseau local ou Internet à haut débit" + IDS_STATUS_NON_OPERATIONAL "Désactivé" + IDS_STATUS_UNREACHABLE "Déconnecté" + IDS_STATUS_DISCONNECTED "Câble réseau débranché" + IDS_STATUS_CONNECTING "Acquisition de l'adresse réseau" + IDS_STATUS_CONNECTED "Connecté" + IDS_STATUS_OPERATIONAL "Connecté" - IDS_NET_ACTIVATE "Activer" - IDS_NET_DEACTIVATE "Désactiver" - IDS_NET_STATUS "État" - IDS_NET_REPAIR "Réparer" - IDS_NET_CREATELINK "Créer un raccourci" - IDS_NET_DELETE "Supprimer" - IDS_NET_PROPERTIES "Propriétés" + IDS_NET_ACTIVATE "Activer" + IDS_NET_DEACTIVATE "Désactiver" + IDS_NET_STATUS "État" + IDS_NET_REPAIR "Réparer" + IDS_NET_CREATELINK "Créer un raccourci" + IDS_NET_DELETE "Supprimer" + IDS_NET_RENAME "Rename" + IDS_NET_PROPERTIES "Propriétés" - IDS_FORMAT_BIT "%u Bit/s" - IDS_FORMAT_KBIT "%u KBit/s" - IDS_FORMAT_MBIT "%u MBit/s" - IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Jour %s" - IDS_DURATION_DAYS "%d Jours %s" - IDS_ASSIGNED_DHCP "Assignée par DHCP" - IDS_ASSIGNED_MANUAL "Configurée manuellement" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" + IDS_DURATION_DAY "%d Jour %s" + IDS_DURATION_DAYS "%d Jours %s" + IDS_ASSIGNED_DHCP "Assignée par DHCP" + IDS_ASSIGNED_MANUAL "Configurée manuellement" END

1 0

[cgutman] 41287: - Fix the map register count check
by cgutman＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: cgutman Date: Thu Jun 4 22:00:17 2009 New Revision: 41287 URL: http://svn.reactos.org/svn/reactos?rev=41287&view=rev Log: - Fix the map register count check Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Thu Jun 4 22:00:17 2009 @@ -322,10 +322,10 @@ Adapter->NdisMiniportBlock.SystemAdapterObject = AdapterObject; - if(AvailableMapRegisters < MapRegistersPerBaseRegister) + if(AvailableMapRegisters < MapRegistersPerBaseRegister * BaseMapRegistersNeeded) { NDIS_DbgPrint(MIN_TRACE, ("Didn't get enough map registers from hal - requested 0x%x, got 0x%x\n", - MapRegistersPerBaseRegister, AvailableMapRegisters)); + MapRegistersPerBaseRegister * BaseMapRegistersNeeded, AvailableMapRegisters)); AdapterObject->DmaOperations->PutDmaAdapter(AdapterObject); Adapter->NdisMiniportBlock.SystemAdapterObject = NULL;

1 0

[gedmurphy] 41286: Only grow the input text box in resize
by gedmurphy＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: gedmurphy Date: Thu Jun 4 20:05:48 2009 New Revision: 41286 URL: http://svn.reactos.org/svn/reactos?rev=41286&view=rev Log: Only grow the input text box in resize Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Thu Jun 4 20:05:48 2009 @@ -133,6 +133,7 @@ // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.splitContainer2.Location = new System.Drawing.Point(0, 0); this.splitContainer2.Name = "splitContainer2"; // Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Thu Jun 4 20:05:48 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.60")] -[assembly: AssemblyFileVersion("1.0.2.60")] +[assembly: AssemblyVersion("1.0.2.61")] +[assembly: AssemblyFileVersion("1.0.2.61")]

1 0

[janderwald] 41285: - Revert 40694 as FIELD_OFFSET is perfectly working code and the new one might not work on some compilers - Add informal debug traces for bug 4354
by janderwald＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: janderwald Date: Thu Jun 4 18:16:57 2009 New Revision: 41285 URL: http://svn.reactos.org/svn/reactos?rev=41285&view=rev Log: - Revert 40694 as FIELD_OFFSET is perfectly working code and the new one might not work on some compilers - Add informal debug traces for bug 4354 Modified: trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Thu Jun 4 18:16:57 2009 @@ -340,11 +340,9 @@ /* Save the resource list */ ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; - ResourceListSize = sizeof(CM_RESOURCE_LIST); - - if (ResourceCount > 1) - ResourceListSize += (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - + ResourceListSize = + FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. + PartialDescriptors[ResourceCount]); DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); if (DeviceExtension->AllocatedResources == NULL) { @@ -360,6 +358,9 @@ FullList < AllocatedResources->List + AllocatedResources->Count; FullList++) { + INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", + FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); + /* FIXME: Is this ASSERT ok for resources from the PNP manager? */ ASSERT(FullList->InterfaceType == PCIBus && FullList->BusNumber == DeviceExtension->SystemIoBusNumber && Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Thu Jun 4 18:16:57 2009 @@ -520,6 +520,9 @@ FullList < AllocatedResources->List + AllocatedResources->Count; FullList++) { + INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", + FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); + ASSERT(FullList->InterfaceType == PCIBus && FullList->BusNumber == DeviceExtension->SystemIoBusNumber && 1 == FullList->PartialResourceList.Version &&

1 0

[dgorbachev] 41284: Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581.
by dgorbachev＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: dgorbachev Date: Thu Jun 4 17:54:27 2009 New Revision: 41284 URL: http://svn.reactos.org/svn/reactos?rev=41284&view=rev Log: Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Thu Jun 4 17:54:27 2009 @@ -546,56 +546,8 @@ ULONG Columns, ULONG Rows) { - INT10_BIOS_ARGUMENTS BiosRegisters; - PVBE_DEVICE_EXTENSION VBEDeviceExtension = - (PVBE_DEVICE_EXTENSION)DeviceExtension; - - if (!VBEResetDevice(DeviceExtension, NULL)) - return FALSE; - - /* Change number of columns/rows */ - VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); - - if (Columns == 80 && Rows == 25) - { - /* Default text size, don't change anything. */ - return TRUE; - } - else if (Columns == 80 && Rows == 28) - { - /* Use 9x14 font (80x28) */ - BiosRegisters.Eax = 0x1111; - } - else if (Columns == 80 && Rows == 43) - { - /* Use 8x8 font in 350 scans mode (80x43) */ - BiosRegisters.Eax = 0x1201; - BiosRegisters.Ebx = 0x30; - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - BiosRegisters.Eax = 0x3; - BiosRegisters.Ebx = 0; - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - BiosRegisters.Eax = 0x1112; - } - else if (Columns == 80 && Rows == 50) - { - /* Use 8x8 font (80x50) */ - BiosRegisters.Eax = 0x1112; - } - else - return FALSE; - - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - return TRUE; + /* Return FALSE to let HAL reset the display with INT10 */ + return FALSE; } /* Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4128… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Jun 4 17:54:27 2009 @@ -1138,13 +1138,11 @@ #endif /* Display the BSOD */ - KeLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before KiDisplayBlueScreen(MessageId, IsHardError, HardErrCaption, HardErrMessage, AnsiName); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger))

1 0

[gedmurphy] 41283: Display the kdb prompt correctly
by gedmurphy＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: gedmurphy Date: Thu Jun 4 17:38:29 2009 New Revision: 41283 URL: http://svn.reactos.org/svn/reactos?rev=41283&view=rev Log: Display the kdb prompt correctly Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu Jun 4 17:38:29 2009 @@ -26,6 +26,7 @@ PrintDocument printDoc; DebugConnection mConnection; List<string> textToAdd = new List<string>(); + string kdbPrompt = "\r\nkdb:> "; @@ -54,9 +55,17 @@ lock (textToAdd) { foreach (string s in textToAdd) - toAdd.Append(s); + { + if (s.EndsWith(kdbPrompt)) + { + toAdd.Append(s.Remove(s.Length - kdbPrompt.Length)); + } + else + { + toAdd.Append(s); + } + } textToAdd.Clear(); - //TODO: skip backspace signs } RawTrafficText.AppendText(toAdd.ToString()); } @@ -93,7 +102,7 @@ { if (RawTrafficTextBox.Text.Length > 0) { - //AddCommandToList(RawTrafficTextBox.Text); + RawTrafficText.AppendText(kdbPrompt); mConnection.Debugger.Write(RawTrafficTextBox.Text); } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Thu Jun 4 17:38:29 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.59")] -[assembly: AssemblyFileVersion("1.0.2.59")] +[assembly: AssemblyVersion("1.0.2.60")] +[assembly: AssemblyFileVersion("1.0.2.60")]

1 0

[fireball] 41282: - Add ReactOS Device Detection Tool - RosDDT. It's a command line tool for checking PC's hardware configuration for compatibility with ReactOS, and for reporting working hardware configurations to ReactOS hardware compatibility database. The tool is able of autoupdating its hardware compatibility database. * Web part is stubbed for now (hw.php) and needs to be developed. * Actual hardware database file (rosddt.ini) has only sample information. * Readme file is in Russian langua
by fireball＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: fireball Date: Thu Jun 4 16:38:30 2009 New Revision: 41282 URL: http://svn.reactos.org/svn/reactos?rev=41282&view=rev Log: - Add ReactOS Device Detection Tool - RosDDT. It's a command line tool for checking PC's hardware configuration for compatibility with ReactOS, and for reporting working hardware configurations to ReactOS hardware compatibility database. The tool is able of autoupdating its hardware compatibility database. * Web part is stubbed for now (hw.php) and needs to be developed. * Actual hardware database file (rosddt.ini) has only sample information. * Readme file is in Russian language, however running rosddt.exe without parameters provides a built-in English usage help. Added: trunk/rosapps/applications/sysutils/rosddt/ (with props) trunk/rosapps/applications/sysutils/rosddt/http.c (with props) trunk/rosapps/applications/sysutils/rosddt/http.h (with props) trunk/rosapps/applications/sysutils/rosddt/hw.php trunk/rosapps/applications/sysutils/rosddt/readme.txt (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.c (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.ini (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.rc (with props) Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jun 4 16:38:30 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rosapps/applications/sysutils/rosddt/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/http.c (added) +++ trunk/rosapps/applications/sysutils/rosddt/http.c [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,131 @@ +#include <windows.h> +#include <wininet.h> +#include <urlmon.h> +#include <stdio.h> +#include "http.h" + +#define INTERNET_FLAGS (INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_UI | INTERNET_FLAG_NO_COOKIES ) + +static char *http_receive(HINTERNET h_req, u_long *d_size) +{ + u_long bytes = sizeof(u_long); + u_long qsize = 0; + u_long readed = 0; + char *data = NULL; + char buff[4096]; + + if (HttpQueryInfo(h_req, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &qsize, &bytes, NULL) != 0) { + data = malloc(qsize + 1); + } + + do + { + if (InternetReadFile(h_req, buff, sizeof(buff), &bytes) == 0) { + break; + } + if ( (readed + bytes) > qsize) { + data = realloc(data, readed + bytes + 1); + if (data == NULL) break; + qsize += bytes; + } + memcpy(data + readed, buff, bytes); readed += bytes; + } while (bytes != 0); + + if ( (data != NULL) && (readed != qsize) ) { + free(data); data = NULL; + } else { + if (d_size != NULL) *d_size = readed; + data[readed] = 0; + } + return data; +} + +void *http_get(wchar_t *url, u_long *d_size) +{ + HINTERNET h_inet = NULL; + HINTERNET h_req = NULL; + char *replay = NULL; + + do + { + h_inet = InternetOpen(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + if (h_inet == NULL) break; + + h_req = InternetOpenUrl(h_inet, url, NULL, 0, INTERNET_FLAGS, 0); + if (h_req == NULL) break; + + replay = http_receive(h_req, d_size); + } while (0); + + if (h_req != NULL) { + InternetCloseHandle(h_req); + } + if (h_inet != NULL) { + InternetCloseHandle(h_inet); + } + return replay; +} + +void *http_post(wchar_t *url, void *data, int size, u_long *d_size) +{ + URL_COMPONENTS url_cm = {0}; + HINTERNET h_inet = NULL; + HINTERNET h_conn = NULL; + HINTERNET h_req = NULL; + char *q_data = NULL; + char *replay = NULL; + wchar_t host[MAX_PATH]; + wchar_t path[MAX_PATH]; + unsigned char *p, *d = data; + + do + { + if ( (q_data = malloc(size * 3 + 10)) == NULL ) { + break; + } + strcpy(q_data, "data="); p = q_data + 5; + + while (size--) { + p += sprintf(p, "%%%0.2x", (u_long)*d++); + } + + url_cm.dwStructSize = sizeof(url_cm); + url_cm.lpszHostName = host; + url_cm.dwHostNameLength = sizeof(host); + url_cm.lpszUrlPath = path; + url_cm.dwUrlPathLength = sizeof(path); + + if (InternetCrackUrl(url, 0, 0, &url_cm) == 0) { + break; + } + + h_inet = InternetOpen(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + if (h_inet == NULL) break; + + h_conn = InternetConnect(h_inet, host, url_cm.nPort, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + if (h_conn == NULL) break; + + h_req = HttpOpenRequest(h_conn, L"POST", path, NULL, NULL, NULL, INTERNET_FLAGS, 0); + if (h_req == NULL) break; + + HttpAddRequestHeaders( + h_req, L"Content-Type: application/x-www-form-urlencoded", 47*2, HTTP_ADDREQ_FLAG_ADD); + + if (HttpSendRequest(h_req, NULL, 0, q_data, strlen(q_data)) == 0) { + break; + } + replay = http_receive(h_req, d_size); + } while (0); + + if (h_req != NULL) { + InternetCloseHandle(h_req); + } + if (h_conn != NULL) { + InternetCloseHandle(h_conn); + } + if (h_inet != NULL) { + InternetCloseHandle(h_inet); + } + if (q_data != NULL) free(q_data); + return replay; +} Propchange: trunk/rosapps/applications/sysutils/rosddt/http.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/http.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/http.h (added) +++ trunk/rosapps/applications/sysutils/rosddt/http.h [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,7 @@ +#ifndef _HTTP_H_ +#define _HTTP_H_ + +void *http_get(wchar_t *url, u_long *d_size); +void *http_post(wchar_t *url, void *data, int size, u_long *d_size); + +#endif Propchange: trunk/rosapps/applications/sysutils/rosddt/http.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/hw.php URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/hw.php (added) +++ trunk/rosapps/applications/sysutils/rosddt/hw.php [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,10 @@ +<?php +$file = fopen ("hw.txt", "a"); +if (!$file) { + echo "<p>Unable to open file for writing.\n"; + exit; +} +fputs ($file, $_POST['data']. "\n"); +fclose ($file); +echo "_ok_"; +?> Added: trunk/rosapps/applications/sysutils/rosddt/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/readme.txt (added) +++ trunk/rosapps/applications/sysutils/rosddt/readme.txt [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,17 @@ +=========== rosddt - ReactOS device detection tool =========== + +Èñïîëüçîâàíèå: +rosddt -enum - âûâåñòè ñïèñîê âñåãî óñòàíîâëåííîãî æåëåçà +rosddt -check - ïðîâåðèòü ñîâìåñòèìîñòü ReactOS ñ âàøåé ñèñòåìîé +rosddt -update - îáíîâèòü áàçó ñîâìåñòèìîñòè äî ïîñëåäíåé âåðñèè +rosddt -report - îòïðàâèòü îò÷åò îá àïïàðàòíîé êîíôèãóðàöèè ðàçðàáîò÷èêàì ReactOS. Ýòà èíôîðìàöèÿ áóäåò èñïîëüçîâàíà äëÿ âåäåíèÿ ñòàòèñòèêè è ïîääåðæêè áàçû ñîâìåñòèìîñòè. + +=== ôîðìàò ôàéëà rosddt.ini === +Ñåêöèÿ "URL" ñîäåðæèò äâå ññûëêè: udpate - ññûëêà íà rosddt.ini, èñïîëüçóåòñÿ ïðè îáíîâëåíèè, report - ññûëêà íà ñêðèïò ïðèíèìàþùèé îò÷åòû. Âñ¸ ñîäåðæèìîå îò÷åòà ïåðåäà¸òñÿ â ïîëå "data" POST çàïðîñà â êîäèðîâêå UTF-8. Ïðèìåð ïðè¸ìà îò÷åòîâ ñìîòðèòå â hw.php. + +Ñåêöèÿ "HW" ñîäåðæèò áàçó ñîâìåñòèìîñòè ReactOS ñ æåëåçîì. Êàæäîå çàíåñ¸ííîå â áàçó óñòðîéñòâî ìîæåò èìåòü òðè ñòàòóñà ñîâìåñòèìîñòè: ok - óñòðîéñòâî ðàáîòàåò â ReactOS, notwork - óñòðîéñòâî íå ðàáîòàåò â ReactOS è crash - ReactOS íå çàïóñêàåòñÿ íà ñèñòåìå ñ ýòèì óñòðîéñòâîì. +Óñòðîéñòâà ìîãóò îáîçíà÷àòüñÿ ñëåäóþùèìè ñïîñîáàìè: +1 - Ïî ïîëíîìó ÷èòàåìîìó èìåíè óñòðîéñòâà. Íàïðèìåð "Intel(R) 82371AB/EB PCI Bus Master IDE Controller". +2 - Ïî ïîëíîìó PNP ID óñòðîéñòâà. Íàïðèìåð "PCI\VEN_8086&DEV_1237&SUBSYS_00000000&REV_02". +3 - Äëÿ PCI óñòðîéñòâ ìîæíî óêàçûâàòü òàêæå ñîêðàùåííûå ñîêðàùåííûå pnp id, òàêèå êàê "PCI\VEN_8086&DEV_1237" èëè "PCI\VEN_8086&DEV_1237&REV_02". Ðåêîìåíäóåòñÿ ïîëüçîâàòüñÿ èìåííî òàêîé ôîðìîé çàïèñè, ïîñêîëüêó ïîëíûé id ïðèâÿçàí ê íîìåðó pci ñëîòà â êîòîðûé âñòàâëåíî óñòðîéñòâî. Ðåâèçèþ óêàçûâàòü ïî íåîáõîäèìîñòè, ëó÷øå îáîéòèñü áåç íå¸. +4 - Äëÿ USB óñòðîéñòâ ìîæíî ïîëüçîâàòüñÿ ñîêðàùåííîé ôîðìîé çàïèñè. Íàïðèìåð "USB\ROOT_HUB&VID8086&PID3A34&REV0000" ìîæíî çàïèñàòü êàê "USB\VID8086&PID3A34" èëè "USB\VID8086&PID3A34&REV0000" Propchange: trunk/rosapps/applications/sysutils/rosddt/readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.c (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.c [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,263 @@ +#include <stdio.h> +#include <windows.h> +#include <setupapi.h> +#include "http.h" + +#define ST_NEUTRAL 0 +#define ST_ROS_CRASH 1 +#define ST_DEV_NOTWORK 2 +#define ST_DEV_OK 3 +#define ST_ERROR 4 +#define ST_LAST_STATUS ST_ERROR + +static int is_show_hw; +static int is_check_hw; +static wchar_t gl_ini_file[MAX_PATH]; +static wchar_t *gl_report; + +static int hw_check_ini(wchar_t *name) +{ + wchar_t buff[MAX_PATH]; + + if (GetPrivateProfileString(L"HW", name, NULL, buff, MAX_PATH, gl_ini_file) == 0) { + return ST_NEUTRAL; + } + if (_wcsicmp(buff, L"ok") == 0) return ST_DEV_OK; + if (_wcsicmp(buff, L"notwork") == 0) return ST_DEV_NOTWORK; + if (_wcsicmp(buff, L"crash") == 0) return ST_ROS_CRASH; + return ST_NEUTRAL; +} + +static int hw_check_base(wchar_t *hw_id, wchar_t *hw_name) +{ + wchar_t buff[MAX_PATH], *p; + int status; + + if ( (status = hw_check_ini(hw_id)) != ST_NEUTRAL ) { + return status; + } + if ( (status = hw_check_ini(hw_name)) != ST_NEUTRAL ) { + return status; + } + + if (wcsncmp(hw_id, L"PCI\\VEN_", 8) == 0) + { + wcsncpy(buff, hw_id, 21); buff[21] = 0; + + if ( (status = hw_check_ini(buff)) != ST_NEUTRAL ) { + return status; + } + + if (p = wcsstr(hw_id, L"&REV_")) { + wcscat(buff, p); status = hw_check_ini(buff); + } + } else if ( (wcsncmp(hw_id, L"USB\\", 4) == 0) && (p = wcsstr(hw_id, L"&VID")) ) + { + wsprintf(buff, L"USB\\%s", p+1); + + if ( (status = hw_check_ini(buff)) != ST_NEUTRAL ) { + return status; + } + + if (p = wcsstr(buff, L"&REV")) { + *p = 0; status = hw_check_ini(buff); + } + } + return status; +} + +static void trim(wchar_t *s) +{ + wchar_t *p; + for (p = s + wcslen(s) - 1; (p > s) && (*p == L' '); *p-- = 0); +} + +static int hw_check_device(HDEVINFO h_info, SP_DEVINFO_DATA *d_inf) +{ + wchar_t *hw_id = NULL; + wchar_t *hw_name = NULL; + u_long type, bytes; + int status; + char name[MAX_PATH]; + wchar_t w_name[MAX_PATH]; + + do + { + if ( (hw_id = malloc(4096)) == NULL ) { + status = ST_ERROR; break; + } + if ( (hw_name = malloc(4096)) == NULL ) { + status = ST_ERROR; break; + } + hw_id[0] = 0, hw_name[0] = 0; + + SetupDiGetDeviceRegistryProperty(h_info, d_inf, SPDRP_HARDWAREID, &type, (void*)hw_id, 4096, &bytes); + SetupDiGetDeviceRegistryProperty(h_info, d_inf, SPDRP_DEVICEDESC, &type, (void*)hw_name, 4096, &bytes); + + if (hw_id[0] == 0 || hw_name[0] == 0) { + status = ST_NEUTRAL; break; + } + /* trim strings */ + trim(hw_id); trim(hw_name); + + if ( (wcschr(hw_id, L'\\') == NULL) || (_wcsnicmp(hw_id, L"ROOT\\", 5) == 0) || + (_wcsicmp(hw_id, L"STORAGE\\Volume") == 0) || (_wcsicmp(hw_id, L"UMB\\UMBUS") == 0) || + (_wcsnicmp(hw_id, L"SW\\", 3) == 0) ) + { + status = ST_NEUTRAL; break; + } + + if (is_show_hw != 0) { + CharToOem(hw_name, name); + wprintf(L"%s - [%S]\n", hw_id, name); + } + + if (gl_report != NULL) { + wsprintf(w_name, L"%s - [%s]\n", hw_id, hw_name); + wcscat(gl_report, w_name); + } + + if (is_check_hw != 0) + { + status = hw_check_base(hw_id, hw_name); + + if (status == ST_DEV_NOTWORK) { + CharToOem(hw_name, name); + wprintf(L"Device \"%S\" does not work in ReactOS\n", name); + } + if (status == ST_ROS_CRASH) { + CharToOem(hw_name, name); + wprintf(L"ReactOS does not work with device \"%S\"\n", name); + } + } else { + status = ST_NEUTRAL; + } + } while (0); + + if (hw_id != NULL) free(hw_id); + if (hw_name != NULL) free(hw_name); + + return status; +} + +static void do_update_base() +{ + wchar_t up_url[MAX_PATH]; + void *data; + u_long size; + FILE *f; + + if (GetPrivateProfileString(L"URL", L"udpate", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { + wprintf(L"Update URL not found in rosddt.ini\n"); return; + } + + wprintf(L"Downloading new rosddt.ini...\n"); + + if (data = http_get(up_url, &size)) + { + if (f = _wfopen(gl_ini_file, L"wb")) { + fwrite(data, 1, size, f); + fclose(f); + wprintf(L"Update completed\n"); + } else { + wprintf(L"Can not open rosddt.ini for writing\n"); + } + free(data); + } else { + wprintf(L"Error, rosddt.ini can not be loaded\n"); + } +} + +static void do_send_report(wchar_t *report) +{ + wchar_t up_url[MAX_PATH]; + int utf_sz; + char *utf, *p; + + if (GetPrivateProfileString(L"URL", L"report", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { + wprintf(L"Report URL not found in rosddt.ini\n"); return; + } + + utf_sz = WideCharToMultiByte(CP_UTF8, 0, report, -1, NULL, 0, NULL, NULL); + utf = malloc(utf_sz); + utf_sz = WideCharToMultiByte(CP_UTF8, 0, report, -1, utf, utf_sz, NULL, NULL); + + wprintf(L"Sending report...\n"); + + if (p = http_post(up_url, utf, utf_sz-1, NULL)) { + wprintf(L"%S\n", p); free(p); + } else { + wprintf(L"Report can not be sended, connection error\n"); + } +} + +int wmain(int argc, wchar_t *argv[]) +{ + HDEVINFO h_info; + SP_DEVINFO_DATA d_inf; + int codes[ST_LAST_STATUS + 1] = {0}; + int i; + wchar_t *p; + + if (argc != 2) + { + wprintf( + L"rosddt [parameters]\n" + L" -enum enumerate all installed hardware\n" + L" -check check hardware compatibility with ReactOS\n" + L" -update update hardware compatibility database\n" + L" -report send your hardware configuration to ReactOS team\n" + ); + return 0; + } + + /* get path to ini file */ + GetModuleFileName(NULL, gl_ini_file, MAX_PATH); + for (p = gl_ini_file + wcslen(gl_ini_file); *p != L'\\'; *p-- = 0); + wcscat(gl_ini_file, L"rosddt.ini"); + + if (_wcsicmp(argv[1], L"-update") == 0) { + do_update_base(); return 0; + } + if (_wcsicmp(argv[1], L"-enum") == 0) { + is_show_hw = 1; is_check_hw = 0; + } + if (_wcsicmp(argv[1], L"-check") == 0) { + is_show_hw = 0; is_check_hw = 1; + } + if (_wcsicmp(argv[1], L"-report") == 0) { + is_show_hw = 0; is_check_hw = 0; + gl_report = malloc(65536); gl_report[0] = 0; + } + + h_info = SetupDiGetClassDevs(NULL, 0, 0, DIGCF_PRESENT | DIGCF_ALLCLASSES); + + if (h_info == INVALID_HANDLE_VALUE) { + wprintf(L"SetupDiGetClassDevs error\n"); return 1; + } + + d_inf.cbSize = sizeof(d_inf); i = 0; + + while (SetupDiEnumDeviceInfo(h_info, i++, &d_inf) != 0) { + codes[hw_check_device(h_info, &d_inf)]++; + } + + if (is_check_hw != 0) + { + wprintf( + L"Checking completed.\nFound %d supported devices, %d unsupported devices and %d incompatible devices\n", + codes[ST_DEV_OK], codes[ST_DEV_NOTWORK], codes[ST_ROS_CRASH]); + + if (codes[ST_ROS_CRASH] == 0) { + wprintf(L"ReactOS can be installed on your computer\n"); + } else { + wprintf(L"ReactOS can not be installed on your computer\n"); + } + } + + if (gl_report != NULL) { + do_send_report(gl_report); + } + + return 0; +} Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.ini URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.ini (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.ini [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,8 @@ +[URL] +udpate = http://iso.reactos.org/_tools/rosddt.ini +report = http://iso.reactos.org/_tools/hw.php + +[HW] +PCI\VEN_8086&DEV_7000&SUBSYS_00000000&REV_00 = ok +ACPI Fixed Feature Button = notwork +Intel(R) 82371AB/EB PCI Bus Master IDE Controller = crash Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,11 @@ +<module name="rosddt" type="win32cui" installbase="system32" installname="rosddt.exe" unicode="yes" allowwarnings="true"> + + <library>setupapi</library> + <library>wininet</library> + <library>kernel32</library> + <library>user32</library> + + <file>http.c</file> + <file>rosddt.c</file> + <file>rosddt.rc</file> +</module> Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.rc (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.rc [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Detection Tool\0" +#define REACTOS_STR_INTERNAL_NAME "rosddt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rosddt.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "2009, ReactOS Development Team\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -40,6 +40,10 @@ <xi:include href="regexpl/regexpl.rbuild" /> </directory> + <directory name="rosddt"> + <xi:include href="rosddt/rosddt.rbuild" /> + </directory> + <directory name="screenshot"> <xi:include href="screenshot/screenshot.rbuild" /> </directory>

1 0

[gedmurphy] 41281: - Early stages of improving the console to make behave more like windbg... - Add a separate command line for entering commands - Keep a list of previous commands and traverse through them with up/down keys - Clean the command line with esc
by gedmurphy＠svn.reactos.org 04 Jun '09

04 Jun '09

Author: gedmurphy Date: Thu Jun 4 16:35:12 2009 New Revision: 41281 URL: http://svn.reactos.org/svn/reactos?rev=41281&view=rev Log: - Early stages of improving the console to make behave more like windbg... - Add a separate command line for entering commands - Keep a list of previous commands and traverse through them with up/down keys - Clean the command line with esc Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -229,7 +229,7 @@ /* only forward a complete line */ wCommand += str; - if (str[str.Length-1] == '\r') + if (str[str.Length-1] == '\r') //FIXME: remove this { cmdList.Add(wCommand); wCommand = null; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -30,13 +30,22 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawTraffic)); this.RawTrafficText = new System.Windows.Forms.TextBox(); - this.InputLabel = new System.Windows.Forms.Label(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.label1 = new System.Windows.Forms.Label(); + this.RawTrafficTextBox = new System.Windows.Forms.TextBox(); this.menuStrip1.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); this.SuspendLayout(); // // RawTrafficText @@ -48,19 +57,12 @@ this.RawTrafficText.Multiline = true; this.RawTrafficText.Name = "RawTrafficText"; this.RawTrafficText.ReadOnly = true; - this.RawTrafficText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.RawTrafficText.Size = new System.Drawing.Size(397, 253); + this.RawTrafficText.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.RawTrafficText.Size = new System.Drawing.Size(425, 268); this.RawTrafficText.TabIndex = 0; + this.RawTrafficText.WordWrap = false; this.RawTrafficText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.RawTrafficText_KeyPress); this.RawTrafficText.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RawTrafficText_MouseUp); - // - // InputLabel - // - this.InputLabel.AutoSize = true; - this.InputLabel.Location = new System.Drawing.Point(91, 236); - this.InputLabel.Name = "InputLabel"; - this.InputLabel.Size = new System.Drawing.Size(0, 13); - this.InputLabel.TabIndex = 1; // // menuStrip1 // @@ -107,15 +109,73 @@ this.selectAllToolStripMenuItem.Text = "&Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.RawTrafficText); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); + this.splitContainer1.Size = new System.Drawing.Size(425, 294); + this.splitContainer1.SplitterDistance = 268; + this.splitContainer1.SplitterWidth = 1; + this.splitContainer1.TabIndex = 5; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.label1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.RawTrafficTextBox); + this.splitContainer2.Size = new System.Drawing.Size(425, 25); + this.splitContainer2.SplitterDistance = 39; + this.splitContainer2.SplitterWidth = 1; + this.splitContainer2.TabIndex = 0; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(2, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(34, 13); + this.label1.TabIndex = 0; + this.label1.Text = "kdb:>"; + // + // RawTrafficTextBox + // + this.RawTrafficTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.RawTrafficTextBox.Location = new System.Drawing.Point(0, 0); + this.RawTrafficTextBox.Name = "RawTrafficTextBox"; + this.RawTrafficTextBox.Size = new System.Drawing.Size(385, 20); + this.RawTrafficTextBox.TabIndex = 0; + this.RawTrafficTextBox.Tag = "0"; + this.RawTrafficTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.RawTrafficTextBox_KeyUp); + // // RawTraffic // this.AllowEndUserDocking = false; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(397, 253); + this.ClientSize = new System.Drawing.Size(425, 294); + this.Controls.Add(this.splitContainer1); this.Controls.Add(this.menuStrip1); - this.Controls.Add(this.InputLabel); - this.Controls.Add(this.RawTrafficText); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.HideOnClose = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -123,6 +183,15 @@ this.Text = "Console"; this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + this.splitContainer2.Panel2.PerformLayout(); + this.splitContainer2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -131,11 +200,14 @@ #endregion private System.Windows.Forms.TextBox RawTrafficText; - private System.Windows.Forms.Label InputLabel; private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.TextBox RawTrafficTextBox; + private System.Windows.Forms.Label label1; } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -20,11 +20,22 @@ private int totalPages; private int pageNumber; private string strPrintText; + private List<string> prevCommand; + private int maxCommands = 10; PrintDialog pd; PrintDocument printDoc; - DebugConnection mConnection; List<string> textToAdd = new List<string>(); + + + + public RawTraffic() + { + InitializeComponent(); + + prevCommand = new List<string>(maxCommands); + RawTrafficTextBox.Tag = 0; + } protected override void OnLoad(EventArgs e) { @@ -48,11 +59,8 @@ //TODO: skip backspace signs } RawTrafficText.AppendText(toAdd.ToString()); - InputLabel.Location = RawTrafficText.GetPositionFromCharIndex(RawTrafficText.Text.Length -1); - InputLabel.Top += 2; - InputLabel.Left += 2; - } - + } + void DebugRawTrafficEvent(object sender, DebugRawTrafficEventArgs args) { lock (textToAdd) @@ -62,57 +70,36 @@ Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "UpdateText")); } - public RawTraffic() - { - InitializeComponent(); - InputLabel.Location = new Point(2, 2); - } - - private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) - { - if ((mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) && (!mConnection.Running)) - { - switch ((int)e.KeyChar) + private void AddCommandToList(string cmd) + { + if (prevCommand.Count == maxCommands) + { + for (int i = 0; i < prevCommand.Count; i++) { - case 8: /* Backspace */ - if (InputLabel.Text.Length > 0) - InputLabel.Text = InputLabel.Text.Substring(0, InputLabel.Text.Length - 1); - break; - case 13: /* Return */ - if (InputLabel.Text.ToLower().CompareTo("cont") == 0) - mConnection.Running = true; - InputLabel.Text = ""; - break; - default: - InputLabel.Text += e.KeyChar; - break; + if (i < prevCommand.Count - 1) + prevCommand[i] = prevCommand[i + 1]; } - mConnection.Debugger.Write("" + e.KeyChar); - } - } - - private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) - { - copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); - } - - private void copyToolStripMenuItem_Click(object sender, EventArgs e) - { - if (RawTrafficText.SelectionLength != 0) - Clipboard.SetText(RawTrafficText.SelectedText); - } - - private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) - { - RawTrafficText.SelectAll(); - } - - private void editToolStripMenuItem_Click(object sender, EventArgs e) - { - selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); - } - + prevCommand.RemoveAt(prevCommand.Count - 1); + } + + prevCommand.Add(cmd); + + RawTrafficTextBox.Tag = prevCommand.Count; + } + + + private void SendCommandToDebugger() + { + if (RawTrafficTextBox.Text.Length > 0) + { + //AddCommandToList(RawTrafficTextBox.Text); + mConnection.Debugger.Write(RawTrafficTextBox.Text); + } + } + + + #region override methods public override bool IsCmdEnabled(Commands Cmd) { switch (Cmd) @@ -171,71 +158,154 @@ printDoc.Print(); } } + #endregion + + #region events + private void RawTrafficTextBox_KeyUp(object sender, KeyEventArgs e) + { + switch (e.KeyCode) + { + case Keys.Enter: + AddCommandToList(RawTrafficTextBox.Text); + RawTrafficTextBox.Text += '\r'; //FIXME: remove this + SendCommandToDebugger(); + RawTrafficTextBox.Text = string.Empty; + break; + + case Keys.Up: + case Keys.Down: + int prevCmd = (int)RawTrafficTextBox.Tag; + + if (e.KeyCode == Keys.Up) + prevCmd--; + else + prevCmd++; + + if (prevCmd >= 0 && prevCmd < prevCommand.Count) + { + RawTrafficTextBox.Text = prevCommand[prevCmd]; + RawTrafficTextBox.Tag = prevCmd; + RawTrafficTextBox.SelectionStart = RawTrafficTextBox.Text.Length; + } + break; + + case Keys.Escape: + RawTrafficTextBox.Text = string.Empty; + RawTrafficTextBox.Tag = prevCommand.Count; + break; + } + + } + + private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) + { + if ((mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) && (!mConnection.Running)) + { + switch ((int)e.KeyChar) + { + case 8: /* Backspace */ + if (RawTrafficTextBox.Text.Length > 0) + RawTrafficTextBox.Text = RawTrafficTextBox.Text.Substring(0, RawTrafficTextBox.Text.Length - 1); + break; + case 13: /* Return */ + if (RawTrafficTextBox.Text.ToLower().CompareTo("cont") == 0) + mConnection.Running = true; + RawTrafficTextBox.Text += e.KeyChar; + SendCommandToDebugger(); + break; + default: + RawTrafficTextBox.Text += e.KeyChar; + break; + } + } + } + + private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) + { + copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); + } + + private void copyToolStripMenuItem_Click(object sender, EventArgs e) + { + if (RawTrafficText.SelectionLength != 0) + Clipboard.SetText(RawTrafficText.SelectedText); + } + + private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) + { + RawTrafficText.SelectAll(); + } + + private void editToolStripMenuItem_Click(object sender, EventArgs e) + { + selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); + } private void printDoc_PrintPage(object sender, PrintPageEventArgs e) { - StringFormat stringFormat = new StringFormat(); - RectangleF rectFPaper, rectFText; - int intChars, intLines; - - rectFPaper = e.MarginBounds; - rectFText = RectangleF.Inflate(rectFPaper, 0, - -2 * RawTrafficText.Font.GetHeight(e.Graphics)); - int totalLines = (int)Math.Floor(rectFText.Height / - RawTrafficText.Font.GetHeight(e.Graphics)); - rectFText.Height = totalLines * - RawTrafficText.Font.GetHeight(e.Graphics); - stringFormat.Trimming = StringTrimming.Word; - - while ((pageNumber < startPage) && (strPrintText.Length > 0)) - { - e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, - rectFText.Size, stringFormat, - out intChars, out intLines); - strPrintText = strPrintText.Substring(intChars); - pageNumber++; - } - - // Cancel job when nothing to print is left - if (strPrintText.Length == 0) - { - e.Cancel = true; - return; - } - - e.Graphics.DrawString(strPrintText, RawTrafficText.Font, Brushes.Black, rectFText, stringFormat); + StringFormat stringFormat = new StringFormat(); + RectangleF rectFPaper, rectFText; + int intChars, intLines; + + rectFPaper = e.MarginBounds; + rectFText = RectangleF.Inflate(rectFPaper, 0, + -2 * RawTrafficText.Font.GetHeight(e.Graphics)); + int totalLines = (int)Math.Floor(rectFText.Height / + RawTrafficText.Font.GetHeight(e.Graphics)); + rectFText.Height = totalLines * + RawTrafficText.Font.GetHeight(e.Graphics); + stringFormat.Trimming = StringTrimming.Word; + + while ((pageNumber < startPage) && (strPrintText.Length > 0)) + { e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, - rectFText.Size, stringFormat, - out intChars, out intLines); + rectFText.Size, stringFormat, + out intChars, out intLines); strPrintText = strPrintText.Substring(intChars); - stringFormat = new StringFormat(); - - // show filename in header - stringFormat.Alignment = StringAlignment.Center; - - e.Graphics.DrawString(printDoc.DocumentName, RawTrafficText.Font, - Brushes.Black, rectFPaper, stringFormat); - - // show page number in footer - stringFormat.LineAlignment = StringAlignment.Far; - - e.Graphics.DrawString("Page " + pageNumber, RawTrafficText.Font, - Brushes.Black, rectFPaper, stringFormat); - pageNumber++; - e.HasMorePages = (strPrintText.Length > 0) && - (pageNumber < startPage + totalPages); - - //re-init - if (!e.HasMorePages) - { - strPrintText = RawTrafficText.Text; - startPage = 1; - totalPages = pd.PrinterSettings.MaximumPage; - pageNumber = 1; - } - - } + } + + // Cancel job when nothing to print is left + if (strPrintText.Length == 0) + { + e.Cancel = true; + return; + } + + e.Graphics.DrawString(strPrintText, RawTrafficText.Font, Brushes.Black, rectFText, stringFormat); + e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, + rectFText.Size, stringFormat, + out intChars, out intLines); + strPrintText = strPrintText.Substring(intChars); + stringFormat = new StringFormat(); + + // show filename in header + stringFormat.Alignment = StringAlignment.Center; + + e.Graphics.DrawString(printDoc.DocumentName, RawTrafficText.Font, + Brushes.Black, rectFPaper, stringFormat); + + // show page number in footer + stringFormat.LineAlignment = StringAlignment.Far; + + e.Graphics.DrawString("Page " + pageNumber, RawTrafficText.Font, + Brushes.Black, rectFPaper, stringFormat); + + pageNumber++; + e.HasMorePages = (strPrintText.Length > 0) && + (pageNumber < startPage + totalPages); + + //re-init + if (!e.HasMorePages) + { + strPrintText = RawTrafficText.Text; + startPage = 1; + totalPages = pd.PrinterSettings.MaximumPage; + pageNumber = 1; + } + + } + #endregion } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.56")] -[assembly: AssemblyFileVersion("1.0.2.56")] +[assembly: AssemblyVersion("1.0.2.59")] +[assembly: AssemblyFileVersion("1.0.2.59")]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs