Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[janderwald] 36690: - Add 2 more error constants

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 8 03:27:00 2008 New Revision: 36690 URL: http://svn.reactos.org/svn/reactos?rev=36690&view=rev Log: - Add 2 more error constants Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/netcfgx/resource.h Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -225,4 +225,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -225,5 +225,7 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -123,7 +123,7 @@ IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP-Adresse" +CAPTION "TCP/IP-Gateway" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 @@ -220,9 +220,10 @@ IDS_PROT_RANGE "Protokollnummern müssen größer als 0 und kleiner als 256 sein. Geben Sie eine Nummer in diesem Bereich ein." IDS_DUP_NUMBER "Die Nummer, die Sie hinzufügen möchten ist bereits in der Liste. Geben Sie eine andere Nummer ein." IDS_DISABLE_FILTER "Das Deaktivieren dieser globalen TCP/IP-Einstellung wird alle Adapter betreffen." - IDS_NO_SUFFIX "Die aktuelle Sucheinstellung der SUchmethode erfordert mindestens ein DNS-Suffix. Geben Sie ein Suffix ein, oder ändern Sie die Einstellung." + IDS_NO_SUFFIX "Die aktuelle Sucheinstellung der Suchmethode erfordert mindestens ein DNS-Suffix. Geben Sie ein Suffix ein, oder ändern Sie die Einstellung." IDS_DOMAIN_SUFFIX "Das Domänensuffix ist kein gültiges Süffix." IDS_DNS_SUFFIX "Der DNS-Domänensuffix ""%s"" ist kein gültiger DNS-Name." IDS_DUP_SUFFIX "Das DNS-Suffix ist bereits in der Liste vorhanden." - -END + IDS_DUP_IPADDR "Die IP-Adresse ist bereits in der Liste vorhanden." + IDS_DUP_GW "Der Standardgateway ist bereits in der Liste vorhanden." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,5 +224,7 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,5 +224,7 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,5 +224,7 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,5 +224,7 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,9 +224,11 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - - - - - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + + + + + Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,9 +224,11 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END - - - - - + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + + + + + Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -225,4 +225,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -224,4 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." -END + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END Modified: trunk/reactos/dll/win32/netcfgx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/resource… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] Wed Oct 8 03:27:00 2008 @@ -112,5 +112,7 @@ #define IDS_DOMAIN_SUFFIX 8023 #define IDS_DNS_SUFFIX 8024 #define IDS_DUP_SUFFIX 8025 +#define IDS_DUP_IPADDR 8026 +#define IDS_DUP_GW 8027 #endif

16 years, 2 months

[dreimer] 36689: Bug 3751: Polish translation update for netcfgx by Maciej Bialas

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Oct 7 19:49:51 2008 New Revision: 36689 URL: http://svn.reactos.org/svn/reactos?rev=36689&view=rev Log: Bug 3751: Polish translation update for netcfgx by Maciej Bialas Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] Tue Oct 7 19:49:51 2008 @@ -27,22 +27,22 @@ IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Alternate Configuration" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 - CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 +CAPTION "Konfiguracja alternatywna" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Jeli ten komputer jest u¿ywany w wiêcej ni¿ jednej sieci, wprowad poni¿ej alternatywne ustawienia protoko³u IP", -1, 9, 9, 220, 20 + CONTROL "Au&tomatyczny prywatny adres IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP address:", -1, 14, 75, 135, 8 + CONTROL "&Ustawienia konfigurowane przez u¿ytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + LTEXT "Adres &IP:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 - LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 + LTEXT "&Maska podsieci:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 - LTEXT "&Default gateway:", -1, 14, 115, 135, 8 + LTEXT "&Brama domylna:", -1, 14, 115, 135, 8 CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 - LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8 + LTEXT "&Preferowany serwer DNS:", -1, 14, 150, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 - LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8 + LTEXT "&Alternatywny serwer DNS:", -1, 14, 165, 180, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 END @@ -198,7 +198,7 @@ STRINGTABLE BEGIN - IDS_NET_CONNECT "Network connection" + IDS_NET_CONNECT "Po³¹czenie sieciowe" IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer."

16 years, 2 months

