Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[cwittich] 42505: fix rc files
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 12:48:08 2009 New Revision: 42505 URL: http://svn.reactos.org/svn/reactos?rev=42505&view=rev Log: fix rc files Modified: trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.rbuild Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -247,3 +247,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas implÃ©mentÃ©e" STRING_MAX_TAB_STOPS, "Impossible d'ajouter plus de 32 taquets de tabulation." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -247,3 +247,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "ããªã³ããå®è£ããã¦ãã¾ããã" STRING_MAX_TAB_STOPS, "32ä»¥ä¸ãªã¿ããè¿½å ã§ãã¾ããã" END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Lt.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -247,3 +247,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Spausdinimas nerealizuotas" STRING_MAX_TAB_STOPS, "Negalima pridÄti daugiau negu 32-jÅ³ tabuliavimo pozicijÅ³." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -246,3 +246,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Utskriftfunksjonen er ikke laget ennÃ¥." STRING_MAX_TAB_STOPS, "Kan ikke legge til mer enn 32 tabulatorstopp." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -248,3 +248,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "ImpressÃ£o nÃ£o implementada" STRING_MAX_TAB_STOPS, "NÃ£o pode adicionar mais de 32 tabs." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -246,3 +246,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." STRING_MAX_TAB_STOPS, "Kan ej lÃ¤gga till mer Ã¤n 32 tabbstopp." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -60,3 +60,20 @@ /* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" + +#include "Da.rc" +#include "De.rc" +#include "En.rc" +#include "Fr.rc" +#include "Hu.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Nl.rc" +#include "No.rc" +#include "Pl.rc" +#include "Pt.rc" +#include "Ru.rc" +#include "Si.rc" +#include "Sv.rc" +#include "Tr.rc" +#include "Zh.rc" Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Sat Aug 8 12:48:08 2009 @@ -13,22 +13,5 @@ <file>print.c</file> <file>registry.c</file> <file>wordpad.c</file> - <file>Da.rc</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Fr.rc</file> - <file>Hu.rc</file> - <file>Ja.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> - <file>Sv.rc</file> - <file>Tr.rc</file> - <file>Zh.rc</file> <file>rsrc.rc</file> </module>

1 0

[cwittich] 42504: partial revert of r41765
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 12:22:51 2009 New Revision: 42504 URL: http://svn.reactos.org/svn/reactos?rev=42504&view=rev Log: partial revert of r41765 Added: trunk/reactos/dll/win32/crypt32/crypt32.rc - copied, changed from r41764, trunk/reactos/dll/win32/crypt32/crypt32.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Sat Aug 8 12:22:51 2009 @@ -35,15 +35,7 @@ <file>str.c</file> <file>ctl.c</file> <file>message.c</file> - <file>crypt32_De.rc</file> - <file>crypt32_En.rc</file> - <file>crypt32_Fr.rc</file> - <file>crypt32_Ko.rc</file> - <file>crypt32_Nl.rc</file> - <file>crypt32_No.rc</file> - <file>crypt32_Pt.rc</file> - <file>crypt32_Ro.rc</file> - <file>crypt32_Sv.rc</file> + <file>crypt32.rc</file> <file>version.rc</file>  <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> Copied: trunk/reactos/dll/win32/crypt32/crypt32.rc (from r41764, trunk/reactos/dll/win32/crypt32/crypt32.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] Sat Aug 8 12:22:51 2009 @@ -31,4 +31,5 @@ #include "crypt32_Nl.rc" #include "crypt32_No.rc" #include "crypt32_Pt.rc" +#include "crypt32_Ro.rc" #include "crypt32_Sv.rc" 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] Sat Aug 8 12:22:51 2009 @@ -241,3 +241,4 @@ IDS_NETSCAPE_SMIME_CA "AC S/MIME" IDS_NETSCAPE_SIGN_CA "Signature CA" } +#pragma code_page(default)

1 0

