Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 41552: sync hhctrl.ocx with wine 1.1.24
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Mon Jun 22 23:38:47 2009 New Revision: 41552 URL: http://svn.reactos.org/svn/reactos?rev=41552&view=rev Log: sync hhctrl.ocx with wine 1.1.24 Added: trunk/reactos/dll/win32/hhctrl.ocx/Lt.rc (with props) Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc Added: trunk/reactos/dll/win32/hhctrl.ocx/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Lt.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Lt.rc (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/Lt.rc [iso-8859-1] Mon Jun 22 23:38:47 2009 @@ -1,0 +1,63 @@ +/* + * HTML Help resources + * Lithuanian Language Support + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Turinys" + IDS_INDEX "&RodyklÄ" + IDS_SEARCH "&PaieÅ¡ka" + IDS_FAVORITES "&Adresynas" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Rodyti" + IDTB_CONTRACT "SlÄpti" + IDTB_STOP "Stabdyti" + IDTB_REFRESH "Atnaujinti" + IDTB_BACK "Atgal" + IDTB_HOME "Ä® pradÅ¾iÄ" + IDTB_SYNC "Sinchronizuoti" + IDTB_PRINT "Spausdinti" + IDTB_OPTIONS "Parinktys" + IDTB_FORWARD "Pirmyn" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Nukreipimas1" + IDTB_JUMP2 "Nukreipimas2" + IDTB_CUSTOMIZE "Adaptuoti" + IDTB_ZOOM "Keisti mastelÄ¯" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/hhctrl.ocx/Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] Mon Jun 22 23:38:47 2009 @@ -38,6 +38,7 @@ #include "Fi.rc" #include "Hu.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