[dreimer] 36688: Forgot one file. Sorry.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Oct 7 19:39:50 2008 New Revision: 36688 URL: http://svn.reactos.org/svn/reactos?rev=36688&view=rev Log: Forgot one file. Sorry. Added: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc (with props) Added: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] Tue Oct 7 19:39:50 2008 @@ -1,0 +1,224 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Ïðèëîæåíèå çà ïðåãëåæäàíå íà ÐåàêòÕ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "Ïîìî&ù", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Ñëåäâàùà ñòðàíèöà", IDC_BUTTON_NEXT, 227, 261, 80, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Çàïèñ íà âñè÷êè ñâåäåíèÿ...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Èç&õîä", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Òîâà ñðåäñòâî äàâà ïîäðîáíè ñâåäåíèÿ çà ñúñòàâíèòå íà ÐåàêòÕ è çà âîäà÷èòå, ñëîæåíè â óðåäáàòà âè.", -1, 10, 10, 443, 17 + LTEXT "Àêî çíàåòå êîÿ îáëàñò ïðè÷èíÿâà ïðîáëåìà, íàòèñíåòå ïîäõîäÿùèÿ ïîäïðîçîðåö. Â ïðîòèâåí ñëó÷àé ìîæåòå äà ïîëçâàòå Ñëåäâàùà ñòðàíèöà, çà äà îáõîäèòå âñè÷êè ñòðàíèöè.", -1, 10, 30, 443, 25 + GROUPBOX "Ñâåäåíèÿ çà óðåäáàòà", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "Ñåãàøíè äàòà/âðåìå:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Èìå íà êîìïþòúðà:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Ðàáîòíà óðåäáà:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Åçèê:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Ïðîèçâîäèòåë íà óðåäáàòà:", -1, 40, 110, 110, 10, SS_RIGHT + LTEXT "Ìîäåë íà ñèñòåìàòà:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "ÁÈÎÑ:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Ïðîöåñîð:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Ïàìåò:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Îáìåíåí ôàéë:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "Âåðñèÿ íà ÐåàêòÕ:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óñòðîéñòâî", -1, 10, 10, 250, 100 + RTEXT "Èìå:", -1, 20, 25, 80, 10 + RTEXT "Ïðîèçâîäèòåë:", -1, 20, 35, 80, 10 + RTEXT "Âèä íà ÷èïà:", -1, 20, 45, 80, 10 + RTEXT "Âèä ÖÀÏ:", -1, 20, 55, 80, 10 + RTEXT "Îáùà ïàìåò îêîëî:", -1, 20, 65, 80, 10 + RTEXT "Ðåæèì íà åêðàíà:", -1, 20, 75, 80, 10 + RTEXT "Åêðàí:", -1, 20, 85, 80, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 105, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 105, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 105, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 105, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 105, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 105, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 105, 85, 150, 10 + + GROUPBOX "Âîäà÷ (äðàéâåð)", -1, 270, 10, 190, 100 + RTEXT "Îñíîâåí âîäà÷:", -1, 275, 25, 55, 10 + RTEXT "Èçäàíèå:", -1, 275, 35, 55, 10 + RTEXT "Äàòà:", -1, 275, 45, 55, 10 + RTEXT "Çíàê íà WHQL:", -1, 275, 55, 55, 10 + RTEXT "Ìèíè-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "Âåðñèÿ íà DDI:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "Âúçìîæíîñòè íà ÐåàêòÕ", -1, 10, 115, 450, 60 + RTEXT "Óñêîðåíèå íà DirectDraw:", -1, 15, 130, 110, 12 + RTEXT "Óñêîðåíèå íà Direct3D:", -1, 15, 145, 110, 12 + RTEXT "AGP óñêîðåíèå íà òúêàíèòå:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "Âêëþ÷âàíå", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Âêëþ÷âàíå", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Âêëþ÷âàíå", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Ïðîâåðêà íà DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 85, 14 + PUSHBUTTON "Ïðîâåðêà íà Direct3D", IDC_BUTTON_TEST3D, 250, 140, 85, 14, WS_DISABLED + + GROUPBOX "Áåëåæêè", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óñòðîéñòâî", -1, 10, 10, 250, 100 + RTEXT "Èìå:", -1, 15, 25, 95, 10 + RTEXT "ÎÇ íà óñòðîéñòâîòî:", -1, 15, 35, 95, 10 + RTEXT "ÎÇ íà ïðîèçâîäèòåëÿ:", -1, 15, 45, 95, 10 + RTEXT "ÎÓ íà ïðîèçâåäåíèåòî:", -1, 15, 55, 95, 10 + RTEXT "Âèä:", -1, 15, 65, 95, 10 + RTEXT "Ïîäðàçáèðàíî óñòðîéñòâî:", -1, 15, 75, 95, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 115, 25, 140, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 115, 35, 140, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 115, 45, 140, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 115, 55, 140, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 115, 65, 140, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 115, 75, 140, 10 + GROUPBOX "Âîäà÷ (äðàéâåð)", -1, 270, 10, 190, 100 + RTEXT "Èìå:", -1, 275, 25, 55, 10 + RTEXT "Èçäàíèå:", -1, 275, 35, 55, 10 + RTEXT "Äàòà:", -1, 275, 45, 55, 10 + RTEXT "Çíàê íà WHQL:", -1, 275, 55, 55, 10 + RTEXT "Äðóãè ôàéëîâå:", -1, 275, 65, 55, 10 + RTEXT "Äîñòàâ÷èê:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "Âúçìîæíîñòè íà ÐåàêòÕ", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Õàðäóåðåí çâóê\nÓñêîðåíèå:", -1, 20, 135, 90, 20 + PUSHBUTTON "Ïðîâåðêà íà DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 100, 14 + GROUPBOX "Áåëåæêè", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óñòðîéñòâà çà ïðÿê âõîä (DirectInput)", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 + GROUPBOX "Âõîäíè óñòðîéñòâà", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 + GROUPBOX "Ñâåäåíèÿ", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Âïèñàí äîñòàâ÷èê íà óñëóãàòà DirectPlay", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "Ïðåãëåæäàùî ñå÷èâî íà ÐåàêòÕ" + IDS_SYSTEM_DIALOG "Óðåäáà" + IDS_DISPLAY_DIALOG "Åêðàí" + IDS_SOUND_DIALOG "Çâóê" + IDS_MUSIC_DIALOG "Ìóçèêà" + IDS_INPUT_DIALOG "Âõîä" + IDS_NETWORK_DIALOG "Ìðåæà" + IDS_HELP_DIALOG "Ïîìîù" + IDS_FORMAT_MB "%I64uÌÁ ïàìåò" + IDS_FORMAT_SWAP "%I64u ÌÁ çàåòè, %I64u ÌÁ ñâîáîäíè" + IDS_FORMAT_UNIPROC "%s (%u ÖÏÓ)" + IDS_FORMAT_MPPROC "%s (%u ÖÏÓòà)" + IDS_VERSION_UNKNOWN "Íåèçâåñòíà âåðñèÿ" + IDS_DEVICE_STATUS_ATTACHED "Ñâúðçàí" + IDS_DEVICE_STATUS_MISSING "Ðàçêà÷åí" + IDS_DEVICE_STATUS_UNKNOWN "Íåèçâåñòíî" + IDS_DEVICE_NAME "Èìå íà óñòðîéñòâîòî" + IDS_DEVICE_STATUS "Ñúñòîÿíèå" + IDS_DEVICE_CONTROLLER "ÎÇ íà óïðàâëåíèåòî" + IDS_DEVICE_MANUFACTURER "ÎÇ íà ïðîèçâîäèòåëÿ" + IDS_DEVICE_PRODUCT "ÎÇ íà ïðîèçâåäåíèåòî" + IDS_DEVICE_FORCEFEEDBACK "Âîäà÷ çà ñèëîâà îáðàòíà âðúçêà" + IDS_NOT_APPLICABLE "Íåïðèëîæèìî" + IDS_OPTION_YES "Äà" + IDS_DIRECTPLAY_COL_NAME1 "Èìå" + IDS_DIRECTPLAY_COL_NAME2 "Ðåãèñòúð" + IDS_DIRECTPLAY_COL_NAME3 "Ôàéë" + IDS_DIRECTPLAY_COL_NAME4 "Èçäàíèå" + IDS_DIRECTPLAY8_MODEMSP "Äîñòàâ÷èê íà óñëóãàòà çà ìîäåì íà DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "Äîñòàâ÷èê íà ïîñëåäîâàòåëíàòà óñëóãàòà íà DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "Äîñòàâ÷èê íà IPX óñëóãàòà íà DirectPlay8" + IDS_DIRECTPLAY8_TCPSP "Äîñòàâ÷èê íà óñëóãàòà DirectPlay8-TCP/IP" + IDS_DIRECTPLAY_TCPCONN "Ñâúðçâàíå êúì èíòåðíåò ïî TCP/IP çà DirectPlay" + IDS_DIRECTPLAY_IPXCONN "IPX ñâúðçâàíå çà DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Ìîäåìíî ñâúðçâàíå çà DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Ïîñëåäîâàòåëíî ñâúðçâàíå çà DirectPlay" + IDS_REG_SUCCESS "Äîáðå" + IDS_REG_FAIL "Ãðåøêà" + IDS_DDTEST_ERROR "Ïðîâåðêàòà áå íåóñïåøíà!" + IDS_DDTEST_DESCRIPTION "Òîâà ùå ïóñíå èíòåðôåéñà çà èçïèòâàíå íà DirectDraw. Äà ïðîäúëæà ëè?" + IDS_DDPRIMARY_DESCRIPTION "Ùå áúäå èçïèòàí DirectDraw çà èçîáðàçÿâàíå íà ïúðâè÷íà ïîâúðõíîñò. Òðÿáâà äà áúäàò èçîáðàçåíè ÷åðíè è áåëè ïðàâîúãúëíèöè. Äà ïðîäúëæèì ëè?" + IDS_DDPRIMARY_RESULT "Âèäÿõòå ëè ÷åðíè è áåëè ïðàâîúãúëíèöè?" + IDS_DDOFFSCREEN_DESCRIPTION "Ùå áúäå èçïèòàí DirectDraw çà èçîáðàçÿâàíå â èçâúíåêðàíåí áóôåð. Òðÿáâà äà áúäå èçîáðàçåí äâèæåù ñå áÿë ïðàâîúãúëíèê. Äà ïðîäúëæèì ëè?" + IDS_DDOFFSCREEN_RESULT "Âèäÿõòå ëè áÿë äâèæåù ñå ïðàâîúãúëíèê?" + IDS_DDFULLSCREEN_DESCRIPTION "Ùå áúäå èçïèòàí DirectDraw çà èçîáðàçÿâàíå íà öÿë åêðàí. Òðÿáâà äà áúäå èçîáðàçåí äâèæåù ñå áÿë ïðàâîúãúëíèê. Äà ïðîäúëæèì ëè?" + IDS_DDFULLSCREEN_RESULT "Âèäÿõòå ëè áÿë äâèæåù ñå ïðàâîúãúëíèê â ðåæèì öÿë åêðàí?" + IDS_FORMAT_ADAPTER_MEM "%u ÌÁ" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u áèòà)(%uÕö)" + IDS_OPTION_NO "Íå" +END + + Propchange: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[janderwald] 36687: - Add missing dialogs of TCP/IP Notify Object

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Oct 7 19:27:35 2008 New Revision: 36687 URL: http://svn.reactos.org/svn/reactos?rev=36687&view=rev Log: - Add missing dialogs of TCP/IP Notify Object Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/netcfgx/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… Modified: trunk/reactos/dll/win32/netcfgx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/resource…

