Piotr Caban : jscript: Fixed String's function lengths.

Alexandre Julliard julliard at winehq.org
Mon Aug 17 11:24:07 CDT 2009


Module: wine
Branch: master
Commit: 3da1773cc362dafee54c19bde69b9ff6c544524c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3da1773cc362dafee54c19bde69b9ff6c544524c

Author: Piotr Caban <piotr.caban at gmail.com>
Date:   Mon Aug 17 12:12:25 2009 +0200

jscript: Fixed String's function lengths.

---

 dlls/jscript/string.c     |   30 +++++++++++++++---------------
 dlls/jscript/tests/api.js |   36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 04d5017..ea499aa 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -1543,32 +1543,32 @@ static void String_destructor(DispatchEx *dispex)
 }
 
 static const builtin_prop_t String_props[] = {
-    {anchorW,                String_anchor,                PROPF_METHOD},
+    {anchorW,                String_anchor,                PROPF_METHOD|1},
     {bigW,                   String_big,                   PROPF_METHOD},
     {blinkW,                 String_blink,                 PROPF_METHOD},
     {boldW,                  String_bold,                  PROPF_METHOD},
-    {charAtW,                String_charAt,                PROPF_METHOD},
-    {charCodeAtW,            String_charCodeAt,            PROPF_METHOD},
-    {concatW,                String_concat,                PROPF_METHOD},
+    {charAtW,                String_charAt,                PROPF_METHOD|1},
+    {charCodeAtW,            String_charCodeAt,            PROPF_METHOD|1},
+    {concatW,                String_concat,                PROPF_METHOD|1},
     {fixedW,                 String_fixed,                 PROPF_METHOD},
-    {fontcolorW,             String_fontcolor,             PROPF_METHOD},
-    {fontsizeW,              String_fontsize,              PROPF_METHOD},
-    {indexOfW,               String_indexOf,               PROPF_METHOD},
+    {fontcolorW,             String_fontcolor,             PROPF_METHOD|1},
+    {fontsizeW,              String_fontsize,              PROPF_METHOD|1},
+    {indexOfW,               String_indexOf,               PROPF_METHOD|2},
     {italicsW,               String_italics,               PROPF_METHOD},
-    {lastIndexOfW,           String_lastIndexOf,           PROPF_METHOD},
+    {lastIndexOfW,           String_lastIndexOf,           PROPF_METHOD|2},
     {lengthW,                String_length,                0},
-    {linkW,                  String_link,                  PROPF_METHOD},
-    {localeCompareW,         String_localeCompare,         PROPF_METHOD},
-    {matchW,                 String_match,                 PROPF_METHOD},
-    {replaceW,               String_replace,               PROPF_METHOD},
+    {linkW,                  String_link,                  PROPF_METHOD|1},
+    {localeCompareW,         String_localeCompare,         PROPF_METHOD|1},
+    {matchW,                 String_match,                 PROPF_METHOD|1},
+    {replaceW,               String_replace,               PROPF_METHOD|1},
     {searchW,                String_search,                PROPF_METHOD},
     {sliceW,                 String_slice,                 PROPF_METHOD},
     {smallW,                 String_small,                 PROPF_METHOD},
-    {splitW,                 String_split,                 PROPF_METHOD},
+    {splitW,                 String_split,                 PROPF_METHOD|2},
     {strikeW,                String_strike,                PROPF_METHOD},
     {subW,                   String_sub,                   PROPF_METHOD},
-    {substrW,                String_substr,                PROPF_METHOD},
-    {substringW,             String_substring,             PROPF_METHOD},
+    {substrW,                String_substr,                PROPF_METHOD|2},
+    {substringW,             String_substring,             PROPF_METHOD|2},
     {supW,                   String_sup,                   PROPF_METHOD},
     {toLocaleLowerCaseW,     String_toLocaleLowerCase,     PROPF_METHOD},
     {toLocaleUpperCaseW,     String_toLocaleUpperCase,     PROPF_METHOD},
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index ce995a0..e2097a3 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -1410,7 +1410,6 @@ testFunctions(Boolean.prototype, [
         ["toString", 0]
     ]);
 
-
 testFunctions(Number.prototype, [
         ["valueOf", 0],
         ["toString", 1],
@@ -1419,4 +1418,39 @@ testFunctions(Number.prototype, [
         ["toPrecision", 1]
     ]);
 
+testFunctions(String.prototype, [
+        ["valueOf", 0],
+        ["toString", 0],
+        ["anchor", 1],
+        ["big", 0],
+        ["blink", 0],
+        ["bold", 0],
+        ["charAt", 1],
+        ["charCodeAt", 1],
+        ["concat", 1],
+        ["fixed", 0],
+        ["fontcolor", 1],
+        ["fontsize", 1],
+        ["indexOf", 2],
+        ["italics", 0],
+        ["lastIndexOf", 2],
+        ["link", 1],
+        ["localeCompare", 1],
+        ["match", 1],
+        ["replace", 1],
+        ["search", 0],
+        ["slice", 0],
+        ["small", 0],
+        ["split", 2],
+        ["strike", 0],
+        ["sub", 0],
+        ["substr", 2],
+        ["substring", 2],
+        ["sup", 0],
+        ["toLocaleLowerCase", 0],
+        ["toLocaleUpperCase", 0],
+        ["toLowerCase", 0],
+        ["toUpperCase", 0]
+    ]);
+
 reportSuccess();




More information about the wine-cvs mailing list