[cwittich] 41551: sync cryptdlg and cryptui with wine 1.1.24
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Mon Jun 22 23:29:26 2009 New Revision: 41551 URL: http://svn.reactos.org/svn/reactos?rev=41551&view=rev Log: sync cryptdlg and cryptui with wine 1.1.24 Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc (with props) trunk/reactos/dll/win32/cryptui/cryptui_De.rc (with props) Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc trunk/reactos/dll/win32/cryptui/cryptui.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] Mon Jun 22 23:29:26 2009 @@ -22,6 +22,7 @@ #include "winuser.h" #include "cryptres.h" +#include "cryptdlg_De.rc" #include "cryptdlg_En.rc" #include "cryptdlg_Fr.rc" #include "cryptdlg_Ko.rc" Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc [iso-8859-1] Mon Jun 22 23:29:26 2009 @@ -1,0 +1,36 @@ +/* + * cryptdlg dll resources + * + * Copyright 2009 AndrÃ© Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Zertifikatsrichtlinie" + IDS_POLICY_ID "Richtlinien Qualifizierung: " + IDS_POLICY_QUALIFIER_INFO "Richtlinien Qualifizierungs Information" + IDS_POLICY_QUALIFIER_ID "Richtlinien Qualifizierungs-ID=" + IDS_CPS "CPS" + IDS_USER_NOTICE "Benutzerbenachrichtigung" + IDS_QUALIFIER "Qualifizierung" + IDS_NOTICE_REF "Benachrichtigungsbezug" + IDS_ORGANIZATION "Organisation=" + IDS_NOTICE_NUM "Benachrichtigungsnummer=" + IDS_NOTICE_TEXT "Benachrichtigungstext=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Mon Jun 22 23:29:26 2009 @@ -46,6 +46,7 @@ /* @makedep: certheader.bmp */ IDB_CERT_HEADER BITMAP LOADONCALL DISCARDABLE certheader.bmp +#include "cryptui_De.rc" #include "cryptui_En.rc" #include "cryptui_Ko.rc" #include "cryptui_Nl.rc" Added: trunk/reactos/dll/win32/cryptui/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_De.rc (added) +++ trunk/reactos/dll/win32/cryptui/cryptui_De.rc [iso-8859-1] Mon Jun 22 23:29:26 2009 @@ -1,0 +1,465 @@ +/* + * cryptui dll resources + * + * Copyright 2009 AndrÃ© Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERTIFICATE "Zertifikat" + IDS_CERTIFICATEINFORMATION "Zertifikatsinformationen" + IDS_CERT_INFO_BAD_SIG "Das Zertifikat hat einen ungÃ¼ltige Signatur. Das Zertifikat wurde eventuell manipuliert." + IDS_CERT_INFO_UNTRUSTED_CA "Dieses Stammzertifikat ist nicht vertrauenswÃ¼rdig. Installieren Sie das Zertifikat zu den vertrauenswÃ¼rdigen Stammzertifikatsstellen, um die Vertrauensstellung zu aktivieren." + IDS_CERT_INFO_UNTRUSTED_ROOT "Das Zertifikat hat kein gÃ¼ltiges Stammzertifikat." + IDS_CERT_INFO_PARTIAL_CHAIN "Der Zertifikats-Aussteller konnte nicht gefunden werden." + IDS_CERT_INFO_BAD_PURPOSES "Die geplanten Zwecke des Zertifikats konnten nicht verifiziert werden." + IDS_CERT_INFO_PURPOSES "Dieses Zertifikat dient folgenden Zwecken:" + IDS_SUBJECT_HEADING "Ausgestellt fÃ¼r: " + IDS_ISSUER_HEADING "Ausgestellt von: " + IDS_VALID_FROM "GÃ¼ltig ab " + IDS_VALID_TO " bis " + IDS_CERTIFICATE_BAD_SIGNATURE "Das Zertifikat hat einen ungÃ¼ltige Signatur." + IDS_CERTIFICATE_BAD_TIME "Dieses Zertifikat ist entweder abgelaufen oder noch nicht gÃ¼ltig." + IDS_CERTIFICATE_BAD_TIMENEST "Das Zertifikat Ã¼berschreitet die GÃ¼ltigkeit des Ausstellers." + IDS_CERTIFICATE_REVOKED "Das Zertifikat wurde vom Aussteller zurÃ¼ckgezogen." + IDS_CERTIFICATE_VALID "Dieses Zertifikat ist gÃ¼ltig." + IDS_FIELD "Feld" + IDS_VALUE "Wert" + IDS_FIELDS_ALL "<Alle>" + IDS_FIELDS_V1 "Nur Version-1-Felder" + IDS_FIELDS_EXTENSIONS "Nur Erweiterungen" + IDS_FIELDS_CRITICAL_EXTENSIONS "Nur kritische Erweiterungen" + IDS_FIELDS_PROPERTIES "Nur Eigenschaften" + IDS_FIELD_VERSION "Version" + IDS_FIELD_SERIAL_NUMBER "Seriennummer" + IDS_FIELD_ISSUER "Aussteller" + IDS_FIELD_VALID_FROM "GÃ¼ltig ab" + IDS_FIELD_VALID_TO "GÃ¼ltig bis" + IDS_FIELD_SUBJECT "Antragsteller" + IDS_FIELD_PUBLIC_KEY "Ãffentlicher SchlÃ¼ssel" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d Bits)" + IDS_PROP_HASH "SHA1 Hash" + IDS_PROP_ENHKEY_USAGE "Erweiterte SchlÃ¼sselnutzung (Eigenschaft)" + IDS_PROP_FRIENDLY_NAME "Angezeigter Name" + IDS_PROP_DESCRIPTION "Beschreibung" + IDS_CERTIFICATE_PROPERTIES "Zertifikatseigenschaften" + IDS_CERTIFICATE_PURPOSE_ERROR "Bitte geben Sie die OID im Format 1.2.3.4 an" + IDS_CERTIFICATE_PURPOSE_EXISTS "Die eingegebene OID existiert bereits." + IDS_SELECT_STORE_TITLE "Zertifikatsspeicher wÃ¤hlen" + IDS_SELECT_STORE "Bitte wÃ¤hlen Sie einen Zertifikatsspeicher." + IDS_IMPORT_WIZARD "Importassistent fÃ¼r die Zertifikatsverwaltung" + IDS_IMPORT_TYPE_MISMATCH "Die Datei enthÃ¤lt Objekte, die nicht den Kriterien entsprechen. Bitte wÃ¤hlen Sie eine andere Datei." + IDS_IMPORT_FILE_TITLE "Zu importierende Datei" + IDS_IMPORT_FILE_SUBTITLE "Geben Sie die zu importierende Datei an." + IDS_IMPORT_STORE_TITLE "Zertifikatsspeicher wÃ¤hlen" + IDS_IMPORT_STORE_SUBTITLE "Zertifikatsspeicher sind Systemspeicher fÃ¼r Zertifikate." + IDS_IMPORT_FILTER_CERT "X.509 Zertifikat (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "Privater Informationsaustausch (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Zertifikatssperrliste (*.crl)" + IDS_IMPORT_FILTER_CTL "Zertifikatsvertrauensliste (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft Speicher serieller Zertifikate (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Zertifikate (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "Alle Dateien (*.*)" + IDS_IMPORT_EMPTY_FILE "Bitte wÃ¤hlen Sie eine Datei." + IDS_IMPORT_BAD_FORMAT "Unbekanntes Format. WÃ¤hlen Sie eine andere Datei." + IDS_IMPORT_OPEN_FAILED "Konnte die Datei nicht Ã¶ffnen: " + IDS_IMPORT_DEST_DETERMINED "Automatisch ausgewÃ¤hlt" + IDS_IMPORT_SELECT_STORE "Bitte wÃ¤hlen Sie einen Speicher" + IDS_IMPORT_STORE_SELECTION "Zertifikatsspeicher gewÃ¤hlt" + IDS_IMPORT_DEST_AUTOMATIC "Automatisch ausgewÃ¤hlt" + IDS_IMPORT_FILE "Datei" + IDS_IMPORT_CONTENT "Inhalt" + IDS_IMPORT_CONTENT_CERT "Zertifikat" + IDS_IMPORT_CONTENT_CRL "Zertifikatssperrliste" + IDS_IMPORT_CONTENT_CTL "Zertifikatsvertrauensliste" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Zertifikat" + IDS_IMPORT_CONTENT_PFX "Privater Informationsaustausch" + IDS_IMPORT_CONTENT_STORE "Zertifikatsspeicher" + IDS_IMPORT_SUCCEEDED "Importvorgang erfolgreich." + IDS_IMPORT_FAILED "Importvorgang gescheitert." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<Alle>" + IDS_PURPOSE_ADVANCED "<weitere Zwecke>" + IDS_SUBJECT_COLUMN "Ausgestellt fÃ¼r" + IDS_ISSUER_COLUMN "Ausgestellt von" + IDS_EXPIRATION_COLUMN "Verfallsdatum" + IDS_FRIENDLY_NAME_COLUMN "Angezeigter Name" + IDS_ALLOWED_PURPOSE_ALL "<Alle>" + IDS_ALLOWED_PURPOSE_NONE "<Keine>" + IDS_WARN_REMOVE_MY "Sie sind danach nicht lÃ¤nger fÃ¤hig Nachrichten mit diesem Zertifikat zu entschlÃ¼sseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie es lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_PLURAL_MY "Sie sind danach nicht lÃ¤nger fÃ¤hig Nachrichten mit diesen Zertifikaten zu entschlÃ¼sseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie sie lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_ADDRESSBOOK "Sie sind danach nicht lÃ¤nger fÃ¤hig Nachrichten mit diesem Zertifikat zu entschlÃ¼sseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie es lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Sie sind danach nicht lÃ¤nger fÃ¤hig Nachrichten mit diesen Zertifikaten zu entschlÃ¼sseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie sie lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_CA "Von dieser CA ausgestellte Zertifikate werden nicht lÃ¤nger vertrauenswÃ¼rdig sein.\nSind Sie sicher, dass Sie es lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_PLURAL_CA "Von diesen CAs ausgestellte Zertifikate werden nicht lÃ¤nger vertrauenswÃ¼rdig sein.\nSind Sie sicher, dass Sie sie lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_ROOT "Von dieser Stamm-CA ausgestellte Zertifikate werden nicht lÃ¤nger vertrauenswÃ¼rdig sein.\nSind Sie sicher, dass Sie es lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_PLURAL_ROOT "Von diesen Stamm-CAs ausgestellte Zertifikate werden nicht lÃ¤nger vertrauenswÃ¼rdig sein.\nSind Sie sicher, dass Sie sie lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software die von diesem Hersteller signiert ist wird nicht lÃ¤nger vertrauenswÃ¼rdig sein.\nSind Sie sicher, dass Sie ihn lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software die von diesen Herstellern signiert ist wird nicht lÃ¤nger vertrauenswÃ¼rdig sein.\nSind Sie sicher, dass Sie sie lÃ¶schen mÃ¶chten?" + IDS_WARN_REMOVE_DEFAULT "Sind Sie sicher, dass Sie dieses Zertifikat entfernen mÃ¶chten?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Sind Sie sicher, dass Sie diese Zertifikate entfernen mÃ¶chten?" + IDS_CERT_MGR "Zertifikate" + IDS_PURPOSE_SERVER_AUTH "Garantiert die IdentitÃ¤t eines entfernten Computers" + IDS_PURPOSE_CLIENT_AUTH "Beweist Ihre IdentitÃ¤t fÃ¼r einen entfernten Computers" + IDS_PURPOSE_CODE_SIGNING "SchÃ¼tzt Software vor Manipulation nach der VerÃ¶ffentlichung" + IDS_PURPOSE_EMAIL_PROTECTION "Sichert E-Mail Nachrichten" + IDS_PURPOSE_IPSEC "Erlaubt sichere Kommunikation Ã¼ber das Internet" + IDS_PURPOSE_TIMESTAMP_SIGNING "Erlaubt Daten mit der aktuellen Zeit zu signieren" + IDS_PURPOSE_CTL_USAGE_SIGNING "Erlaubt Ihnen eine Zertifikatsvertrauensliste zu signieren" + IDS_PURPOSE_EFS "Erlaubt es lokale Daten zu verschlÃ¼sseln" + IDS_PURPOSE_EFS_RECOVERY "Datenwiederherstellung" + IDS_PURPOSE_WHQL "Windows Hardware Treiber Verifizierung" + IDS_PURPOSE_NT5 "Windows System Komponenten Verifizierung" + IDS_PURPOSE_OEM_WHQL "OEM Windows System Komponenten Verifizierung" + IDS_PURPOSE_EMBEDDED_NT "Embedded Windows System Komponenten Verifizierung" + IDS_PURPOSE_ROOT_LIST_SIGNER "Stammlisten Signierer" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualifizierte Unterordnung" + IDS_PURPOSE_KEY_RECOVERY "SchlÃ¼sselwiederherstellung" + IDS_PURPOSE_DOCUMENT_SIGNING "Dokument signieren" + IDS_PURPOSE_LIFETIME_SIGNING "Lebensdauer signieren" + IDS_PURPOSE_DRM "Digitale Rechte" + IDS_PURPOSE_LICENSES "LizenzschlÃ¼ssel" + IDS_PURPOSE_LICENSE_SERVER "Lizenz Server Verifizierung" + IDS_PURPOSE_ENROLLMENT_AGENT "Zertifikatsanfrage" + IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Anmeldung" + IDS_PURPOSE_CA_EXCHANGE "Private SchlÃ¼sselarchive" + IDS_PURPOSE_KEY_RECOVERY_AGENT "SchlÃ¼sselwiederherstellung" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Verzeichnissdienst E-Mail-Replikation" + IDS_EXPORT_WIZARD "Exportassistent fÃ¼r die Zertifikatsverwaltung" + IDS_EXPORT_FORMAT_TITLE "Export Format" + IDS_EXPORT_FORMAT_SUBTITLE "WÃ¤hlen Sie ein Dateiformat." + IDS_EXPORT_FILE_TITLE "Export Dateiname" + IDS_EXPORT_FILE_SUBTITLE "Geben Sie die Datei an, in die Sie exportieren mÃ¶chten." + IDS_EXPORT_FILE_EXISTS "Die angegebene Datei existiert bereits. MÃ¶chten Sie sie ersetzen?" + IDS_EXPORT_FILTER_CERT "DER-codiertes binÃ¤res X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-codiertes X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Zertifikatssperrliste (*.crl)" + IDS_EXPORT_FILTER_CTL "Zertifikatsvertrauensliste (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Zertifikate (*.p7b)" + IDS_EXPORT_FILTER_PFX "Privater Informationsaustausch (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Zertifikatsspeicher (*.sst)" + IDS_EXPORT_FORMAT "Dateiformat" + IDS_EXPORT_INCLUDE_CHAIN "Alle Zertifikate im Zertifizierungspfad einbeziehen" + IDS_EXPORT_KEYS "SchlÃ¼ssel exportieren" + IDS_YES "Ja" + IDS_NO "Nein" + IDS_EXPORT_SUCCEEDED "Exportvorgang erfolgreich." + IDS_EXPORT_FAILED "Exportvorgang gescheitert." + IDS_EXPORT_PRIVATE_KEY_TITLE "Privaten SchlÃ¼ssel exportieren" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Das Zertifikat enthÃ¤lt einen privaten SchlÃ¼ssel der eventuell mit dem Zertifikat exportiert wird." + IDS_EXPORT_PASSWORD_TITLE "Passwort eingeben" + IDS_EXPORT_PASSWORD_SUBTITLE "Der private SchlÃ¼ssel sollte PasswortgeschÃ¼tzt sein." + IDS_EXPORT_PASSWORD_MISMATCH "Die PasswÃ¶rter sind unterschiedlich." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Hinweis: Der private SchlÃ¼ssel des Zertifikats konnte nicht geÃ¶ffnet werden." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Hinweis: Der private SchlÃ¼ssel des Zertifikats kann nicht exportiert werden." +} + +IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Allgemein" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", + ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", + ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", + ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Zertifikat installieren...", IDC_ADDTOSTORE,93,216,80,14 + PUSHBUTTON "Au&sstellererklÃ¤rung", IDC_ISSUERSTATEMENT,177,216,70,14 +END + +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Details" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Anzeigen:", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 43,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,75,216,98,14 + PUSHBUTTON "In &Datei kopieren...", IDC_EXPORT,177,216,70,14 +END + +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Zertifizierungspfad" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Zertifizierungspfad", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&Zertifikat anzeigen", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "Zertifizierungs&status:", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "Haftungsausschluss" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "SchlieÃen", IDOK,95,216,70,14 + PUSHBUTTON "weitere &Informationen", IDC_CPS,171,216,76,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Allgemein" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Name:", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Beschreibung:", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Zertifikatszwecke", -1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "&Alle Zwecke fÃ¼r dieses Zertifikat aktivieren", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "A&lle Zwecke fÃ¼r dieses Zertifikat deaktivieren", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Nur &folgende Zwecke aktivieren:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,90 + PUSHBUTTON "&Zweck hinzufÃ¼gen...", IDC_ADD_PURPOSE,173,194,71,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 +CAPTION "Zweck hinzufÃ¼gen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Geben Sie die Objekt-ID (OID) fÃ¼r den Zertifikatszweck an, den Sie hinzufÃ¼gen mÃ¶chten:", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "OK", IDOK, 33,48,60,14 + PUSHBUTTON "Abbrechen", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "Zertifikatsspeicher wÃ¤hlen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Zertifikatsspeicher wÃ¤hlen den Sie benutzen mÃ¶chten:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Physikalischen Speicher anzeigen", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Importassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Willkommen", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten aus einer Datei zu importieren.", + -1, 115,33,195,24 + LTEXT "Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch fÃ¼r die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.", + -1, 115,64,195,40 + LTEXT "Klicken Sie Weiter um fortzufahren.", + -1, 115,111,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Importassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Dateiname:", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "D&urchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Hinweis: Es kÃ¶nnen mehrere Zertifikate in einer Datei folgender Formate gespeichert werden:", + -1, 21,26,265,16 + LTEXT "Syntaxstandard kryptografischer Meldungen /PKCS #7 Messages (.p7b)", + -1, 31,49,265,10 + LTEXT "Privater Informationsaustausch/PKCS #12 (.pfx, .p12)", + -1, 31,64,265,10 + LTEXT "Microsoft Speicher serieller Zertifikate (.sst)", + -1, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Importassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wine kann automatisch einen Zertifikatsspeicher wÃ¤hlen, oder Sie wÃ¤hlen einen aus.", + -1, 21,1,195,20 + AUTORADIOBUTTON "A&utomatisch einen Zertifikatsspeicher wÃ¤hlen", + IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Alle Zertifikate im folgendem Zertifikatsspeicher speichern:", + IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY + PUSHBUTTON "&Durchsuchen...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Importassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fertigstellen des Assistenten", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Importvorgang ordnungsgemÃ¤Ã abgeschlossen.", + -1, 115,33,195,24 + LTEXT "Sie haben folgende Einstellungen gewÃ¤hlt:", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Geplanter Zweck:", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Importieren...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "&Exportieren...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "&Entfernen", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "&Erweitert...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "Beabsichtigte Zwecke des Zertifikates", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 + PUSHBUTTON "&Anzeigen...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&SchlieÃen", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "Erweiterte Optionen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zertifikatszweck", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "WÃ¤hlen Sie mindestens einen Zweck, der als Erweitert aufgefÃ¼hrt werden soll.", + -1, 14,18,220,16 + LTEXT "&Zertifikatszwecke:", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Exportassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Willkommen", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten in eine Datei zu exportieren.", + -1, 115,33,195,16 + LTEXT "Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch fÃ¼r die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.", + -1, 115,56,195,40 + LTEXT "Klicken Sie Weiter um fortzufahren.", + -1, 115,103,195,8 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Exportassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wenn Sie sich entscheiden den privaten SchlÃ¼ssel zu exportieren, werden Sie spÃ¤ter nach einem Passwort gefragt.", -1, 21,1,195,23 + LTEXT "Privaten SchlÃ¼ssel exportieren?", -1, 21,24,195,15 + AUTORADIOBUTTON "&Ja, privaten SchlÃ¼ssel exportieren", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Nein, privaten SchlÃ¼ssel nicht exportieren", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Exportassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Passwort:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "Passwort &bestÃ¤tigen:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Exportassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "WÃ¤hlen Sie das gewÃ¼nschte Format:", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER-codiertes X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "B&ase64-codiertes X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Syntaxstandard kryptografischer Meldungen/PKCS #7 Zertifikate (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,250,12, BS_AUTORADIOBUTTON + CHECKBOX "&Wenn mÃ¶glich alle Zertifikate im Zertifizierungspfad einbeziehen", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,250,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "&Privater Informationsaustausch/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,250,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "W&enn mÃ¶glich alle Zertifikate im Zertifizierungspfad einbeziehen", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,250,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&VerstÃ¤rkte Sicherheit aktivieren", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "Priva&ten SchlÃ¼ssel lÃ¶schen wenn der Export erfolgreich war", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,250,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Exportassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Dateiname:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&Durchsuchen...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Exportassistent fÃ¼r die Zertifikatsverwaltung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fertigstellen des Assistenten", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Exportvorgang ordnungsgemÃ¤Ã abgeschlossen.", + -1, 115,33,195,24 + LTEXT "Sie haben folgende Einstellungen gewÃ¤hlt:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/cryptui/cryptui_De.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 41550: sync crypt32 with wine 1.1.24
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Mon Jun 22 23:27:02 2009 New Revision: 41550 URL: http://svn.reactos.org/svn/reactos?rev=41550&view=rev Log: sync crypt32 with wine 1.1.24 Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/str.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -2419,7 +2419,7 @@ field->indexes[indexIndex] |= 1 << (bit % BITS_PER_DWORD); } -static BOOL CRYPT_IsBitInFieldSet(struct BitField *field, DWORD bit) +static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { BOOL set = FALSE; DWORD indexIndex = bit / BITS_PER_DWORD; Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -262,7 +262,7 @@ } /* Checks whether the chain is cyclic by examining the last element's status */ -static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) +static inline BOOL CRYPT_IsSimpleChainCyclic(const CERT_SIMPLE_CHAIN *chain) { if (chain->cElement) return chain->rgpElement[chain->cElement - 1]->TrustStatus.dwErrorStatus @@ -272,7 +272,7 @@ } static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, - CERT_TRUST_STATUS *elementStatus) + const CERT_TRUST_STATUS *elementStatus) { /* Any error that applies to an element also applies to a chain.. */ chainStatus->dwErrorStatus |= elementStatus->dwErrorStatus; @@ -282,7 +282,7 @@ chainStatus->dwInfoStatus |= (elementStatus->dwInfoStatus & 0xfffffff0); } -static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, +static BOOL CRYPT_AddCertToSimpleChain(const CertificateChainEngine *engine, PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD subjectInfoStatus) { BOOL ret = FALSE; @@ -720,7 +720,7 @@ } } -static void dump_basic_constraints(PCERT_EXTENSION ext) +static void dump_basic_constraints(const CERT_EXTENSION *ext) { CERT_BASIC_CONSTRAINTS_INFO *info; DWORD size = 0; @@ -737,7 +737,7 @@ } } -static void dump_basic_constraints2(PCERT_EXTENSION ext) +static void dump_basic_constraints2(const CERT_EXTENSION *ext) { CERT_BASIC_CONSTRAINTS2_INFO constraints; DWORD size = sizeof(CERT_BASIC_CONSTRAINTS2_INFO); @@ -754,7 +754,7 @@ } } -static void dump_extension(PCERT_EXTENSION ext) +static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), ext->fCritical ? "" : "not "); @@ -1008,7 +1008,7 @@ /* Builds a simple chain by finding an issuer for the last cert in the chain, * until reaching a self-signed cert, or until no issuer can be found. */ -static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, +static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, HCERTSTORE world, PCERT_SIMPLE_CHAIN chain) { BOOL ret = TRUE; @@ -1116,7 +1116,7 @@ /* Makes and returns a copy of chain, up to and including element iElement. */ static PCERT_SIMPLE_CHAIN CRYPT_CopySimpleChainToElement( - PCERT_SIMPLE_CHAIN chain, DWORD iElement) + const CERT_SIMPLE_CHAIN *chain, DWORD iElement) { PCERT_SIMPLE_CHAIN copy = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN)); @@ -1345,7 +1345,7 @@ #define IS_TRUST_ERROR_SET(TrustStatus, bits) \ (TrustStatus)->dwErrorStatus & (bits) -static DWORD CRYPT_ChainQuality(PCertificateChain chain) +static DWORD CRYPT_ChainQuality(const CertificateChain *chain) { DWORD quality = CHAIN_QUALITY_HIGHEST; @@ -1402,7 +1402,7 @@ } static BOOL CRYPT_AddAlternateChainToChain(PCertificateChain chain, - PCertificateChain alternate) + const CertificateChain *alternate) { BOOL ret; @@ -1427,7 +1427,7 @@ } static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain( - PCERT_CHAIN_CONTEXT chain, DWORD i) + const CERT_CHAIN_CONTEXT *chain, DWORD i) { DWORD j, iElement; PCERT_CHAIN_ELEMENT element = NULL; @@ -1448,7 +1448,7 @@ } CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS; static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, - LPFILETIME pTime, PCERT_CHAIN_PARA pChainPara, DWORD chainFlags) + LPFILETIME pTime, const CERT_CHAIN_PARA *pChainPara, DWORD chainFlags) { DWORD cContext; Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -201,7 +201,7 @@ return list; } -static inline struct list *ContextList_ContextToEntry(struct ContextList *list, +static inline struct list *ContextList_ContextToEntry(const struct ContextList *list, const void *context) { struct list *ret; @@ -213,7 +213,7 @@ return ret; } -static inline void *ContextList_EntryToContext(struct ContextList *list, +static inline void *ContextList_EntryToContext(const struct ContextList *list, struct list *entry) { return (LPBYTE)entry - sizeof(LINK_CONTEXT) - list->contextSize; Modified: trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -1,7 +1,7 @@ /* * crypt32 dll French resources * - * Copyright 2006-2008 Jonathan Ernst + * Copyright 2006-2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -171,6 +171,7 @@ IDS_LOCALIZEDNAME_MY "Personnel" IDS_LOCALIZEDNAME_CA "Autorités intermédiaires" IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Éditeurs de confiance" } STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -79,7 +79,7 @@ CRYPT_HASH_BLOB hash; } CRYPT_DIGESTED_DATA; -BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData, +BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData, void *pvData, DWORD *pcbData); typedef struct _CRYPT_SIGNED_INFO Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -1078,7 +1078,7 @@ } static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, - CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc, + const CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { DWORD bytesNeeded = 0, lenBytes, size; @@ -1268,7 +1268,7 @@ return ret; } -static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, +static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, const CERT_RDN *rdn, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -1881,7 +1881,7 @@ cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } -BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData, +BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData, void *pvData, DWORD *pcbData) { struct AsnEncodeSequenceItem items[] = { Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -1340,7 +1340,7 @@ } static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, - const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + const void *pvMsgEncodeInfo, LPCSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) { const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *info = pvMsgEncodeInfo; @@ -1553,7 +1553,7 @@ return ret; } -static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob) +static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_DATA_BLOB *data; @@ -1613,7 +1613,7 @@ } static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, - CRYPT_DER_BLOB *blob) + const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_DIGESTED_DATA *digestedData; Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -1080,7 +1080,7 @@ return ret; } -static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, +static BOOL CRYPT_FormatHexStringWithPrefix(const CRYPT_DATA_BLOB *blob, int id, LPWSTR str, DWORD *pcbStr) { WCHAR buf[MAX_STRING_RESOURCE_LEN]; @@ -1114,13 +1114,13 @@ return ret; } -static BOOL CRYPT_FormatKeyId(CRYPT_DATA_BLOB *keyId, LPWSTR str, +static BOOL CRYPT_FormatKeyId(const CRYPT_DATA_BLOB *keyId, LPWSTR str, DWORD *pcbStr) { return CRYPT_FormatHexStringWithPrefix(keyId, IDS_KEY_ID, str, pcbStr); } -static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str, +static BOOL CRYPT_FormatCertSerialNumber(const CRYPT_DATA_BLOB *serialNum, LPWSTR str, DWORD *pcbStr) { return CRYPT_FormatHexStringWithPrefix(serialNum, IDS_CERT_SERIAL_NUMBER, Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Mon Jun 22 23:27:02 2009 @@ -341,7 +341,7 @@ static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, - PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz) + const CERT_NAME_BLOB *pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG;