16 years, 2 months

[tkreuzer] 36686: - rewrite NtGdiPolyPolyDraw, optimizing it and making it more windows compatible - Make PolyCounts ULONGs, not DWORDS or INTs. - Remove GdiCreatePolyPolygonRgn and use IntCreatePolyPolygonRgn instead to get rid of code-duplication. - IntGdiPolygon: rename UnsafePoints to Points

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 7 18:02:41 2008 New Revision: 36686 URL: http://svn.reactos.org/svn/reactos?rev=36686&view=rev Log: - rewrite NtGdiPolyPolyDraw, optimizing it and making it more windows compatible - Make PolyCounts ULONGs, not DWORDS or INTs. - Remove GdiCreatePolyPolygonRgn and use IntCreatePolyPolygonRgn instead to get rid of code-duplication. - IntGdiPolygon: rename UnsafePoints to Points Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Tue Oct 7 18:02:41 2008 @@ -93,7 +93,7 @@ BOOL FASTCALL IntGdiPolyPolyline(DC *dc, LPPOINT pt, - LPDWORD PolyPoints, + PULONG PolyPoints, DWORD Count); BOOL FASTCALL @@ -125,7 +125,7 @@ BOOL FASTCALL IntGdiPolyPolygon(DC *dc, LPPOINT Points, - LPINT PolyCounts, + PULONG PolyCounts, int Count); BOOL FASTCALL IntGdiGradientFill(DC *dc, Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Tue Oct 7 18:02:41 2008 @@ -43,7 +43,7 @@ INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT); BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); -HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); +HRGN FASTCALL IntCreatePolyPolygonRgn(PPOINT, PULONG, INT, INT); INT FASTCALL IntGdiCombineRgn(PROSRGNDATA, PROSRGNDATA, PROSRGNDATA, INT); INT FASTCALL REGION_Complexity(PROSRGNDATA); Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Tue Oct 7 18:02:41 2008 @@ -51,7 +51,7 @@ BOOL FASTCALL IntGdiPolygon(PDC dc, - PPOINT UnsafePoints, + PPOINT Points, int Count) { BITMAPOBJ *BitmapObj; @@ -64,7 +64,7 @@ ASSERT(dc); // caller's responsibility to pass a valid dc - if ( NULL == UnsafePoints || Count < 2 ) + if (!Points || Count < 2 ) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; @@ -74,25 +74,25 @@ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; /* Convert to screen coordinates */ - IntLPtoDP(dc, UnsafePoints, Count); + IntLPtoDP(dc, Points, Count); for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) { - UnsafePoints[CurrentPoint].x += dc->ptlDCOrig.x; - UnsafePoints[CurrentPoint].y += dc->ptlDCOrig.y; + Points[CurrentPoint].x += dc->ptlDCOrig.x; + Points[CurrentPoint].y += dc->ptlDCOrig.y; } // No need to have path here. { - DestRect.left = UnsafePoints[0].x; - DestRect.right = UnsafePoints[0].x; - DestRect.top = UnsafePoints[0].y; - DestRect.bottom = UnsafePoints[0].y; + DestRect.left = Points[0].x; + DestRect.right = Points[0].x; + DestRect.top = Points[0].y; + DestRect.bottom = Points[0].y; for (CurrentPoint = 1; CurrentPoint < Count; ++CurrentPoint) { - DestRect.left = min(DestRect.left, UnsafePoints[CurrentPoint].x); - DestRect.right = max(DestRect.right, UnsafePoints[CurrentPoint].x); - DestRect.top = min(DestRect.top, UnsafePoints[CurrentPoint].y); - DestRect.bottom = max(DestRect.bottom, UnsafePoints[CurrentPoint].y); + DestRect.left = min(DestRect.left, Points[CurrentPoint].x); + DestRect.right = max(DestRect.right, Points[CurrentPoint].x); + DestRect.top = min(DestRect.top, Points[CurrentPoint].y); + DestRect.bottom = max(DestRect.bottom, Points[CurrentPoint].y); } /* Special locking order to avoid lock-ups */ @@ -106,7 +106,7 @@ if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(Dc_Attr->jROP2), UnsafePoints, Count, DestRect ); + ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(Dc_Attr->jROP2), Points, Count, DestRect ); } if (FillBrushObj) BRUSHOBJ_UnlockBrush(FillBrushObj); @@ -122,16 +122,16 @@ { // DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n", -// UnsafePoints[0].x, UnsafePoints[0].y, -// UnsafePoints[1].x, UnsafePoints[1].y ); +// Points[0].x, Points[0].y, +// Points[1].x, Points[1].y ); ret = IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - UnsafePoints[i].x, /* From */ - UnsafePoints[i].y, - UnsafePoints[i+1].x, /* To */ - UnsafePoints[i+1].y, + Points[i].x, /* From */ + Points[i].y, + Points[i+1].x, /* To */ + Points[i+1].y, &DestRect, ROP2_TO_MIX(Dc_Attr->jROP2)); /* MIX */ if (!ret) break; @@ -142,10 +142,10 @@ ret = IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - UnsafePoints[Count-1].x, /* From */ - UnsafePoints[Count-1].y, - UnsafePoints[0].x, /* To */ - UnsafePoints[0].y, + Points[Count-1].x, /* From */ + Points[Count-1].y, + Points[0].x, /* To */ + Points[0].y, &DestRect, ROP2_TO_MIX(Dc_Attr->jROP2)); /* MIX */ } @@ -161,11 +161,11 @@ BOOL FASTCALL IntGdiPolyPolygon(DC *dc, LPPOINT Points, - LPINT PolyCounts, + PULONG PolyCounts, int Count) { if (PATH_IsPathOpen(dc->DcLevel)) - return PATH_PolyPolygon ( dc, Points, PolyCounts, Count); + return PATH_PolyPolygon ( dc, Points, (PINT)PolyCounts, Count); while (--Count >=0) { @@ -336,185 +336,152 @@ ULONG_PTR STDCALL NtGdiPolyPolyDraw( IN HDC hDC, - IN PPOINT Points, - IN PULONG PolyCounts, + IN PPOINT UnsafePoints, + IN PULONG UnsafeCounts, IN ULONG Count, IN INT iFunc ) { DC *dc; - LPPOINT Safept; - LPINT SafePolyPoints; + PVOID pTemp; + LPPOINT SafePoints; + PULONG SafeCounts; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = TRUE; - INT nPoints, nEmpty, nInvalid, i; - - if (iFunc == GdiPolyPolyRgn) - { - return (ULONG_PTR) GdiCreatePolyPolygonRgn((CONST PPOINT) Points, - (CONST PINT) PolyCounts, - Count, - (INT) hDC); - } - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->DC_Type == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (Count > 0) - { - _SEH_TRY - { - ProbeForRead(Points, - Count * sizeof(POINT), - 1); - ProbeForRead(PolyCounts, - Count * sizeof(INT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - SafePolyPoints = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_SHAPE); - if (!SafePolyPoints) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers already probed! */ - RtlCopyMemory(SafePolyPoints, - PolyCounts, - Count * sizeof(INT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(SafePolyPoints); - SetLastNtError(Status); - return FALSE; - } - /* validate poligons */ - nPoints = 0; - nEmpty = 0; - nInvalid = 0; + INT nPoints = 0, nMaxPoints = 0, nInvalid = 0, i; + + if (!UnsafePoints || !UnsafeCounts || + Count == 0 || iFunc == 0 || iFunc > GdiPolyPolyRgn) + { + /* Windows doesn't set last error */ + return FALSE; + } + + _SEH_TRY + { + ProbeForRead(UnsafePoints, Count * sizeof(POINT), 1); + ProbeForRead(UnsafeCounts, Count * sizeof(ULONG), 1); + + /* Count points and validate poligons */ for (i = 0; i < Count; i++) { - if (SafePolyPoints[i] == 0) - { - nEmpty++; - } - if (SafePolyPoints[i] == 1) + if (UnsafeCounts[i] < 2) { nInvalid++; } - nPoints += SafePolyPoints[i]; + nPoints += UnsafeCounts[i]; + nMaxPoints = max(nMaxPoints, UnsafeCounts[i]); } - - if (nEmpty == Count) - { - /* if all polygon counts are zero, return without setting a last error code. */ - ExFreePool(SafePolyPoints); - return FALSE; - } - if (nInvalid != 0) - { - /* if at least one poly count is 1, fail */ - ExFreePool(SafePolyPoints); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, nPoints * sizeof(POINT), TAG_SHAPE); - if (!Safept) - { - DC_UnlockDc(dc); - ExFreePool(SafePolyPoints); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers already probed! */ - RtlCopyMemory(Safept, - Points, - nPoints * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(SafePolyPoints); - ExFreePool(Safept); - SetLastNtError(Status); - return FALSE; - } - } - else + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + /* Windows doesn't set last error */ + return FALSE; + } + + if (nPoints == 0 || nPoints < nMaxPoints) + { + /* If all polygon counts are zero, or we have overflow, + return without setting a last error code. */ + return FALSE; + } + + if (nInvalid != 0) + { + /* If at least one poly count is 0 or 1, fail */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Allocate one buffer for both counts and points */ + pTemp = ExAllocatePoolWithTag(PagedPool, + Count * sizeof(ULONG) + nPoints * sizeof(POINT), + TAG_SHAPE); + if (!pTemp) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + SafeCounts = pTemp; + SafePoints = (PVOID)(SafeCounts + Count); + + _SEH_TRY + { + /* Pointers already probed! */ + RtlCopyMemory(SafeCounts, UnsafeCounts, Count * sizeof(ULONG)); + RtlCopyMemory(SafePoints, UnsafePoints, nPoints * sizeof(POINT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePool(pTemp); + return FALSE; + } + + /* Special handling for GdiPolyPolyRgn */ + if (iFunc == GdiPolyPolyRgn) + { + HRGN hRgn; + hRgn = IntCreatePolyPolygonRgn(SafePoints, SafeCounts, Count, (INT_PTR)hDC); + ExFreePool(pTemp); + return (ULONG_PTR)hRgn; + } + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + ExFreePool(pTemp); + return FALSE; + } + + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - + ExFreePool(pTemp); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + /* Perform the actual work */ switch (iFunc) { case GdiPolyPolygon: - Ret = IntGdiPolyPolygon(dc, Safept, SafePolyPoints, Count); + Ret = IntGdiPolyPolygon(dc, SafePoints, SafeCounts, Count); break; case GdiPolyPolyLine: - Ret = IntGdiPolyPolyline(dc, Safept, (LPDWORD) SafePolyPoints, Count); + Ret = IntGdiPolyPolyline(dc, SafePoints, SafeCounts, Count); break; case GdiPolyBezier: - Ret = IntGdiPolyBezier(dc, Safept, *PolyCounts); + Ret = IntGdiPolyBezier(dc, SafePoints, *SafeCounts); break; case GdiPolyLineTo: - Ret = IntGdiPolylineTo(dc, Safept, *PolyCounts); + Ret = IntGdiPolylineTo(dc, SafePoints, *SafeCounts); break; case GdiPolyBezierTo: - Ret = IntGdiPolyBezierTo(dc, Safept, *PolyCounts); + Ret = IntGdiPolyBezierTo(dc, SafePoints, *SafeCounts); break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); Ret = FALSE; } - ExFreePool(SafePolyPoints); - ExFreePool(Safept); + + /* Cleanup and return */ DC_UnlockDc(dc); - - return (ULONG_PTR) Ret; + ExFreePool(pTemp); + + return (ULONG_PTR)Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Tue Oct 7 18:02:41 2008 @@ -350,12 +350,12 @@ BOOL FASTCALL IntGdiPolyPolyline(DC *dc, LPPOINT pt, - LPDWORD PolyPoints, + PULONG PolyPoints, DWORD Count) { int i; LPPOINT pts; - LPDWORD pc; + PULONG pc; BOOL ret = FALSE; // default to failure pts = pt; pc = PolyPoints; Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Tue Oct 7 18:02:41 2008 @@ -1028,7 +1028,6 @@ } -HRGN FASTCALL IntCreatePolyPolygonRgn(POINT *Pts, INT *Count, INT nbpolygons,INT mode); /* PATH_PathToRegion * * Creates a region from the specified path using the specified polygon @@ -1042,7 +1041,7 @@ PATH_PathToRegion ( PPATH pPath, INT nPolyFillMode, HRGN *pHrgn ) { int numStrokes, iStroke, i; - INT *pNumPointsInStroke; + PULONG pNumPointsInStroke; HRGN hrgn = 0; ASSERT(pPath!=NULL); @@ -1060,7 +1059,7 @@ numStrokes++; /* Allocate memory for number-of-points-in-stroke array */ - pNumPointsInStroke=(int *)ExAllocatePoolWithTag(PagedPool, sizeof(int) * numStrokes, TAG_PATH); + pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH); if(!pNumPointsInStroke) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Oct 7 18:02:41 2008 @@ -3560,7 +3560,7 @@ */ static void FASTCALL REGION_CreateETandAET( - const INT *Count, + const ULONG *Count, INT nbpolygons, const POINT *pts, EdgeTable *ET, @@ -3657,7 +3657,7 @@ HRGN FASTCALL IntCreatePolyPolygonRgn( POINT *Pts, - INT *Count, + PULONG Count, INT nbpolygons, INT mode ) @@ -3680,6 +3680,8 @@ POINTBLOCK *tmpPtBlock; int numFullPtBlocks = 0; INT poly, total; + + if (mode == 0 || mode > 2) return 0; if (!(region = REGION_AllocRgnWithHandle(nbpolygons))) return 0; @@ -3851,139 +3853,4 @@ return hrgn; } - -HRGN -FASTCALL -GdiCreatePolyPolygonRgn( - CONST PPOINT pt, - CONST PINT PolyCounts, - INT Count, - INT PolyFillMode -) -{ - POINT *Safept; - INT *SafePolyCounts; - INT nPoints, nEmpty, nInvalid, i; - HRGN hRgn; - NTSTATUS Status = STATUS_SUCCESS; - - if (pt == NULL || PolyCounts == NULL || Count == 0 || - (PolyFillMode != WINDING && PolyFillMode != ALTERNATE)) - { - /* Windows doesn't set a last error here */ - return (HRGN)0; - } - - _SEH_TRY - { - ProbeForRead(PolyCounts, Count * sizeof(INT), 1); - /* just probe one point for now, we don't know the length of the array yet */ - ProbeForRead(pt, sizeof(POINT), 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return (HRGN)0; - } - - if (!(SafePolyCounts = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_REGION))) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return (HRGN)0; - } - - _SEH_TRY - { - /* pointers were already probed! */ - RtlCopyMemory(SafePolyCounts, - PolyCounts, - Count * sizeof(INT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePool(SafePolyCounts); - SetLastNtError(Status); - return (HRGN)0; - } - - /* validate poligons */ - nPoints = 0; - nEmpty = 0; - nInvalid = 0; - for (i = 0; i < Count; i++) - { - if (SafePolyCounts[i] == 0) - { - nEmpty++; - } - if (SafePolyCounts[i] == 1) - { - nInvalid++; - } - nPoints += SafePolyCounts[i]; - } - - if (nEmpty == Count) - { - /* if all polygon counts are zero, return without setting a last error code. */ - ExFreePool(SafePolyCounts); - return (HRGN)0; - } - if (nInvalid != 0) - { - /* if at least one poly count is 1, fail */ - ExFreePool(SafePolyCounts); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return (HRGN)0; - } - - /* copy points */ - if (!(Safept = ExAllocatePoolWithTag(PagedPool, nPoints * sizeof(POINT), TAG_REGION))) - { - ExFreePool(SafePolyCounts); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return (HRGN)0; - } - - _SEH_TRY - { - ProbeForRead(pt, nPoints * sizeof(POINT), 1); - /* pointers were already probed! */ - RtlCopyMemory(Safept, - pt, - nPoints * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (!NT_SUCCESS(Status)) - { - ExFreePool(Safept); - ExFreePool(SafePolyCounts); - SetLastNtError(Status); - return (HRGN)0; - } - - /* now we're ready to calculate the region safely */ - hRgn = IntCreatePolyPolygonRgn(Safept, SafePolyCounts, Count, PolyFillMode); - - ExFreePool(Safept); - ExFreePool(SafePolyCounts); - return hRgn; -} - /* EOF */

