Piotr Caban : jscript: Make String_indexOf generic.

[Alexandre Julliard]

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

Author: Piotr Caban 
Date:   Sun Jul 12 19:51:08 2009 +0200

jscript: Make String_indexOf generic.

---

dlls/jscript/string.c |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index b0185d9..0c9e3d6 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -481,20 +481,30 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR
 {
     DWORD length, pos = 0;
     const WCHAR *str;
-    BSTR search_str;
+    BSTR search_str, val_str = NULL;
     INT ret = -1;
     HRESULT hres;

TRACE("\n");

-    if(is_class(dispex, JSCLASS_STRING)) {
-        StringInstance *string = (StringInstance*)dispex;
+    if(!is_class(dispex, JSCLASS_STRING)) {
+        VARIANT this;

-        str = string->str;
-        length = string->length;
-    }else {
-        FIXME("not String this\n");
-        return E_NOTIMPL;
+        V_VT(&this) = VT_DISPATCH;
+        V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex);
+
+        hres = to_string(dispex->ctx, &this, ei, &val_str);
+        if(FAILED(hres))
+            return hres;
+
+        str = val_str;
+        length = SysStringLen(val_str);
+    }
+    else {
+        StringInstance *this = (StringInstance*)dispex;
+
+        str = this->str;
+        length = this->length;
     }

if(!arg_cnt(dp)) {
@@ -502,12 +512,15 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR
             V_VT(retv) = VT_I4;
             V_I4(retv) = -1;
         }
+        SysFreeString(val_str);
         return S_OK;
     }

hres = to_string(dispex->ctx, get_arg(dp,0), ei, &search_str);
-    if(FAILED(hres))
+    if(FAILED(hres)) {
+        SysFreeString(val_str);
         return hres;
+    }

if(arg_cnt(dp) >= 2) {
         VARIANT ival;
@@ -534,6 +547,7 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR
     }

SysFreeString(search_str);
+    SysFreeString(val_str);
     if(FAILED(hres))
         return hres;