1 0

[tkreuzer] 41549: winfax: covert to spec
by tkreuzer＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: tkreuzer Date: Mon Jun 22 18:58:08 2009 New Revision: 41549 URL: http://svn.reactos.org/svn/reactos?rev=41549&view=rev Log: winfax: covert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.def (removed) @@ -1,60 +1,0 @@ -LIBRARY winfax.dll - -EXPORTS -FaxAbort@8 @1 -FaxAccessCheck@8 @2 -FaxClose@4 @3 -FaxCompleteJobParamsA@8 @4 -FaxCompleteJobParamsW@8 @5 -FaxConnectFaxServerA@8 @6 -FaxConnectFaxServerW@8 @7 -FaxEnableRoutingMethodA@12 @8 -FaxEnableRoutingMethodW@12 @9 -FaxEnumGlobalRoutingInfoA@12 @10 -FaxEnumGlobalRoutingInfoW@12 @11 -FaxEnumJobsA@12 @12 -FaxEnumJobsW@12 @13 -FaxEnumPortsA@12 @14 -FaxEnumPortsW@12 @15 -FaxEnumRoutingMethodsA@12 @16 -FaxEnumRoutingMethodsW@12 @17 -FaxFreeBuffer@4 @18 -FaxGetConfigurationA@8 @19 -FaxGetConfigurationW@8 @20 -FaxGetDeviceStatusA@8 @21 -FaxGetDeviceStatusW@8 @22 -FaxGetJobA@12 @23 -FaxGetJobW@12 @24 -FaxGetLoggingCategoriesA@12 @25 -FaxGetLoggingCategoriesW@12 @26 -FaxGetPageData@24 @27 -FaxGetPortA@8 @28 -FaxGetPortW@8 @29 -FaxGetRoutingInfoA@16 @30 -FaxGetRoutingInfoW@16 @31 -FaxInitializeEventQueue@20 @32 -FaxOpenPort@16 @33 -FaxPrintCoverPageA@8 @34 -FaxPrintCoverPageW@8 @35 -FaxRegisterRoutingExtensionW@24 @36 -FaxRegisterServiceProviderW@16 @37 -FaxSendDocumentA@20 @38 -FaxSendDocumentForBroadcastA@20 @39 -FaxSendDocumentForBroadcastW@20 @40 -FaxSendDocumentW@20 @41 -FaxSetConfigurationA@8 @42 -FaxSetConfigurationW@8 @43 -FaxSetGlobalRoutingInfoA@8 @44 -FaxSetGlobalRoutingInfoW@8 @45 -FaxSetJobA@16 @46 -FaxSetJobW@16 @47 -FaxSetLoggingCategoriesA@12 @48 -FaxSetLoggingCategoriesW@12 @49 -FaxSetPortA@8 @50 -FaxSetPortW@8 @51 -FaxSetRoutingInfoA@16 @52 -FaxSetRoutingInfoW@16 @53 -FaxStartPrintJobA@16 @54 -FaxStartPrintJobW@16 @55 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] Mon Jun 22 18:58:08 2009 @@ -1,5 +1,5 @@ <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="winfax.def" /> + <importlibrary definition="winfax.spec" /> <include base="winfax">.</include> <library>kernel32</library> <library>ntdll</library> Added: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.spec [iso-8859-1] Mon Jun 22 18:58:08 2009 @@ -1,0 +1,55 @@ +1 stdcall FaxAbort(ptr long) +2 stdcall FaxAccessCheck(ptr long) +3 stdcall FaxClose(ptr) +4 stdcall FaxCompleteJobParamsA(ptr ptr) +5 stdcall FaxCompleteJobParamsW(ptr ptr) +6 stdcall FaxConnectFaxServerA(str ptr) +7 stdcall FaxConnectFaxServerW(wstr ptr) +8 stdcall FaxEnableRoutingMethodA(ptr str long) +9 stdcall FaxEnableRoutingMethodW(ptr wstr long) +10 stdcall FaxEnumGlobalRoutingInfoA(ptr ptr ptr) +11 stdcall FaxEnumGlobalRoutingInfoW(ptr ptr ptr) +12 stdcall FaxEnumJobsA(ptr ptr ptr) +13 stdcall FaxEnumJobsW(ptr ptr ptr) +14 stdcall FaxEnumPortsA(ptr ptr ptr) +15 stdcall FaxEnumPortsW(ptr ptr ptr) +16 stdcall FaxEnumRoutingMethodsA(ptr ptr ptr) +17 stdcall FaxEnumRoutingMethodsW(ptr ptr ptr) +18 stdcall FaxFreeBuffer(ptr) +19 stdcall FaxGetConfigurationA(ptr ptr) +20 stdcall FaxGetConfigurationW(ptr ptr) +21 stdcall FaxGetDeviceStatusA(ptr ptr) +22 stdcall FaxGetDeviceStatusW(ptr ptr) +23 stdcall FaxGetJobA(ptr long ptr) +24 stdcall FaxGetJobW(ptr long ptr) +25 stdcall FaxGetLoggingCategoriesA(ptr ptr ptr) +26 stdcall FaxGetLoggingCategoriesW(ptr ptr ptr) +27 stdcall FaxGetPageData(ptr long ptr ptr ptr ptr) +28 stdcall FaxGetPortA(ptr ptr) +29 stdcall FaxGetPortW(ptr ptr) +30 stdcall FaxGetRoutingInfoA(ptr str ptr ptr) +31 stdcall FaxGetRoutingInfoW(ptr wstr ptr ptr) +32 stdcall FaxInitializeEventQueue(ptr ptr ptr ptr long) +33 stdcall FaxOpenPort(ptr long long ptr) +34 stdcall FaxPrintCoverPageA(ptr ptr) +35 stdcall FaxPrintCoverPageW(ptr ptr) +36 stdcall FaxRegisterRoutingExtensionW(ptr wstr wstr wstr ptr ptr) +37 stdcall FaxRegisterServiceProviderW(wstr wstr wstr wstr) +38 stdcall FaxSendDocumentA(ptr str ptr ptr ptr) +39 stdcall FaxSendDocumentForBroadcastA(ptr str ptr ptr ptr) +40 stdcall FaxSendDocumentForBroadcastW(ptr wstr ptr ptr ptr) +41 stdcall FaxSendDocumentW(ptr wstr ptr ptr ptr) +42 stdcall FaxSetConfigurationA(ptr ptr) +43 stdcall FaxSetConfigurationW(ptr ptr) +44 stdcall FaxSetGlobalRoutingInfoA(ptr ptr) +45 stdcall FaxSetGlobalRoutingInfoW(ptr ptr) +46 stdcall FaxSetJobA(ptr long long ptr) +47 stdcall FaxSetJobW(ptr long long ptr) +48 stdcall FaxSetLoggingCategoriesA(ptr ptr long) +49 stdcall FaxSetLoggingCategoriesW(ptr ptr long) +50 stdcall FaxSetPortA(ptr ptr) +51 stdcall FaxSetPortW(ptr ptr) +52 stdcall FaxSetRoutingInfoA(ptr str ptr long) +53 stdcall FaxSetRoutingInfoW(ptr wstr ptr long) +54 stdcall FaxStartPrintJobA(str ptr ptr ptr) +55 stdcall FaxStartPrintJobW(wstr ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 41548: Allow warnings in win32k for now
by tkreuzer＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: tkreuzer Date: Mon Jun 22 18:17:06 2009 New Revision: 41548 URL: http://svn.reactos.org/svn/reactos?rev=41548&view=rev Log: Allow warnings in win32k for now Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Mon Jun 22 18:17:06 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="win32k_base" type="objectlibrary"> +<module name="win32k_base" type="objectlibrary" allowwarnings="true"> <include base="win32k_base">.</include> <include base="win32k_base">include</include> <include base="win32k_base" root="intermediate">.</include>