16 years, 2 months

[tkreuzer] 36685: Fix FLOATOBJ_IsLong. Fix MapMode MM_ISOTROPIC. This fixes the clock in timedate.cpl.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 7 17:57:50 2008 New Revision: 36685 URL: http://svn.reactos.org/svn/reactos?rev=36685&view=rev Log: Fix FLOATOBJ_IsLong. Fix MapMode MM_ISOTROPIC. This fixes the clock in timedate.cpl. Modified: trunk/reactos/subsystems/win32/win32k/include/floatobj.h trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/include/floatobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/floatobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/floatobj.h [iso-8859-1] Tue Oct 7 17:57:50 2008 @@ -35,6 +35,7 @@ { EFLOAT_S *pef = (EFLOAT_S*)pf; ULONG Shift = 32 - pef->lExp; + if (Shift > 31) return FALSE; return (((pef->lMant >> Shift) << Shift) == pef->lMant); } Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue Oct 7 17:57:50 2008 @@ -672,8 +672,14 @@ INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); break; + case MM_ISOTROPIC: + Dc_Attr->szlWindowExt.cx = 3600; + Dc_Attr->szlWindowExt.cy = 2700; + Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; + Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; + break; + case MM_LOMETRIC: - case MM_ISOTROPIC: Dc_Attr->szlWindowExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize * 10; Dc_Attr->szlWindowExt.cy = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize * 10; Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes;