[cwittich] 42503: partial revert of r41770
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 12:18:41 2009 New Revision: 42503 URL: http://svn.reactos.org/svn/reactos?rev=42503&view=rev Log: partial revert of r41770 Modified: trunk/reactos/dll/win32/localui/localui.h trunk/reactos/dll/win32/localui/localui.rbuild trunk/reactos/dll/win32/localui/localui.rc trunk/reactos/dll/win32/localui/ui_Da.rc trunk/reactos/dll/win32/localui/ui_De.rc trunk/reactos/dll/win32/localui/ui_En.rc trunk/reactos/dll/win32/localui/ui_Fr.rc trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/ui_Lt.rc trunk/reactos/dll/win32/localui/ui_Nl.rc trunk/reactos/dll/win32/localui/ui_No.rc trunk/reactos/dll/win32/localui/ui_Pl.rc trunk/reactos/dll/win32/localui/ui_Pt.rc trunk/reactos/dll/win32/localui/ui_Ro.rc trunk/reactos/dll/win32/localui/ui_Ru.rc trunk/reactos/dll/win32/localui/ui_Si.rc trunk/reactos/dll/win32/localui/ui_Sv.rc trunk/reactos/dll/win32/localui/ui_Zh.rc Modified: trunk/reactos/dll/win32/localui/localui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -21,8 +21,6 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__ -#include <windef.h> -#include <winuser.h> /* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 Modified: trunk/reactos/dll/win32/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -8,21 +8,6 @@ <define name="__WINESRC__" /> <file>localui.c</file> <file>localui.rc</file> - <file>ui_Da.rc</file> - <file>ui_De.rc</file> - <file>ui_En.rc</file> - <file>ui_Fr.rc</file> - <file>ui_Ko.rc</file> - <file>ui_Lt.rc</file> - <file>ui_Nl.rc</file> - <file>ui_No.rc</file> - <file>ui_Pl.rc</file> - <file>ui_Pt.rc</file> - <file>ui_Ro.rc</file> - <file>ui_Ru.rc</file> - <file>ui_Si.rc</file> - <file>ui_Sv.rc</file> - <file>ui_Zh.rc</file> <library>wine</library> <library>winspool</library> <library>user32</library> Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -19,6 +19,10 @@ * */ +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" #include "localui.h" #define WINE_FILENAME_STR "localui.dll" @@ -32,3 +36,20 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" + + +#include "ui_Da.rc" +#include "ui_De.rc" +#include "ui_En.rc" +#include "ui_Fr.rc" +#include "ui_Ko.rc" +#include "ui_Lt.rc" +#include "ui_Nl.rc" +#include "ui_No.rc" +#include "ui_Pl.rc" +#include "ui_Pt.rc" +#include "ui_Ro.rc" +#include "ui_Ru.rc" +#include "ui_Si.rc" +#include "ui_Sv.rc" +#include "ui_Zh.rc" Modified: trunk/reactos/dll/win32/localui/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Da.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_De.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_En.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Fr.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,9 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" - #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -56,3 +53,5 @@ IDS_PORTEXISTS "Le port %s existe dÃ©jÃ " IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" } + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Lt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -57,3 +57,4 @@ IDS_PORTEXISTS "Prievadas %s jau egzistuoja" IDS_NOTHINGTOCONFIG "Å is prievadas neturi parinkÄiÅ³ konfigÅ«ravimui" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Nl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_No.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/localui/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ro.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -55,3 +53,5 @@ IDS_PORTEXISTS "Portul %s existsÄ deja" IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" } + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ru.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Si.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" #pragma code_page(65001) @@ -56,3 +54,5 @@ IDS_PORTEXISTS "Vrata z imenom %s Å¾e obstajajo" IDS_NOTHINGTOCONFIG "Ta vrata nimajo moÅ¾nosti nastavitve" } + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Sv.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -92,3 +90,5 @@ IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" IDS_NOTHINGTOCONFIG "éåç«¯å£æ²æå¯è¨å®é¸é " } + +#pragma code_page(default)

1 0

[cwittich] 42502: partial revert of r41768
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 12:14:13 2009 New Revision: 42502 URL: http://svn.reactos.org/svn/reactos?rev=42502&view=rev Log: partial revert of r41768 Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Sat Aug 8 12:14:13 2009 @@ -10,11 +10,6 @@ <define name="_WINE" /> <file>main.c</file> <file>cryptui.rc</file> - <file>cryptui_De.rc</file> - <file>cryptui_En.rc</file> - <file>cryptui_Fr.rc</file> - <file>cryptui_Ko.rc</file> - <file>cryptui_Nl.rc</file> <library>wine</library> <library>kernel32</library> <library>user32</library> 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] Sat Aug 8 12:14:13 2009 @@ -17,6 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "commctrl.h" +#include "dlgs.h" #include "cryptuires.h" @@ -40,3 +45,9 @@ /* @makedep: certheader.bmp */ IDB_CERT_HEADER BITMAP LOADONCALL DISCARDABLE certheader.bmp + +#include "cryptui_De.rc" +#include "cryptui_En.rc" +#include "cryptui_Fr.rc" +#include "cryptui_Ko.rc" +#include "cryptui_Nl.rc" Modified: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] Sat Aug 8 12:14:13 2009 @@ -464,3 +464,4 @@ LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 END +#pragma code_page(default)

1 0

[cwittich] 42501: partial revert of r41766
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 12:09:14 2009 New Revision: 42501 URL: http://svn.reactos.org/svn/reactos?rev=42501&view=rev Log: partial revert of r41766 Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc - copied, changed from r41765, trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild [iso-8859-1] Sat Aug 8 12:09:14 2009 @@ -15,11 +15,5 @@ <library>wintrust</library> <library>ntdll</library> <file>main.c</file> - <file>cryptdlg_De.rc</file> - <file>cryptdlg_En.rc</file> - <file>cryptdlg_Fr.rc</file> - <file>cryptdlg_Ko.rc</file> - <file>cryptdlg_Lt.rc</file> - <file>cryptdlg_Nl.rc</file> - <file>cryptdlg_Ro.rc</file> + <file>cryptdlg.rc</file> </module> Copied: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc (from r41765, 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] Sat Aug 8 12:09:14 2009 @@ -26,4 +26,6 @@ #include "cryptdlg_En.rc" #include "cryptdlg_Fr.rc" #include "cryptdlg_Ko.rc" +#include "cryptdlg_Lt.rc" #include "cryptdlg_Nl.rc" +#include "cryptdlg_Ro.rc"

1 0