1 0

[tkreuzer] 41547: Only export FLOATOBJ_* api on x86
by tkreuzer＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: tkreuzer Date: Mon Jun 22 18:16:20 2009 New Revision: 41547 URL: http://svn.reactos.org/svn/reactos?rev=41547&view=rev Log: Only export FLOATOBJ_* api on x86 Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] Mon Jun 22 18:16:20 2009 @@ -1,9 +1,9 @@ #include "include/reactos/msvctarget.h" -@ stdcall FLOATOBJ_AddFloatObj(ptr ptr) -@ stdcall FLOATOBJ_DivFloatObj(ptr ptr) -@ stdcall FLOATOBJ_MulFloatObj(ptr ptr) -@ stdcall FLOATOBJ_SubFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr) @ stdcall BRUSHOBJ_hGetColorTransform(ptr) @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) @ stdcall BRUSHOBJ_pvGetRbrush(ptr) @@ -147,29 +147,29 @@ @ stdcall EngWaitForSingleObject(ptr ptr) @ stdcall EngWideCharToMultiByte(long ptr long ptr long) @ stdcall EngWritePrinter(ptr ptr long ptr) -@ stdcall FLOATOBJ_Add(ptr ptr) -@ stdcall FLOATOBJ_AddFloat(ptr long) -@ stdcall FLOATOBJ_AddLong(ptr long) -@ stdcall FLOATOBJ_Div(ptr ptr) -@ stdcall FLOATOBJ_DivFloat(ptr long) -@ stdcall FLOATOBJ_DivLong(ptr long) -@ stdcall FLOATOBJ_Equal(ptr ptr) -@ stdcall FLOATOBJ_EqualLong(ptr long) -@ stdcall FLOATOBJ_GetFloat(ptr) -@ stdcall FLOATOBJ_GetLong(ptr) -@ stdcall FLOATOBJ_GreaterThan(ptr ptr) -@ stdcall FLOATOBJ_GreaterThanLong(ptr long) -@ stdcall FLOATOBJ_LessThan(ptr ptr) -@ stdcall FLOATOBJ_LessThanLong(ptr long) -@ stdcall FLOATOBJ_Mul(ptr ptr) -@ stdcall FLOATOBJ_MulFloat(ptr long) -@ stdcall FLOATOBJ_MulLong(ptr long) -@ stdcall FLOATOBJ_Neg(ptr) -@ stdcall FLOATOBJ_SetFloat(ptr long) -@ stdcall FLOATOBJ_SetLong(ptr long) -@ stdcall FLOATOBJ_Sub(ptr ptr) -@ stdcall FLOATOBJ_SubFloat(ptr long) -@ stdcall FLOATOBJ_SubLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_Add(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_AddFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_AddLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_Div(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_DivFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_DivLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_Equal(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_EqualLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_GetFloat(ptr) +@ stdcall -arch=i386 FLOATOBJ_GetLong(ptr) +@ stdcall -arch=i386 FLOATOBJ_GreaterThan(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_GreaterThanLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_LessThan(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_LessThanLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_Mul(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_MulFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_MulLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_Neg(ptr) +@ stdcall -arch=i386 FLOATOBJ_SetFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_SetLong(ptr long) +@ stdcall -arch=i386 FLOATOBJ_Sub(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_SubFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_SubLong(ptr long) @ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) @ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) @ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long)