16 years, 2 months

[tkreuzer] 36684: fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 7 17:24:17 2008 New Revision: 36684 URL: http://svn.reactos.org/svn/reactos?rev=36684&view=rev Log: fix a typo Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Tue Oct 7 17:24:17 2008 @@ -36,7 +36,7 @@ #define GS_HANDOBJ_ALLOC 3 #define GS_LOOKASIDE_INFO 4 -/* NtGdiQueryFonts */ +/* NtGdiEnumFontOpen */ #define TYPE_ENUMFONTS 1 #define TYPE_ENUMFONTFAMILIES 2 #define TYPE_ENUMFONTFAMILIESEX 3

16 years, 2 months

[dreimer] 36683: ooops. my fault...

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Oct 7 16:58:38 2008 New Revision: 36683 URL: http://svn.reactos.org/svn/reactos?rev=36683&view=rev Log: ooops. my fault... Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] Tue Oct 7 16:58:38 2008 @@ -76,7 +76,7 @@ IDS_OPENFILTER, "Alle støttet formater (*.bin,*.psf)|*.bin;*.psf|Binære skrifttype filer (*.bin)|*.bin|PC skjerm skrifttype versjon 1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Binære skrifttype filer (*.bin)|*.bin|" IDS_OPENERROR, "Feil med å åpne filen! (Feil nummer %1!u!)" - IDS_READERROR, "Feil med å lese filen! (Feil nummer %1!u!)"" + IDS_READERROR, "Feil med å lese filen! (Feil nummer %1!u!)" IDS_WRITEERROR, "Feil med å lagre filen! (Feil nummer %1!u!)" IDS_UNSUPPORTEDFORMAT, "Filformatet er ikke støttet!" IDS_UNSUPPORTEDPSF, "Ikke støttet PSF filformat/skriftformat! Programmet støtter bare 8x8 skrift med ingen spesielle modus."