[pschweitzer] 42500: Sync pierre-fsd to trunk 34100 First step into sync process (kind of test)
by pschweitzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: pschweitzer Date: Sat Aug 8 12:02:03 2009 New Revision: 42500 URL: http://svn.reactos.org/svn/reactos?rev=42500&view=rev Log: Sync pierre-fsd to trunk 34100 First step into sync process (kind of test) Modified: branches/pierre-fsd/ (props changed) branches/pierre-fsd/base/applications/cmdutils/xcopy/Da.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/De.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/En.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/Fr.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/Ko.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/Nl.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/No.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/Pl.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/Ru.rc branches/pierre-fsd/base/applications/cmdutils/xcopy/Si.rc branches/pierre-fsd/base/applications/winhlp32/lang/bg-BG.rc branches/pierre-fsd/base/applications/winhlp32/lang/cs-CZ.rc branches/pierre-fsd/base/applications/winhlp32/lang/da-DK.rc branches/pierre-fsd/base/applications/winhlp32/lang/de-DE.rc branches/pierre-fsd/base/applications/winhlp32/lang/el-GR.rc branches/pierre-fsd/base/applications/winhlp32/lang/en-US.rc branches/pierre-fsd/base/applications/winhlp32/lang/eo-EO.rc branches/pierre-fsd/base/applications/winhlp32/lang/es-ES.rc branches/pierre-fsd/base/applications/winhlp32/lang/fi-FI.rc branches/pierre-fsd/base/applications/winhlp32/lang/fr-FR.rc branches/pierre-fsd/base/applications/winhlp32/lang/hu-HU.rc branches/pierre-fsd/base/applications/winhlp32/lang/it-IT.rc branches/pierre-fsd/base/applications/winhlp32/lang/ko-KR.rc branches/pierre-fsd/base/applications/winhlp32/lang/lt-LT.rc branches/pierre-fsd/base/applications/winhlp32/lang/nb-NO.rc branches/pierre-fsd/base/applications/winhlp32/lang/nl-NL.rc branches/pierre-fsd/base/applications/winhlp32/lang/pl-PL.rc branches/pierre-fsd/base/applications/winhlp32/lang/pt-BR.rc branches/pierre-fsd/base/applications/winhlp32/lang/rm-RM.rc branches/pierre-fsd/base/applications/winhlp32/lang/ru-RU.rc branches/pierre-fsd/base/applications/winhlp32/lang/sk-SK.rc branches/pierre-fsd/base/applications/winhlp32/lang/sl-SI.rc branches/pierre-fsd/base/applications/winhlp32/lang/sv-SE.rc branches/pierre-fsd/base/applications/winhlp32/lang/tr-TR.rc branches/pierre-fsd/base/applications/winhlp32/lang/uk-UA.rc branches/pierre-fsd/base/applications/winhlp32/lang/wa-WA.rc branches/pierre-fsd/base/applications/winhlp32/lang/zh-CN.rc branches/pierre-fsd/base/applications/winhlp32/winhelp.c branches/pierre-fsd/base/applications/winhlp32/winhelp_res.h branches/pierre-fsd/base/applications/wordpad/Da.rc branches/pierre-fsd/base/applications/wordpad/De.rc branches/pierre-fsd/base/applications/wordpad/En.rc branches/pierre-fsd/base/applications/wordpad/Fr.rc branches/pierre-fsd/base/applications/wordpad/Hu.rc branches/pierre-fsd/base/applications/wordpad/Ko.rc branches/pierre-fsd/base/applications/wordpad/Nl.rc branches/pierre-fsd/base/applications/wordpad/No.rc branches/pierre-fsd/base/applications/wordpad/Pl.rc branches/pierre-fsd/base/applications/wordpad/Ru.rc branches/pierre-fsd/base/applications/wordpad/Si.rc branches/pierre-fsd/base/applications/wordpad/Tr.rc branches/pierre-fsd/base/applications/wordpad/registry.c branches/pierre-fsd/base/applications/wordpad/wordpad.c branches/pierre-fsd/base/system/smss/initmv.c branches/pierre-fsd/boot/freeldr/freeldr/arch/arm/loader.c branches/pierre-fsd/dll/ntdll/csr/connect.c branches/pierre-fsd/dll/win32/kernel32/process/job.c branches/pierre-fsd/dll/win32/user32/misc/desktop.c branches/pierre-fsd/dll/win32/user32/misc/winsta.c branches/pierre-fsd/drivers/storage/class/cdrom/cdrom.c branches/pierre-fsd/hal/halarm/generic/hal.c branches/pierre-fsd/ntoskrnl/config/arm/cmhardwr.c branches/pierre-fsd/ntoskrnl/ex/fastinterlck.c branches/pierre-fsd/ntoskrnl/ex/pushlock.c branches/pierre-fsd/ntoskrnl/ke/arm/stubs.c branches/pierre-fsd/ntoskrnl/ke/arm/trapc.c branches/pierre-fsd/subsystems/win32/win32k/ntuser/desktop.c branches/pierre-fsd/subsystems/win32/win32k/objects/dc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/cm… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/rm-RM.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wi… Modified: branches/pierre-fsd/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/applications/wo… Modified: branches/pierre-fsd/base/system/smss/initmv.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/system/smss/ini… Modified: branches/pierre-fsd/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/boot/freeldr/freeldr… Modified: branches/pierre-fsd/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/ntdll/csr/connec… Modified: branches/pierre-fsd/dll/win32/kernel32/process/job.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/kernel32/p… Modified: branches/pierre-fsd/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/user32/mis… Modified: branches/pierre-fsd/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/user32/mis… Modified: branches/pierre-fsd/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/storage/clas… Modified: branches/pierre-fsd/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/hal/halarm/generic/h… Modified: branches/pierre-fsd/ntoskrnl/config/arm/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/config/arm/… Modified: branches/pierre-fsd/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ex/fastinte… Modified: branches/pierre-fsd/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ex/pushlock… Modified: branches/pierre-fsd/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ke/arm/stub… Modified: branches/pierre-fsd/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ke/arm/trap… Modified: branches/pierre-fsd/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/win… Modified: branches/pierre-fsd/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/win…

1 0

[pschweitzer] 42499: Include header where needed
by pschweitzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: pschweitzer Date: Sat Aug 8 11:49:27 2009 New Revision: 42499 URL: http://svn.reactos.org/svn/reactos?rev=42499&view=rev Log: Include header where needed Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/fs_rec/udfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Sat Aug 8 11:49:27 2009 @@ -13,8 +13,6 @@ #include <ntifs.h> #include <ntdddisk.h> #include <ntddcdrm.h> - -#include "udfs.h" // // Tag for memory allocations Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] Sat Aug 8 11:49:27 2009 @@ -12,6 +12,8 @@ #include "fs_rec.h" #define NDEBUG #include <debug.h> + +#include "udfs.h" /* FUNCTIONS ****************************************************************/