1 0

[tkreuzer] 41546: Add _FLOATOBJ_GetFix for non-x86
by tkreuzer＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: tkreuzer Date: Mon Jun 22 18:15:35 2009 New Revision: 41546 URL: http://svn.reactos.org/svn/reactos?rev=41546&view=rev Log: Add _FLOATOBJ_GetFix for non-x86 Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/floatobj.h Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/floatobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/floatobj.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/floatobj.h [iso-8859-1] Mon Jun 22 18:15:35 2009 @@ -65,6 +65,7 @@ #define _FLOATOBJ_IsLong(pf) ((FLOAT)((LONG)*(pf)) == *(pf)) #define _FLOATOBJ_Equal0(pf) (*(pf) == 0.) #define _FLOATOBJ_Equal1(pf) (*(pf) == 1.) +#define _FLOATOBJ_GetFix(pf) ((LONG)(*(pf) * 16.)) #define FLOATOBJ_Set0(fo) *(fo) = 0; #define FLOATOBJ_Set1(fo) *(fo) = 1;

1 0

[fireball] 41545: - Remove padding member from ETHREAD, it's not needed anymore after KTHREAD has been fixed.
by fireball＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: fireball Date: Mon Jun 22 18:09:16 2009 New Revision: 41545 URL: http://svn.reactos.org/svn/reactos?rev=41545&view=rev Log: - Remove padding member from ETHREAD, it's not needed anymore after KTHREAD has been fixed. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Mon Jun 22 18:09:16 2009 @@ -1036,7 +1036,6 @@ typedef struct _ETHREAD { KTHREAD Tcb; - PVOID Padding; LARGE_INTEGER CreateTime; union {