16 years, 2 months

[dreimer] 36682: Bug 3752: Translate files by Lars Martin Hambro

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Oct 7 16:12:45 2008 New Revision: 36682 URL: http://svn.reactos.org/svn/reactos?rev=36682&view=rev Log: Bug 3752: Translate files by Lars Martin Hambro Added: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/circles/lang/no-NO.rc (with props) Modified: trunk/rosapps/applications/devutils/vgafontedit/main.rc trunk/rosapps/applications/imagesoft/lang/no-NO.rc trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/circles/circles.rc trunk/rosapps/templates/old_wordpad/lang/no-NO.rc Added: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc (added) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/lang/en-US.rc + * PURPOSE: English resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + * TRANSLATOR: Colin Finck + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_ABOUT DIALOGEX 10, 10, 130, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Om" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 + LTEXT "ReactOS VGA skriftredigering", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Enerett 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 + DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 +END + +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger Glyph" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 + CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 + CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 + + DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 125, 177, 70, 14 +END + +IDM_MAINMENU MENU +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW + MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Lukk", ID_FILE_CLOSE + MENUITEM SEPARATOR + MENUITEM "Lagre\tCtrl+S", ID_FILE_SAVE + MENUITEM "Lagre som...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Avslutt\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Rediger" + BEGIN + MENUITEM "Kopier\tCtrl+C", ID_EDIT_COPY + MENUITEM "Lim inn\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Rediger Glyph...", ID_EDIT_GLYPH + END + + POPUP "&Vindu" + BEGIN + MENUITEM "&Overlappet", ID_WINDOW_CASCADE + MENUITEM "Hele &Horisontalt", ID_WINDOW_TILE_HORZ + MENUITEM "Hele &Vertikalt", ID_WINDOW_TILE_VERT + MENUITEM "&Ordne ikoner", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Nes&te\tCtrl+F6", ID_WINDOW_NEXT + END + + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om...", ID_HELP_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_OPENFILTER, "Alle støttet formater (*.bin,*.psf)|*.bin;*.psf|Binære skrifttype filer (*.bin)|*.bin|PC skjerm skrifttype versjon 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Binære skrifttype filer (*.bin)|*.bin|" + IDS_OPENERROR, "Feil med å åpne filen! (Feil nummer %1!u!)" + IDS_READERROR, "Feil med å lese filen! (Feil nummer %1!u!)"" + IDS_WRITEERROR, "Feil med å lagre filen! (Feil nummer %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Filformatet er ikke støttet!" + IDS_UNSUPPORTEDPSF, "Ikke støttet PSF filformat/skriftformat! Programmet støtter bare 8x8 skrift med ingen spesielle modus." + IDS_DOCNAME, "Skrifttype %1!u!" + IDS_SAVEPROMPT, "Filen ""%1"" har blitt endret, men har ikke blitt lagret.\n\nVil du lagre denne?" + IDS_APPTITLE, "ReactOS VGA Skriftredigering" + IDS_CLOSEEDIT, "Vennligst lukk alle åpne vinduer først!" + + IDS_TOOLTIP_NEW, "Ny" + IDS_TOOLTIP_OPEN, "Åpne" + IDS_TOOLTIP_SAVE, "Lagre" + IDS_TOOLTIP_EDIT_GLYPH, "Rediger Glyph" + IDS_TOOLTIP_COPY, "Kopier" + IDS_TOOLTIP_PASTE, "Lim inn" +END Propchange: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/main.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/main.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -40,3 +40,4 @@ #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" #include "lang/it-IT.rc" +#include "lang/no-NO.rc" Modified: trunk/rosapps/applications/imagesoft/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… ============================================================================== --- trunk/rosapps/applications/imagesoft/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/lang/no-NO.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -156,7 +156,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." + IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_READY " Klart." IDS_TOOLBAR_STANDARD "Standard" IDS_TOOLBAR_TEST "Test" Added: trunk/rosapps/applications/screensavers/butterflies/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/no-NO.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -1,0 +1,34 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 172, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Sommerfugl skjermsparer innstilling" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,61,35,50,14 + CONTROL "Roter sommerfugler",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "Om",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 149, 79 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Om" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Sommerfugl skjermsparer",IDC_STATIC,7,7,135,9 + CTEXT "Demostrasjon av: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "Skjermsparer av: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Sommerfugl skjermsparer" +END Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -5,5 +5,6 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" +#include "lang/no-NO.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -13,4 +13,5 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/no-NO.rc" #include "lang/sk-SK.rc" Added: trunk/rosapps/applications/screensavers/circles/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/no-NO.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -1,0 +1,7 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Sirkeler" + IDS_TEXT "Ingen valg trenges å settes." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/templates/old_wordpad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/lang… ============================================================================== --- trunk/rosapps/templates/old_wordpad/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/lang/no-NO.rc [iso-8859-1] Tue Oct 7 16:12:45 2008 @@ -101,7 +101,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "WordPad II v0.1\nCopyright (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "WordPad II v0.1\nEnrett (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Lukk", IDOK, 65, 162, 44, 15 ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 40, 174, 110, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -110,16 +110,16 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Denne programet er gratis programvare; 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.\r\n\r\nThis 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.\r\n\r\nYou 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." + IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_DEFAULT_NAME "Dokument %1!u!" IDS_READY " Klar." END STRINGTABLE DISCARDABLE BEGIN - IDS_DOC_TYPE_RICH_TEXT "Rik Tekst Dokument" - IDS_DOC_TYPE_UNICODE_TEXT "Tekst Dokument" - IDS_DOC_TYPE_TEXT "Unicode Tekst Dokument" + IDS_DOC_TYPE_RICH_TEXT "Rik tekst dokument" + IDS_DOC_TYPE_UNICODE_TEXT "Tekst dokument" + IDS_DOC_TYPE_TEXT "Unicode tekst dokument" END @@ -134,7 +134,7 @@ IDS_TOOLTIP_PRINT "Skriv ut" IDS_TOOLTIP_CUT "Klipp ut" IDS_TOOLTIP_COPY "Kopiere" - IDS_TOOLTIP_PASTE "Paste" + IDS_TOOLTIP_PASTE "Lim inn" IDS_TOOLTIP_UNDO "Angre" IDS_TOOLTIP_REDO "Gjenta" END