1 0

[cwittich] 42498: -sync wrc to wine 1.1.27 -apply a patch from Marcus Meissner to fix reading from stdin (broken in current wine)
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 11:09:37 2009 New Revision: 42498 URL: http://svn.reactos.org/svn/reactos?rev=42498&view=rev Log: -sync wrc to wine 1.1.27 -apply a patch from Marcus Meissner to fix reading from stdin (broken in current wine) Modified: trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.tab.h trunk/reactos/tools/wrc/parser.y trunk/reactos/tools/wrc/readres.c trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/utils.h trunk/reactos/tools/wrc/wrc.c trunk/reactos/tools/wrc/writeres.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=424… Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=424… Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… Modified: trunk/reactos/tools/wrc/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.h?rev… Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=424… Modified: trunk/reactos/tools/wrc/readres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/readres.c?rev=42… Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=4249… Modified: trunk/reactos/tools/wrc/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.h?rev=4249… Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=42498&… Modified: trunk/reactos/tools/wrc/writeres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/writeres.c?rev=4…

1 0

[cwittich] 42497: sync jscript_winetest with wine 1.1.27
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 09:34:31 2009 New Revision: 42497 URL: http://svn.reactos.org/svn/reactos?rev=42497&view=rev Log: sync jscript_winetest with wine 1.1.27 Modified: trunk/rostests/winetests/jscript/api.js trunk/rostests/winetests/jscript/lang.js trunk/rostests/winetests/jscript/regexp.js trunk/rostests/winetests/jscript/run.c 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] Sat Aug 8 09:34:31 2009 @@ -60,6 +60,22 @@ tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); +(tmp = new Array).f = Object.prototype.toString; +ok(tmp.f() === "[object Array]", "tmp.f() = " + tmp.f()); +(tmp = new Boolean).f = Object.prototype.toString; +ok(tmp.f() === "[object Boolean]", "tmp.f() = " + tmp.f()); +(tmp = new Date).f = Object.prototype.toString; +ok(tmp.f() === "[object Date]", "tmp.f() = " + tmp.f()); +(tmp = function() {}).f = Object.prototype.toString; +ok(tmp.f() === "[object Function]", "tmp.f() = " + tmp.f()); +Math.f = Object.prototype.toString; +ok(Math.f() === "[object Math]", "tmp.f() = " + tmp.f()); +(tmp = new Number).f = Object.prototype.toString; +ok(tmp.f() === "[object Number]", "tmp.f() = " + tmp.f()); +(tmp = new RegExp("")).f = Object.prototype.toString; +ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); +(tmp = new String).f = Object.prototype.toString; +ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length); @@ -269,6 +285,19 @@ tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "".anchor(); +ok(tmp === "<A NAME=\"undefined\"></A>", "''.anchor() = " + tmp); +tmp = "".anchor(3); +ok(tmp === "<A NAME=\"3\"></A>", "''.anchor(3) = " + tmp); +tmp = "".anchor("red"); +ok(tmp === "<A NAME=\"red\"></A>", "''.anchor('red') = " + tmp); +tmp = "test".anchor(); +ok(tmp === "<A NAME=\"undefined\">test</A>", "'test'.anchor() = " + tmp); +tmp = "test".anchor(3); +ok(tmp === "<A NAME=\"3\">test</A>", "'test'.anchor(3) = " + tmp); +tmp = "test".anchor("green"); +ok(tmp === "<A NAME=\"green\">test</A>", "'test'.anchor('green') = " + tmp); + tmp = "".big(); ok(tmp === "<BIG></BIG>", "''.big() = " + tmp); tmp = "".big(3); @@ -305,6 +334,35 @@ tmp = "test".fixed(3); ok(tmp === "<TT>test</TT>", "'test'.fixed(3) = " + tmp); +tmp = "".fontcolor(); +ok(tmp === "", "''.fontcolor() = " + tmp); +tmp = "".fontcolor(3); +ok(tmp === "", "''.fontcolor(3) = " + tmp); +tmp = "".fontcolor("red"); +ok(tmp === "", "''.fontcolor('red') = " + tmp); +tmp = "test".fontcolor(); +ok(tmp === "test", "'test'.fontcolor() = " + tmp); +tmp = "test".fontcolor(3); +ok(tmp === "test", "'test'.fontcolor(3) = " + tmp); +tmp = "test".fontcolor("green"); +ok(tmp === "test", "'test'.fontcolor('green') = " + tmp); + +tmp = "".fontsize(); +ok(tmp === "", "''.fontsize() = " + tmp); +tmp = "".fontsize(3); +ok(tmp === "", "''.fontsize(3) = " + tmp); +tmp = "".fontsize("red"); +ok(tmp === "", "''.fontsize('red') = " + tmp); +tmp = "test".fontsize(); +ok(tmp === "test", "'test'.fontsize() = " + tmp); +tmp = "test".fontsize(3); +ok(tmp === "test", "'test'.fontsize(3) = " + tmp); +tmp = "test".fontsize("green"); +ok(tmp === "test", "'test'.fontsize('green') = " + tmp); + +tmp = ("".fontcolor()).fontsize(); +ok(tmp === "", "(''.fontcolor()).fontsize() = " + tmp); + tmp = "".italics(); ok(tmp === "", "''.italics() = " + tmp); tmp = "".italics(3); @@ -314,6 +372,19 @@ tmp = "test".italics(3); ok(tmp === "test", "'test'.italics(3) = " + tmp); +tmp = "".link(); +ok(tmp === "<A HREF=\"undefined\"></A>", "''.link() = " + tmp); +tmp = "".link(3); +ok(tmp === "<A HREF=\"3\"></A>", "''.link(3) = " + tmp); +tmp = "".link("red"); +ok(tmp === "<A HREF=\"red\"></A>", "''.link('red') = " + tmp); +tmp = "test".link(); +ok(tmp === "<A HREF=\"undefined\">test</A>", "'test'.link() = " + tmp); +tmp = "test".link(3); +ok(tmp === "<A HREF=\"3\">test</A>", "'test'.link(3) = " + tmp); +tmp = "test".link("green"); +ok(tmp === "<A HREF=\"green\">test</A>", "'test'.link('green') = " + tmp); + tmp = "".small(); ok(tmp === "", "''.small() = " + tmp); tmp = "".small(3); @@ -349,6 +420,13 @@ ok(tmp === "test", "'test'.sup() = " + tmp); tmp = "test".sup(3); ok(tmp === "test", "'test'.sup(3) = " + tmp); + +ok(String.fromCharCode() === "", "String.fromCharCode() = " + String.fromCharCode()); +ok(String.fromCharCode(65,"66",67) === "ABC", "String.fromCharCode(65,'66',67) = " + String.fromCharCode(65,"66",67)); +ok(String.fromCharCode(1024*64+65, -1024*64+65) === "AA", + "String.fromCharCode(1024*64+65, -1024*64+65) = " + String.fromCharCode(1024*64+65, -1024*64+65)); +ok(String.fromCharCode(65, NaN, undefined).length === 3, + "String.fromCharCode(65, NaN, undefined).length = " + String.fromCharCode(65, NaN, undefined).length); var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); @@ -439,6 +517,19 @@ for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr = ["1", "2", "3"]; +arr.length = 1; +ok(arr.length === 1, "arr.length = " + arr.length); +arr.length = 3; +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "1,,", "arr.toString() = " + arr.toString()); + +arr = Array("a","b","c"); +ok(arr.toString() === "a,b,c", "arr.toString() = " + arr.toString()); + +ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); +ok(arr === arr.valueOf(), "arr !== arr.valueOf"); + var num = new Number(6); arr = [0,1,2]; tmp = arr.concat(3, [4,5], num); @@ -456,6 +547,23 @@ ok(tmp.length === 3, "tmp.length = " + tmp.length); ok(tmp[1] === undefined, "tmp[1] = " + tmp[1]); +arr = [1,false,'a',null,undefined,'a']; +ok(arr.slice(0,6).toString() === "1,false,a,,,a", "arr.slice(0,6).toString() = " + arr.slice(0,6)); +ok(arr.slice(0,6).length === 6, "arr.slice(0,6).length = " + arr.slice(0,6).length); +ok(arr.slice().toString() === "1,false,a,,,a", "arr.slice().toString() = " + arr.slice()); +ok(arr.slice("abc").toString() === "1,false,a,,,a", "arr.slice(\"abc\").toString() = " + arr.slice("abc")); +ok(arr.slice(3,8).toString() === ",,a", "arr.slice(3,8).toString() = " + arr.slice(3,8)); +ok(arr.slice(3,8).length === 3, "arr.slice(3,8).length = " + arr.slice(3,8).length); +ok(arr.slice(1).toString() === "false,a,,,a", "arr.slice(1).toString() = " + arr.slice(1)); +ok(arr.slice(-2).toString() === ",a", "arr.slice(-2).toString() = " + arr.slice(-2)); +ok(arr.slice(3,1).toString() === "", "arr.slice(3,1).toString() = " + arr.slice(3,1)); +tmp = arr.slice(0,6); +for(var i=0; i < arr.length; i++) + ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr[12] = 2; +ok(arr.slice(5).toString() === "a,,,,,,,2", "arr.slice(5).toString() = " + arr.slice(5).toString()); +ok(arr.slice(5).length === 8, "arr.slice(5).length = " + arr.slice(5).length); + var num = new Number(2); ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number(); @@ -474,6 +582,61 @@ tmp = Number.prototype.valueOf(); ok(tmp === 0, "Number.prototype.valueOf = " + tmp); +function equals(val, base) { + var i; + var num = 0; + var str = val.toString(base); + + for(i=0; i<str.length; i++) { + if(str.substring(i, i+1) == '(') break; + if(str.substring(i, i+1) == '.') break; + num = num*base + parseInt(str.substring(i, i+1)); + } + + if(str.substring(i, i+1) == '.') { + var mult = base; + for(i++; i<str.length; i++) { + if(str.substring(i, i+1) == '(') break; + num += parseInt(str.substring(i, i+1))/mult; + mult *= base; + } + } + + if(str.substring(i, i+1) == '(') { + exp = parseInt(str.substring(i+2)); + num *= Math.pow(base, exp); + } + + ok(num>val-val/1000 && num<val+val/1000, "equals: num = " + num); +} + +ok((10).toString(11) === "a", "(10).toString(11) = " + (10).toString(11)); +ok((213213433).toString(17) === "8e2ddcb", "(213213433).toString(17) = " + (213213433).toString(17)); +ok((-3254343).toString(33) === "-2oicf", "(-3254343).toString(33) = " + (-3254343).toString(33)); +ok((NaN).toString(12) === "NaN", "(NaN).toString(11) = " + (NaN).toString(11)); +ok((Infinity).toString(13) === "Infinity", "(Infinity).toString(11) = " + (Infinity).toString(11)); +for(i=2; i<10; i++) { + equals(1.123, i); + equals(2305843009200000000, i); + equals(5.123, i); + equals(21711, i); + equals(1024*1024*1024*1024*1024*1024*1.9999, i); + equals(748382, i); + equals(0.6, i); + equals(4.65661287308e-10, i); + ok((0).toString(i) === "0", "(0).toString("+i+") = " + (0).toString(i)); +} + +ok(parseFloat('123') === 123, "parseFloat('123') = " + parseFloat('123')); +ok(parseFloat('-13.7') === -13.7, "parseFloat('-13.7') = " + parseFloat('-13.7')); +ok(parseFloat('-0.01e-2') === -0.01e-2, "parseFloat('-0.01e-2') = " + parseFloat('-0.01e-2')); +ok(parseFloat('-12e+5') === -12e+5, "parseFloat('-12e+5') = " + parseFloat('-12e+5')); +ok(parseFloat('1E5 not parsed') === 1E5, "parseFloat('1E5 not parsed') = " + parseFloat('1E5 not parsed')); +ok(isNaN(parseFloat('not a number')), "parseFloat('not a number') is not NaN"); +ok(parseFloat('+13.2e-3') === 13.2e-3, "parseFloat('+13.2e-3') = " + parseFloat('+13.2e-3')); +ok(parseFloat('.12') === 0.12, "parseFloat('.12') = " + parseFloat('.12')); +ok(parseFloat('1e') === 1, "parseFloat('1e') = " + parseFloat('1e')); + tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp); @@ -914,16 +1077,18 @@ var func = function (a) { var a = 1; if(a) return; - }.toString(); + }; ok(func.toString() === "function (a) {\n var a = 1;\n if(a) return;\n }", "func.toString() = " + func.toString()); ok("" + func === "function (a) {\n var a = 1;\n if(a) return;\n }", "'' + func.toString() = " + func); +ok(func.valueOf === Object.prototype.valueOf, "func.valueOf !== Object.prototype.valueOf"); +ok(func === func.valueOf(), "func !== func.valueOf()"); + function testFuncToString(x,y) { return x+y; } - ok(testFuncToString.toString() === "function testFuncToString(x,y) {\n return x+y;\n}", "testFuncToString.toString() = " + testFuncToString.toString()); ok("" + testFuncToString === "function testFuncToString(x,y) {\n return x+y;\n}", @@ -940,6 +1105,24 @@ ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); date = new Date(Infinity); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +date = new Date("3 July 2009 22:28:00 UTC+0100"); +ok(date.getTime() === 1246656480000, "date.getTime() = " + date.getTime()); +date = new Date(1984, 11, 29, 13, 51, 24, 120); +ok(date.getFullYear() === 1984, "date.getFullYear() = " + date.getFullYear()); +ok(date.getMonth() === 11, "date.getMonth() = " + date.getMonth()); +ok(date.getDate() === 29, "date.getDate() = " + date.getDate()); +ok(date.getHours() === 13, "date.getHours() = " + date.getHours()); +ok(date.getMinutes() === 51, "date.getMinutes() = " + date.getMinutes()); +ok(date.getSeconds() === 24, "date.getSeconds() = " + date.getSeconds()); +ok(date.getMilliseconds() === 120, "date.getMilliseconds() = " + date.getMilliseconds()); +date = new Date(731, -32, 40, -1, 70, 65, -13); +ok(date.getFullYear() === 728, "date.getFullYear() = " + date.getFullYear()); +ok(date.getMonth() === 5, "date.getMonth() = " + date.getMonth()); +ok(date.getDate() === 9, "date.getDate() = " + date.getDate()); +ok(date.getHours() === 0, "date.getHours() = " + date.getHours()); +ok(date.getMinutes() === 11, "date.getMinutes() = " + date.getMinutes()); +ok(date.getSeconds() === 4, "date.getSeconds() = " + date.getSeconds()); +ok(date.getMilliseconds() === 987, "date.getMilliseconds() = " + date.getMilliseconds()); ok(date.setTime(123) === 123, "date.setTime(123) !== 123"); ok(date.setTime("123", NaN) === 123, "date.setTime(\"123\") !== 123"); @@ -985,21 +1168,44 @@ ok(isNaN(date.setMilliseconds(0)), "date.setMilliseconds() is not NaN"); date.setTime(0); -date.setMilliseconds(-10, 2); +date.setUTCMilliseconds(-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); +date.setUTCMilliseconds(10); +ok(date.getUTCMilliseconds() === 10, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); +date.setUTCSeconds(-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); +date.setUTCMinutes(-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(date.getTime() === -612549990, "date.getTime() = " + date.getTime()); +date.setUTCHours(20); +ok(date.getUTCHours() === 20, "date.getUTCHours() = " + date.getUTCHours()); +date.setUTCDate(32); +ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); +date.setUTCMonth(22, 37); +ok(date.getTime() === 60987050010, "date.getTime() = " + date.getTime()); +date.setUTCFullYear(83, 21, 321); +ok(date.getTime() === -59464984149990, "date.getTime() = " + date.getTime()); +ok(Math.abs(date) === 59464984149990, "Math.abs(date) = " + Math.abs(date)); +ok(getVT(date+1) === "VT_BSTR", "getVT(date+1) = " + getVT(date+1)); + +ok(isNaN(Date.parse()), "Date.parse() is not NaN"); +ok(isNaN(Date.parse("")), "Date.parse(\"\") is not NaN"); +ok(isNaN(Date.parse("Jan Jan 20 2009")), "Date.parse(\"Jan Jan 20 2009\") is not NaN"); +ok(Date.parse("Jan 20 2009 UTC") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC\") = " + Date.parse("Jan 20 2009 UTC")); +ok(Date.parse("Jan 20 2009 GMT") === 1232409600000, "Date.parse(\"Jan 20 2009 GMT\") = " + Date.parse("Jan 20 2009 GMT")); +ok(Date.parse("Jan 20 2009 UTC-0") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC-0\") = " + Date.parse("Jan 20 2009 UTC-0")); +ok(Date.parse("Jan 20 2009 UTC+0000") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC+0000\") = " + Date.parse("Jan 20 2009 UTC+0000")); +ok(Date.parse("Ju 13 79 UTC") === 300672000000, "Date.parse(\"Ju 13 79 UTC\") = " + Date.parse("Ju 13 79 UTC")); +ok(Date.parse("12Au91 UTC") === 681955200000, "Date.parse(\"12Au91 UTC\") = " + Date.parse("12Au91 UTC")); +ok(Date.parse("7/02/17 UTC") === -1656806400000, "Date.parse(\"7/02/17 UTC\") = " + Date.parse("7/02/17 UTC")); +ok(Date.parse("Se001 70 12:31:17 UTC") === 21040277000, "Date.parse(\"Se001 70 12:31:17 UTC\") = " + Date.parse("Se001 70 12:31:17 UTC")); +ok(Date.parse("February 31 UTC, 2000 12:31:17 PM") === 952000277000, + "Date.parse(\"February 31 UTC, 2000 12:31:17 PM\") = " + Date.parse("February 31 UTC, 2000 12:31:17 PM")); +ok(Date.parse("71 11:32AM Dec 12 UTC BC ") === -64346358480000, "Date.parse(\"71 11:32AM Dec 12 UTC BC \") = " + Date.parse("71 11:32AM Dec 12 UTC BC ")); +ok(Date.parse("23/71/2000 11::32::UTC") === 1010662320000, "Date.parse(\"23/71/2000 11::32::UTC\") = " + Date.parse("23/71/2000 11::32::UTC")); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); @@ -1041,4 +1247,102 @@ Math.SQRT1_2 = "test"; ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_2); +var bool = new Boolean(); +ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); +var bool = new Boolean("false"); +ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); +ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); +ok(bool.toLocaleString() === bool.toString(), "bool.toLocaleString() = " + bool.toLocaleString()); + +ok(Error.prototype !== TypeError.prototype, "Error.prototype === TypeError.prototype"); +ok(RangeError.prototype !== TypeError.prototype, "RangeError.prototype === TypeError.prototype"); +ok(Error.prototype.toLocaleString === Object.prototype.toLocaleString, + "Error.prototype.toLocaleString !== Object.prototype.toLocaleString"); +err = new Error(); +ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.valueOf"); +ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); +ok(err.name === "Error", "err.name = " + err.name); +EvalError.prototype.message = "test"; +ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new EvalError(); +ok(EvalError.prototype.name === "EvalError", "EvalError.prototype.name = " + EvalError.prototype.name); +ok(err.name === "EvalError", "err.name = " + err.name); +ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype.toString"); +ok(err.message === "", "err.message != ''"); +err.message = date; +ok(err.message === date, "err.message != date"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); +err = new RangeError(); +ok(RangeError.prototype.name === "RangeError", "RangeError.prototype.name = " + RangeError.prototype.name); +ok(err.name === "RangeError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new ReferenceError(); +ok(ReferenceError.prototype.name === "ReferenceError", "ReferenceError.prototype.name = " + ReferenceError.prototype.name); +ok(err.name === "ReferenceError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new SyntaxError(); +ok(SyntaxError.prototype.name === "SyntaxError", "SyntaxError.prototype.name = " + SyntaxError.prototype.name); +ok(err.name === "SyntaxError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new TypeError(); +ok(TypeError.prototype.name === "TypeError", "TypeError.prototype.name = " + TypeError.prototype.name); +ok(err.name === "TypeError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new URIError(); +ok(URIError.prototype.name === "URIError", "URIError.prototype.name = " + URIError.prototype.name); +ok(err.name === "URIError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new Error("message"); +ok(err.message === "message", "err.message !== 'message'"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +err = new Error(123); +ok(err.number === 123, "err.number = " + err.number); +err = new Error(0, "message"); +ok(err.number === 0, "err.number = " + err.number); +ok(err.message === "message", "err.message = " + err.message); +ok(err.description === "message", "err.description = " + err.description); + +function exception_test(func, type, number) { + ret = ""; + num = ""; + try { + func(); + } catch(e) { + ret = e.name; + num = e.number; + } + ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); + ok(num === number, "Exception test, num = " + num + ", expected " + number + ". Executed function: " + func.toString()); +} +exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError", -2146823282); +exception_test(function() {Array(-3);}, "RangeError", -2146823259); +exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError", -2146823278); +exception_test(function() {date.setTime();}, "TypeError", -2146827839); +exception_test(function() {arr.test();}, "TypeError", -2146827850); +exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError", -2146823287); +exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); +exception_test(function() {not_existing_variable.something();}, "TypeError", -2146823279); +exception_test(function() {arr.toString = Function.prototype.toString; arr.toString();}, "TypeError", -2146823286); +exception_test(function() {date();}, "TypeError", -2146823286); +exception_test(function() {arr();}, "TypeError", -2146823286); +exception_test(function() {eval("for(i=0;) {}");}, "SyntaxError", -2146827286); +exception_test(function() {eval("function {};");}, "SyntaxError", -2146827283); +exception_test(function() {eval("if");}, "SyntaxError", -2146827283); +exception_test(function() {eval("do i=0; while");}, "SyntaxError", -2146827283); +exception_test(function() {eval("while");}, "SyntaxError", -2146827283); +exception_test(function() {eval("for");}, "SyntaxError", -2146827283); +exception_test(function() {eval("with");}, "SyntaxError", -2146827283); +exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); +exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); +exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); +exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); +exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); +exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284); +exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); +exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); +exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); +exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); + reportSuccess(); Modified: trunk/rostests/winetests/jscript/lang.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/lang.js… ============================================================================== --- trunk/rostests/winetests/jscript/lang.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/lang.js [iso-8859-1] Sat Aug 8 09:34:31 2009 @@ -84,7 +84,7 @@ ok(Math !== undefined, "Math is undefined"); ok(Math.prototype === undefined, "Math.prototype is not undefined"); ok(Function.prototype !== undefined, "Function.prototype is undefined"); -ok(Function.prototype.prototype === undefined, "Function.prototype is not undefined"); +ok(Function.prototype.prototype === undefined, "Function.prototype.prototype is not undefined"); ok(Date.prototype !== undefined, "Date.prototype is undefined"); ok(Date.prototype.prototype === undefined, "Date.prototype is not undefined"); @@ -672,6 +672,13 @@ ok(tmp === 1, "tmp !== 1"); tmp = 0; +do { + ok(tmp < 4, "tmp >= 4"); + tmp++; +} while(tmp < 4) +ok(tmp === 4, "tmp !== 4") + +tmp = 0; while(tmp < 4) { tmp++; if(tmp === 2) { @@ -875,4 +882,20 @@ testEmbededFunctions(); +date = new Date(); +date.toString = function() { return "toString"; } +ok(""+date === "toString", "''+date = " + date); +date.toString = function() { return this; } +ok(""+date === ""+date.valueOf(), "''+date = " + date); + +str = new String("test"); +str.valueOf = function() { return "valueOf"; } +ok(""+str === "valueOf", "''+str = " + str); +str.valueOf = function() { return new Date(); } +ok(""+str === "test", "''+str = " + str); + +ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function (){return 1;})()); + +ok(createNullBSTR() === '', "createNullBSTR() !== ''"); + reportSuccess(); Modified: trunk/rostests/winetests/jscript/regexp.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/regexp.… ============================================================================== --- trunk/rostests/winetests/jscript/regexp.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/regexp.js [iso-8859-1] Sat Aug 8 09:34:31 2009 @@ -31,7 +31,7 @@ m = "abcabc".match(/ab/g); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); @@ -41,7 +41,7 @@ m = "abcabc".match(/Ab/gi); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); @@ -64,21 +64,29 @@ m = "abcabc".match(new RegExp("ab","g")); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "abcabc".match(new RegExp(/ab/g)); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "abcabc".match(new RegExp("ab","g", "test")); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); + +m = "abcabcg".match("ab", "g"); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 1, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); + +m = "abcabc".match(); +ok(m === null, "m is not null"); r = "- [test] -".replace(/\[([^\[]+)\]/g, "success"); ok(r === "- success -", "r = " + r + " expected '- success -'"); Modified: trunk/rostests/winetests/jscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/jscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/run.c [iso-8859-1] Sat Aug 8 09:34:31 2009 @@ -73,6 +73,7 @@ #define DISPID_GLOBAL_OK 0x1004 #define DISPID_GLOBAL_GETVT 0x1005 #define DISPID_GLOBAL_TESTOBJ 0x1006 +#define DISPID_GLOBAL_NULL_BSTR 0x1007 static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; @@ -281,6 +282,10 @@ if(!strcmp_wa(bstrName, "testObj")) { ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_GLOBAL_TESTOBJ; + return S_OK; + } + if(!strcmp_wa(bstrName, "createNullBSTR")) { + *pid = DISPID_GLOBAL_NULL_BSTR; return S_OK; } @@ -429,6 +434,13 @@ V_VT(pvarRes) = VT_DISPATCH; V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + + case DISPID_GLOBAL_NULL_BSTR: + if(pvarRes) { + V_VT(pvarRes) = VT_BSTR; + V_BSTR(pvarRes) = NULL; + } + return S_OK; } ok(0, "unexpected call %x\n", id);