1 0

[cwittich] 41544: sync advpack and msi with wine 1.1.24
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Mon Jun 22 18:01:24 2009 New Revision: 41544 URL: http://svn.reactos.org/svn/reactos?rev=41544&view=rev Log: sync advpack and msi with wine 1.1.24 Modified: trunk/reactos/dll/win32/advpack/advpack.spec trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/table.c Modified: trunk/reactos/dll/win32/advpack/advpack.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.spec [iso-8859-1] Mon Jun 22 18:01:24 2009 @@ -17,7 +17,7 @@ @ stdcall ExecuteCabW(ptr ptr ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExtractFilesA(str str long ptr ptr long) -# stdcall ExtractFilesW(wstr wstr long ptr ptr long) +@ stdcall ExtractFilesW(wstr wstr long ptr ptr long) @ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA @ stdcall FileSaveMarkNotExistA(str str str) @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Mon Jun 22 18:01:24 2009 @@ -749,6 +749,44 @@ } /*********************************************************************** + * ExtractFilesW (ADVPACK.@) + * + * Extracts the specified files from a cab archive into + * a destination directory. + * + * PARAMS + * CabName [I] Filename of the cab archive. + * ExpandDir [I] Destination directory for the extracted files. + * Flags [I] Reserved. + * FileList [I] Optional list of files to extract. See NOTES. + * LReserved [I] Reserved. Must be NULL. + * Reserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * FileList is a colon-separated list of filenames. If FileList is + * non-NULL, only the files in the list will be extracted from the + * cab file, otherwise all files will be extracted. Any number of + * spaces, tabs, or colons can be before or after the list, but + * the list itself must only be separated by colons. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, + LPCWSTR FileList, LPVOID LReserved, DWORD Reserved) +{ + + FIXME("(%s, %s, %d, %s, %p, %d) stub!\n", debugstr_w(CabName), debugstr_w(ExpandDir), + Flags, debugstr_w(FileList), LReserved, Reserved); + + return E_FAIL; +} + +/*********************************************************************** * FileSaveMarkNotExistA (ADVPACK.@) * * See FileSaveMarkNotExistW. Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Mon Jun 22 18:01:24 2009 @@ -60,7 +60,7 @@ if (size >= sv->max_streams) { sv->max_streams *= 2; - sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); + sv->streams = msi_realloc_zero(sv->streams, sv->max_streams * sizeof(STREAM *)); if (!sv->streams) return FALSE; } @@ -387,7 +387,7 @@ for (i = 0; i < sv->num_rows; i++) { - if (sv->streams[i]->stream) + if (sv->streams[i] && sv->streams[i]->stream) IStream_Release(sv->streams[i]->stream); msi_free(sv->streams[i]); } @@ -462,7 +462,7 @@ return -1; sv->max_streams = 1; - sv->streams = msi_alloc(sizeof(STREAM *)); + sv->streams = msi_alloc_zero(sizeof(STREAM *)); if (!sv->streams) return -1; Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Mon Jun 22 18:01:24 2009 @@ -73,9 +73,8 @@ struct tagMSITABLE { BYTE **data; + BOOL *data_persistent; UINT row_count; - BYTE **nonpersistent_data; - UINT nonpersistent_row_count; struct list entry; MSICOLUMNINFO *colinfo; UINT col_count; @@ -476,9 +475,7 @@ for( i=0; i<table->row_count; i++ ) msi_free( table->data[i] ); msi_free( table->data ); - for( i=0; i<table->nonpersistent_row_count; i++ ) - msi_free( table->nonpersistent_data[i] ); - msi_free( table->nonpersistent_data ); + msi_free( table->data_persistent ); msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); msi_free( table ); @@ -520,6 +517,9 @@ t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) ); if( !t->data ) goto err; + t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL)); + if ( !t->data_persistent ) + goto err; /* transpose all the data */ TRACE("Transposing data from %d rows\n", t->row_count ); @@ -528,6 +528,7 @@ t->data[i] = msi_alloc( row_size ); if( !t->data[i] ) goto err; + t->data_persistent[i] = TRUE; for( j=0; j<t->col_count; j++ ) { @@ -634,8 +635,7 @@ table->ref_count = 1; table->row_count = 0; table->data = NULL; - table->nonpersistent_row_count = 0; - table->nonpersistent_data = NULL; + table->data_persistent = NULL; table->colinfo = NULL; table->col_count = 0; table->persistent = persistent; @@ -783,8 +783,7 @@ table->row_count = 0; table->data = NULL; - table->nonpersistent_row_count = 0; - table->nonpersistent_data = NULL; + table->data_persistent = NULL; table->colinfo = NULL; table->col_count = 0; table->persistent = MSICONDITION_TRUE; @@ -833,12 +832,17 @@ goto err; } + rawsize = 0; p = rawdata; for( i=0; i<t->col_count; i++ ) { for( j=0; j<t->row_count; j++ ) { UINT offset = t->colinfo[i].offset; + + if (!t->data_persistent[j]) continue; + if (i == 0) + rawsize += row_size; *p++ = t->data[j][offset]; *p++ = t->data[j][offset + 1]; @@ -1087,11 +1091,6 @@ if( table->data[ i ][ 0 ] == table_id ) return TRUE; - count = table->nonpersistent_row_count; - for( i=0; i<count; i++ ) - if( table->nonpersistent_data[ i ][ 0 ] == table_id ) - return TRUE; - return FALSE; } @@ -1113,7 +1112,6 @@ { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT offset, n; - BYTE **data; if( !tv->table ) return ERROR_INVALID_PARAMETER; @@ -1122,7 +1120,7 @@ return ERROR_INVALID_PARAMETER; /* how many rows are there ? */ - if( row >= tv->table->row_count + tv->table->nonpersistent_row_count ) + if( row >= tv->table->row_count ) return ERROR_NO_MORE_ITEMS; if( tv->columns[col-1].offset >= tv->row_size ) @@ -1135,14 +1133,6 @@ if (tv->order) row = tv->order->reorder[row]; - if (row >= tv->table->row_count) - { - row -= tv->table->row_count; - data = tv->table->nonpersistent_data; - } - else - data = tv->table->data; - n = bytes_per_column( tv->db, &tv->columns[col-1] ); if (n != 2 && n != 3 && n != 4) { @@ -1151,7 +1141,7 @@ } offset = tv->columns[col-1].offset; - *val = read_table_int(data, row, offset, n); + *val = read_table_int(tv->table->data, row, offset, n); /* TRACE("Data [%d][%d] = %d\n", row, col, *val ); */ @@ -1277,7 +1267,6 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) { UINT offset, n, i; - BYTE **data; if( !tv->table ) return ERROR_INVALID_PARAMETER; @@ -1285,7 +1274,7 @@ if( (col==0) || (col>tv->num_cols) ) return ERROR_INVALID_PARAMETER; - if( row >= tv->table->row_count + tv->table->nonpersistent_row_count ) + if( row >= tv->table->row_count ) return ERROR_INVALID_PARAMETER; if( tv->columns[col-1].offset >= tv->row_size ) @@ -1298,14 +1287,6 @@ msi_free( tv->columns[col-1].hash_table ); tv->columns[col-1].hash_table = NULL; - if (row >= tv->table->row_count) - { - row -= tv->table->row_count; - data = tv->table->nonpersistent_data; - } - else - data = tv->table->data; - n = bytes_per_column( tv->db, &tv->columns[col-1] ); if ( n != 2 && n != 3 && n != 4 ) { @@ -1315,7 +1296,7 @@ offset = tv->columns[col-1].offset; for ( i = 0; i < n; i++ ) - data[row][offset + i] = (val >> i * 8) & 0xff; + tv->table->data[row][offset + i] = (val >> i * 8) & 0xff; return ERROR_SUCCESS; } @@ -1393,9 +1374,8 @@ if ( !(mask&(1<<i)) ) continue; - /* if row >= tv->table->row_count then it is a non-persistent row */ persistent = (tv->table->persistent != MSICONDITION_FALSE) && - (row < tv->table->row_count); + (tv->table->data_persistent[row]); /* FIXME: should we allow updating keys? */ val = 0; @@ -1469,8 +1449,10 @@ { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; BYTE **p, *row; + BOOL *b; UINT sz; BYTE ***data_ptr; + BOOL **data_persist_ptr; UINT *row_count; TRACE("%p %s\n", view, temporary ? "TRUE" : "FALSE"); @@ -1482,20 +1464,11 @@ if( !row ) return ERROR_NOT_ENOUGH_MEMORY; - if( temporary ) - { - row_count = &tv->table->nonpersistent_row_count; - data_ptr = &tv->table->nonpersistent_data; - if (*num == -1) - *num = tv->table->row_count + tv->table->nonpersistent_row_count; - } - else - { - row_count = &tv->table->row_count; - data_ptr = &tv->table->data; - if (*num == -1) - *num = tv->table->row_count; - } + row_count = &tv->table->row_count; + data_ptr = &tv->table->data; + data_persist_ptr = &tv->table->data_persistent; + if (*num == -1) + *num = tv->table->row_count; sz = (*row_count + 1) * sizeof (BYTE*); if( *data_ptr ) @@ -1508,8 +1481,24 @@ return ERROR_NOT_ENOUGH_MEMORY; } + sz = (*row_count + 1) * sizeof (BOOL); + if( *data_persist_ptr ) + b = msi_realloc( *data_persist_ptr, sz ); + else + b = msi_alloc( sz ); + if( !b ) + { + msi_free( row ); + msi_free( p ); + return ERROR_NOT_ENOUGH_MEMORY; + } + *data_ptr = p; (*data_ptr)[*row_count] = row; + + *data_persist_ptr = b; + (*data_persist_ptr)[*row_count] = !temporary; + (*row_count)++; return ERROR_SUCCESS; @@ -1545,7 +1534,7 @@ { if( !tv->table ) return ERROR_INVALID_PARAMETER; - *rows = tv->table->row_count + tv->table->nonpersistent_row_count; + *rows = tv->table->row_count; } return ERROR_SUCCESS; @@ -1620,8 +1609,7 @@ static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - UINT i, r, idx, size; - BYTE **data; + UINT i, r; TRACE("%p %p %s\n", tv, rec, temporary ? "TRUE" : "FALSE" ); @@ -1635,27 +1623,16 @@ if( r != ERROR_SUCCESS ) return r; - idx = row; - if( temporary ) - { - data = tv->table->nonpersistent_data; - size = tv->table->nonpersistent_row_count; - idx -= tv->table->row_count; - } - else - { - data = tv->table->data; - size = tv->table->row_count; - } - /* shift the rows to make room for the new row */ - if( idx != size - 1 ) - { - for (i = 1; i < size - idx; i++) - memmove(&(data[size - i][0]), - &(data[size - i - 1][0]), tv->row_size); - } - + for (i = tv->table->row_count - 1; i > row; i--) + { + memmove(&(tv->table->data[i][0]), + &(tv->table->data[i - 1][0]), tv->row_size); + tv->table->data_persistent[i] = tv->table->data_persistent[i - 1]; + } + + /* Re-set the persistence flag */ + tv->table->data_persistent[row] = !temporary; return TABLE_set_row( view, row, rec, (1<<tv->num_cols) - 1 ); } @@ -1663,7 +1640,6 @@ { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT r, num_rows, num_cols, i; - BYTE **data; TRACE("%p %d\n", tv, row); @@ -1677,19 +1653,8 @@ if ( row >= num_rows ) return ERROR_FUNCTION_FAILED; - if ( row < tv->table->row_count ) - { - num_rows = tv->table->row_count; - tv->table->row_count--; - data = tv->table->data; - } - else - { - num_rows = tv->table->nonpersistent_row_count; - row -= tv->table->row_count; - tv->table->nonpersistent_row_count--; - data = tv->table->nonpersistent_data; - } + num_rows = tv->table->row_count; + tv->table->row_count--; /* reset the hash tables */ for (i = 0; i < tv->num_cols; i++) @@ -1702,7 +1667,10 @@ return ERROR_SUCCESS; for (i = row + 1; i < num_rows; i++) - memcpy(data[i - 1], data[i], tv->row_size); + { + memcpy(tv->table->data[i - 1], tv->table->data[i], tv->row_size); + tv->table->data_persistent[i - 1] = tv->table->data_persistent[i]; + } return ERROR_SUCCESS; } @@ -1856,7 +1824,7 @@ if( !tv->columns[col-1].hash_table ) { UINT i; - UINT num_rows = tv->table->row_count + tv->table->nonpersistent_row_count; + UINT num_rows = tv->table->row_count; MSICOLUMNHASHENTRY **hash_table; MSICOLUMNHASHENTRY *new_entry; @@ -2625,7 +2593,7 @@ data = msi_record_to_row( tv, rec ); if( !data ) return r; - for( i = 0; i < tv->table->row_count + tv->table->nonpersistent_row_count; i++ ) + for( i = 0; i < tv->table->row_count; i++ ) { r = msi_row_matches( tv, i, data ); if( r == ERROR_SUCCESS )