16 years, 2 months

[sginsberg] 36680: - HalRequestIpi takes a KAFFINITY as input, not a ULONG -- fix this and add a note about MP HAL's brokenness

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Oct 7 15:56:48 2008 New Revision: 36680 URL: http://svn.reactos.org/svn/reactos?rev=36680&view=rev Log: - HalRequestIpi takes a KAFFINITY as input, not a ULONG -- fix this and add a note about MP HAL's brokenness Modified: trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/mp/ipi_mp.c Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] Tue Oct 7 15:56:48 2008 @@ -78,9 +78,9 @@ */ VOID NTAPI -HalRequestIpi(ULONG Reserved) +HalRequestIpi(KAFFINITY TargetProcessors) { - /* Not implemented on NT */ + /* Not implemented on UP */ __debugbreak(); } Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ipi_mp.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] Tue Oct 7 15:56:48 2008 @@ -16,10 +16,11 @@ /* FUNCTIONS ****************************************************************/ VOID STDCALL -HalRequestIpi(ULONG ProcessorNo) +HalRequestIpi(KAFFINITY TargetProcessors) { - DPRINT("HalRequestIpi(ProcessorNo %d)\n", ProcessorNo); - APICSendIPI(1 << ProcessorNo, + /* FIXME: SMP HAL is...very broken */ + DPRINT("HalRequestIpi(TargetProcessors %d)\n", TargetProcessors); + APICSendIPI(1 << TargetProcessors, IPI_VECTOR|APIC_ICR0_LEVEL_DEASSERT|APIC_ICR0_DESTM); }

16 years, 2 months

← Newer
1
...
41
42
43
44
45
46
47
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008