1 0

[cwittich] 42496: sync jscript with wine 1.1.27
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 09:34:09 2009 New Revision: 42496 URL: http://svn.reactos.org/svn/reactos?rev=42496&view=rev Log: sync jscript with wine 1.1.27 Added: trunk/reactos/dll/win32/jscript/error.c (with props) trunk/reactos/dll/win32/jscript/jscript_De.rc (with props) trunk/reactos/dll/win32/jscript/jscript_En.rc (with props) trunk/reactos/dll/win32/jscript/jscript_Fr.rc (with props) trunk/reactos/dll/win32/jscript/jscript_Lt.rc (with props) trunk/reactos/dll/win32/jscript/jscript_Nl.rc (with props) trunk/reactos/dll/win32/jscript/jscript_Pt.rc (with props) trunk/reactos/dll/win32/jscript/resource.h (with props) Modified: trunk/reactos/dll/win32/jscript/array.c trunk/reactos/dll/win32/jscript/bool.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/dll/win32/jscript/function.c trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/jscript/jscript_main.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/math.c trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/parser.tab.h trunk/reactos/dll/win32/jscript/parser.y trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/rsrc.rc trunk/reactos/dll/win32/jscript/string.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… Modified: trunk/reactos/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/bool.c?r… Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… Added: trunk/reactos/dll/win32/jscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/error.c?… Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Added: trunk/reactos/dll/win32/jscript/jscript_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Added: trunk/reactos/dll/win32/jscript/jscript_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Added: trunk/reactos/dll/win32/jscript/jscript_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Added: trunk/reactos/dll/win32/jscript/jscript_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Added: trunk/reactos/dll/win32/jscript/jscript_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Added: trunk/reactos/dll/win32/jscript/jscript_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Modified: trunk/reactos/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.y… Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… Added: trunk/reactos/dll/win32/jscript/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/resource… Modified: trunk/reactos/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/rsrc.rc?… Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c…

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009