1 0

[cwittich] 41543: sync jscript_winetest with wine 1.1.24
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Mon Jun 22 17:51:31 2009 New Revision: 41543 URL: http://svn.reactos.org/svn/reactos?rev=41543&view=rev Log: sync jscript_winetest with wine 1.1.24 Modified: trunk/rostests/winetests/jscript/api.js Modified: trunk/rostests/winetests/jscript/api.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/api.js?… ============================================================================== --- trunk/rostests/winetests/jscript/api.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/api.js [iso-8859-1] Mon Jun 22 17:51:31 2009 @@ -945,6 +945,62 @@ ok(date.setTime("123", NaN) === 123, "date.setTime(\"123\") !== 123"); ok(isNaN(date.setTime(NaN)), "date.setTime(NaN) is not NaN"); +ok(date.setTime(0) === date.getTime(), "date.setTime(0) !== date.getTime()"); +ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); +ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); +ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); +ok(date.getUTCMinutes() === 0, "date.getUTCMinutes() = " + date.getUTCMinutes()); +ok(date.getUTCSeconds() === 0, "date.getUTCSeconds() = " + date.getUTCSeconds()); +ok(date.getUTCMilliseconds() === 0, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); +date.setTime(60*24*60*60*1000); +ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); +ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCDate() === 2, "date.getUTCDate() = " + date.getUTCDate()); +ok(date.getUTCDay() === 1, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); +ok(date.getUTCMinutes() === 0, "date.getUTCMinutes() = " + date.getUTCMinutes()); +ok(date.getUTCSeconds() === 0, "date.getUTCSeconds() = " + date.getUTCSeconds()); +ok(date.getUTCMilliseconds() === 0, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); +date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000 + 60*60*1000 + 2*60*1000 + 2*1000 + 640); +ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); +ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCDate() === 28, "date.getUTCDate() = " + date.getUTCDate()); +ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 1, "date.getUTCHours() = " + date.getUTCHours()); +ok(date.getUTCMinutes() === 2, "date.getUTCMinutes() = " + date.getUTCMinutes()); +ok(date.getUTCSeconds() === 2, "date.getUTCSeconds() = " + date.getUTCSeconds()); +ok(date.getUTCMilliseconds() === 640, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); +date.setTime(Infinity); +ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); +ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); +ok(isNaN(date.getUTCDate()), "date.getUTCDate() is not NaN"); +ok(isNaN(date.getUTCDay()), "date.getUTCDay() is not NaN"); +ok(isNaN(date.getUTCHours()), "date.getUTCHours() is not NaN"); +ok(isNaN(date.getUTCMinutes()), "date.getUTCMinutes() is not NaN"); +ok(isNaN(date.getUTCSeconds()), "date.getUTCSeconds() is not NaN"); +ok(isNaN(date.getUTCMilliseconds()), "date.getUTCMilliseconds() is not NaN"); +ok(isNaN(date.setMilliseconds(0)), "date.setMilliseconds() is not NaN"); + +date.setTime(0); +date.setMilliseconds(-10, 2); +ok(date.getUTCMilliseconds() === 990, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); +ok(date.setMilliseconds(10) === date.setUTCMilliseconds(10), "date.setUTCMilliseconds(10) !== date.setUTCMilliseconds(10)"); +date.setSeconds(-10); +ok(date.getUTCSeconds() === 50, "date.getUTCSeconds() = " + date.getUTCSeconds()); +ok(date.setSeconds(10) === date.setUTCSeconds(10), "date.setUTCSeconds(10) !== date.setUTCSeconds(10)"); +date.setMinutes(-10); +ok(date.getUTCMinutes() === 50, "date.getUTCMinutes() = " + date.getUTCMinutes()); +ok(date.setMinutes(10) === date.setUTCMinutes(10), "date.setUTCMinutes(10) !== date.setUTCMinutes(10)"); +date.setUTCHours(-10); +ok(date.getUTCHours() === 14, "date.getUTCHours() = " + date.getUTCHours()); +date.setUTCHours(-123); +ok(date.getTime() === -614989990, "date.getTime() = " + date.getTime()); +date.setHours(20); +ok(date.getHours() === 20, "date.getHours() = " + date.getHours()); + ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test";

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