wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Nikolay Sivov : gdiplus: Stub for GdipSetPathGradientBlend.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 067a08efae82c544cccaf0da461fe73a30949d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=067a08efae82c544cccaf0da4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 25 08:51:02 2008 +0400 gdiplus: Stub for GdipSetPathGradientBlend. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index f789c74..8df2a82 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -926,6 +926,17 @@ GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST REAL *blend, + GDIPCONST REAL *pos, INT count) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dbe7c76..8c59810 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -548,7 +548,7 @@ @ stdcall GdipSetPageScale(ptr long) @ stdcall GdipSetPageUnit(ptr long) @ stdcall GdipSetPathFillMode(ptr long) -@ stub GdipSetPathGradientBlend +@ stdcall GdipSetPathGradientBlend(ptr ptr ptr long) @ stdcall GdipSetPathGradientCenterColor(ptr long) @ stdcall GdipSetPathGradientCenterPoint(ptr ptr) @ stdcall GdipSetPathGradientCenterPointI(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5babd5e..bc68aae 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -236,6 +236,7 @@ GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); +GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient*,GDIPCONST REAL*,GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*);

1 0

Alexandre Julliard : advapi32: Always pass a valid argv pointer to a service even if there are no arguments .
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: cd3805336efd5d210474f6947f06d278985dff76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3805336efd5d210474f6947… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 25 11:19:39 2008 +0200 advapi32: Always pass a valid argv pointer to a service even if there are no arguments. --- dlls/advapi32/service.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index d5a2c31..da2b81f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -383,16 +383,8 @@ static DWORD WINAPI service_thread(LPVOID arg) len += strlenW(&str[len]) + 1; argc++; } + len++; - if (!argc) - { - if (info->unicode) - info->proc.w(0, NULL); - else - info->proc.a(0, NULL); - return 0; - } - if (info->unicode) { LPWSTR *argv, p;

1 0

Alexandre Julliard : gdiplus: Fix a string buffer overflow.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: a2d04673e6522036fe7f3d9ee3b7a10b6ae41435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d04673e6522036fe7f3d9ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 25 11:19:23 2008 +0200 gdiplus: Fix a string buffer overflow. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c1e63f6..3689fd3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2625,7 +2625,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(length == -1) length = lstrlenW(string); - stringdup = GdipAlloc(length * sizeof(WCHAR)); + stringdup = GdipAlloc((length + 1) * sizeof(WCHAR)); if(!stringdup) return OutOfMemory; oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw));

1 0

Michael Stefaniuc : shlwapi/tests: Remove redundant NULL check before SysFreeString (Smatch).
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: b562a512eb1bc8b8113268c92b7b9ae3db7c67a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b562a512eb1bc8b8113268c92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 24 23:05:00 2008 +0200 shlwapi/tests: Remove redundant NULL check before SysFreeString (Smatch). --- dlls/shlwapi/tests/string.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 0875221..4d9c17c 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -664,16 +664,14 @@ static void test_StrRetToBSTR(void) ret = pStrRetToBSTR(&strret, NULL, &bstr); ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), "STRRET_WSTR: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); - if (bstr) - SysFreeString(bstr); + SysFreeString(bstr); strret.uType = STRRET_CSTR; lstrcpyA(U(strret).cStr, "Test"); ret = pStrRetToBSTR(&strret, NULL, &bstr); ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), "STRRET_CSTR: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); - if (bstr) - SysFreeString(bstr); + SysFreeString(bstr); strret.uType = STRRET_OFFSET; U(strret).uOffset = 1; @@ -681,8 +679,7 @@ static void test_StrRetToBSTR(void) ret = pStrRetToBSTR(&strret, iidl, &bstr); ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), "STRRET_OFFSET: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); - if (bstr) - SysFreeString(bstr); + SysFreeString(bstr); /* Native crashes if str is NULL */ }

1 0

Michael Stefaniuc : oleaut32: Remove redundant NULL check before SysFreeString (Smatch).
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: f830a12ddbf87915261edaaf0568e42d2c4a8924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f830a12ddbf87915261edaaf0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 24 23:04:49 2008 +0200 oleaut32: Remove redundant NULL check before SysFreeString (Smatch). --- dlls/oleaut32/oleaut.c | 3 +-- dlls/oleaut32/safearray.c | 6 ++---- dlls/oleaut32/usrmarshal.c | 16 +++++----------- dlls/oleaut32/variant.c | 3 +-- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index aa97b31..4e636e3 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -419,8 +419,7 @@ INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR str) /* * Make sure we free the old string. */ - if (*old!=NULL) - SysFreeString(*old); + SysFreeString(*old); /* * Allocate the new string diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index a19d599..bf82a5a 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -314,8 +314,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) while(ulCellCount--) { - if (*lpBstr) - SysFreeString(*lpBstr); + SysFreeString(*lpBstr); lpBstr++; } } @@ -865,8 +864,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData BSTR lpBstr = (BSTR)pvData; BSTR* lpDest = (BSTR*)lpvDest; - if (*lpDest) - SysFreeString(*lpDest); + SysFreeString(*lpDest); *lpDest = SysAllocStringByteLen((char*)lpBstr, SysStringByteLen(lpBstr)); if (!*lpDest) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index ea5f49e..8f55f8f 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -186,12 +186,9 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, header = (bstr_wire_t*)Buffer; if(header->len != header->len2) FIXME("len %08x != len2 %08x\n", header->len, header->len2); - - if(*pstr) - { - SysFreeString(*pstr); - *pstr = NULL; - } + + SysFreeString(*pstr); + *pstr = NULL; if(header->byte_len != 0xffffffff) *pstr = SysAllocStringByteLen((char*)(header + 1), header->byte_len); @@ -203,11 +200,8 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) { TRACE("(%x,%p) => %p\n", *pFlags, pstr, *pstr); - if (*pstr) - { - SysFreeString(*pstr); - *pstr = NULL; - } + SysFreeString(*pstr); + *pstr = NULL; } /* VARIANT */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5c094e1..f6dcbf1 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -608,8 +608,7 @@ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) } else if (V_VT(pVarg) == VT_BSTR) { - if (V_BSTR(pVarg)) - SysFreeString(V_BSTR(pVarg)); + SysFreeString(V_BSTR(pVarg)); } else if (V_VT(pVarg) == VT_RECORD) {

1 0

Michael Stefaniuc : msxml3/tests: Remove redundant NULL check before SysFreeString (Smatch).
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 1949a8c24576c642dc34ec99f197dd1a9b4359e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1949a8c24576c642dc34ec99f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 24 23:04:34 2008 +0200 msxml3/tests: Remove redundant NULL check before SysFreeString (Smatch). --- dlls/msxml3/tests/domdoc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c927274..29bebb9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1565,8 +1565,7 @@ static void test_getElementsByTagName(void) r = IDispatchEx_GetMemberName(dispex, dispid, &sName); ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - if(sName) - SysFreeString(sName); + SysFreeString(sName); r = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r);

1 0

Michael Stefaniuc : jscript: Remove redundant NULL check before SysFreeString (Smatch).
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 9c0d148dd536f5db39ac09747f7780181a7881a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0d148dd536f5db39ac09747… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 24 23:04:20 2008 +0200 jscript: Remove redundant NULL check before SysFreeString (Smatch). --- dlls/jscript/engine.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8f3ab02..a3e0fc1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1930,9 +1930,9 @@ static HRESULT add_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_ memcpy(V_BSTR(retv)+len1, rstr, (len2+1)*sizeof(WCHAR)); } - if(lstr && V_VT(&l) != VT_BSTR) + if(V_VT(&l) != VT_BSTR) SysFreeString(lstr); - if(rstr && V_VT(&r) != VT_BSTR) + if(V_VT(&r) != VT_BSTR) SysFreeString(rstr); }else { VARIANT nl, nr;

1 0

Jacek Caban : mshtml: Use ActiveScript for JavaScript in file protocol documents.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: c3bdda810243ed6c8d6b9960d1df3b534653b438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bdda810243ed6c8d6b9960d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 18:19:46 2008 +0200 mshtml: Use ActiveScript for JavaScript in file protocol documents. --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/mshtml_private.h | 7 +++++ dlls/mshtml/nsiface.idl | 1 + dlls/mshtml/persist.c | 8 ++++++ dlls/mshtml/script.c | 52 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e5870d8..dd989ff 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1603,6 +1603,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret->lpIDispatchExVtbl = &DocDispatchExVtbl; ret->ref = 0; ret->readystate = READYSTATE_UNINITIALIZED; + ret->scriptmode = SCRIPTMODE_GECKO; list_init(&ret->bindings); list_init(&ret->script_hosts); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a9f533..5211d2f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -166,6 +166,11 @@ typedef enum { EDITMODE } USERMODE; +typedef enum { + SCRIPTMODE_GECKO, + SCRIPTMODE_ACTIVESCRIPT +} SCRIPTMODE; + typedef struct { const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; @@ -255,6 +260,7 @@ struct HTMLDocument { DOCHOSTUIINFO hostinfo; USERMODE usermode; + SCRIPTMODE scriptmode; READYSTATE readystate; BOOL in_place_active; BOOL ui_active; @@ -572,6 +578,7 @@ void release_script_hosts(HTMLDocument*); void connect_scripts(HTMLDocument*); void doc_insert_script(HTMLDocument*,nsIDOMHTMLScriptElement*); IDispatch *script_parse_event(HTMLDocument*,LPCWSTR); +void set_script_mode(HTMLDocument*,SCRIPTMODE); IHTMLElementCollection *create_all_collection(HTMLDOMNode*); IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument*,IUnknown*,nsIDOMNodeList*); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 42e6eb0..44b426c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1377,6 +1377,7 @@ interface nsIWebBrowser : nsISupports nsresult GetContentDOMWindow(nsIDOMWindow **aContentDOMWindow); } +cpp_quote("#define SETUP_ALLOW_JAVASCRIPT 2") cpp_quote("#define SETUP_IS_CHROME_WRAPPER 7") [ diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 78a5d6b..e673f9c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -158,6 +158,12 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) return ret; } +static BOOL use_gecko_script(LPCWSTR url) +{ + static const WCHAR fileW[] = {'f','i','l','e',':'}; + return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR)); +} + void set_current_mon(HTMLDocument *This, IMoniker *mon) { HRESULT hres; @@ -181,6 +187,8 @@ void set_current_mon(HTMLDocument *This, IMoniker *mon) hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); if(FAILED(hres)) WARN("GetDisplayName failed: %08x\n", hres); + + set_script_mode(This, use_gecko_script(This->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index de76062..5df0616 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -712,8 +712,8 @@ static ScriptHost *get_script_host(HTMLDocument *doc, const GUID *guid) { ScriptHost *iter; - if(IsEqualGUID(&CLSID_JScript, guid)) { - FIXME("Ignoring JScript\n"); + if(IsEqualGUID(&CLSID_JScript, &guid) && doc->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { + TRACE("Ignoring JScript\n"); return NULL; } @@ -792,6 +792,54 @@ IDispatch *script_parse_event(HTMLDocument *doc, LPCWSTR text) return disp; } +static BOOL is_jscript_available(void) +{ + static BOOL available, checked; + + if(!checked) { + IUnknown *unk; + HRESULT hres = CoGetClassObject(&CLSID_JScript, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); + + if(SUCCEEDED(hres)) { + available = TRUE; + IUnknown_Release(unk); + }else { + available = FALSE; + } + checked = TRUE; + } + + return available; +} + +void set_script_mode(HTMLDocument *doc, SCRIPTMODE mode) +{ + nsIWebBrowserSetup *setup; + nsresult nsres; + + if(mode == SCRIPTMODE_ACTIVESCRIPT && !is_jscript_available()) { + TRACE("jscript.dll not available\n"); + doc->scriptmode = SCRIPTMODE_GECKO; + return; + } + + doc->scriptmode = mode; + + if(!doc->nscontainer || !doc->nscontainer->webbrowser) + return; + + nsres = nsIWebBrowser_QueryInterface(doc->nscontainer->webbrowser, + &IID_nsIWebBrowserSetup, (void**)&setup); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIWebBrowserSetup_SetProperty(setup, SETUP_ALLOW_JAVASCRIPT, + doc->scriptmode == SCRIPTMODE_GECKO); + nsIWebBrowserSetup_Release(setup); + } + + if(NS_FAILED(nsres)) + ERR("JavaScript setup failed: %08x\n", nsres); +} + void release_script_hosts(HTMLDocument *doc) { ScriptHost *iter;

1 0

Jacek Caban : jscript: Added String.split implementation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 6906c2f1baf039dc7069d179a3e5d5c2f9e9b2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6906c2f1baf039dc7069d179a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:54:09 2008 +0200 jscript: Added String.split implementation. --- dlls/jscript/string.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index eb50624..fc40462 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -785,8 +785,92 @@ static HRESULT String_small(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + StringInstance *string; + match_result_t *match_result; + DWORD match_cnt, i, len; + const WCHAR *ptr; + VARIANT *arg, var; + DispatchEx *array; + HRESULT hres; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_STRING)) { + FIXME("not String this\n"); + return E_NOTIMPL; + } + + string = (StringInstance*)dispex; + + if(arg_cnt(dp) != 1) { + FIXME("unsupported args\n"); + return E_NOTIMPL; + } + + arg = get_arg(dp, 0); + switch(V_VT(arg)) { + case VT_DISPATCH: { + DispatchEx *regexp; + + regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); + if(regexp) { + if(is_class(regexp, JSCLASS_REGEXP)) { + hres = regexp_match(regexp, string->str, string->length, TRUE, &match_result, &match_cnt); + jsdisp_release(regexp); + if(FAILED(hres)) + return hres; + break; + } + jsdisp_release(regexp); + } + } + default: + FIXME("unsupported vt %d\n", V_VT(arg)); + return E_NOTIMPL; + } + + hres = create_array(dispex->ctx, match_cnt+1, &array); + + if(SUCCEEDED(hres)) { + ptr = string->str; + for(i=0; i < match_cnt; i++) { + len = match_result[i].str-ptr; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocStringLen(ptr, len); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + break; + } + + hres = jsdisp_propput_idx(array, i, lcid, &var, ei, sp); + SysFreeString(V_BSTR(&var)); + if(FAILED(hres)) + break; + + ptr = match_result[i].str + match_result[i].len; + } + } + + if(SUCCEEDED(hres)) { + len = (string->str+string->length) - ptr; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocStringLen(ptr, len); + + hres = jsdisp_propput_idx(array, i, lcid, &var, ei, sp); + SysFreeString(V_BSTR(&var)); + } + + heap_free(match_result); + + if(SUCCEEDED(hres) && retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array); + }else { + jsdisp_release(array); + } + + return hres; } static HRESULT String_strike(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Jacek Caban : jscript: Added String. match implementation for non-regexp arguments.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 9307a5ddfdb8fccdeabbd66f7e9a0fd9aa8258e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9307a5ddfdb8fccdeabbd66f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 00:53:53 2008 +0200 jscript: Added String.match implementation for non-regexp arguments. --- dlls/jscript/string.c | 44 +++++++++++++++++++++++++------------------- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 12b6d1a..eb50624 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -354,6 +354,7 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM { StringInstance *This = (StringInstance*)dispex; match_result_t *match_result; + DispatchEx *regexp; DispatchEx *array; VARIANT var, *arg_var; DWORD match_cnt, i; @@ -361,33 +362,39 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); - if(dp->cArgs - dp->cNamedArgs != 1) { + if(arg_cnt(dp) != 1) { FIXME("unsupported args\n"); return E_NOTIMPL; } arg_var = get_arg(dp, 0); switch(V_VT(arg_var)) { - case VT_DISPATCH: { - DispatchEx *regexp; - + case VT_DISPATCH: regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg_var)); if(regexp) { - if(regexp->builtin_info->class == JSCLASS_REGEXP) { - hres = regexp_match(regexp, This->str, This->length, FALSE, &match_result, &match_cnt); - jsdisp_release(regexp); - if(FAILED(hres)) - return hres; + if(regexp->builtin_info->class == JSCLASS_REGEXP) break; - } jsdisp_release(regexp); } + default: { + BSTR match_str; + + hres = to_string(dispex->ctx, arg_var, ei, &match_str); + if(FAILED(hres)) + return hres; + + hres = create_regexp_str(dispex->ctx, match_str, SysStringLen(match_str), NULL, 0, &regexp); + SysFreeString(match_str); + if(FAILED(hres)) + return hres; } - default: - FIXME("implemented only for regexp args\n"); - return E_NOTIMPL; } + hres = regexp_match(regexp, This->str, This->length, FALSE, &match_result, &match_cnt); + jsdisp_release(regexp); + if(FAILED(hres)) + return hres; + if(!match_cnt) { TRACE("no match\n"); @@ -415,14 +422,13 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM break; } - if(FAILED(hres)) { + if(SUCCEEDED(hres) && retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array); + }else { jsdisp_release(array); - return hres; } - - V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array); - return S_OK; + return hres; } typedef struct { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1281b25..aef7c2b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -151,6 +151,11 @@ arr.concat = String.prototype.concat; tmp = arr.concat("d"); ok(tmp === "2,ad", "arr.concat = " + tmp); +m = "a+bcabc".match("a+"); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 1, "m.length is not 1"); +ok(m["0"] === "a", "m[0] is not \"ab\""); + r = "- [test] -".replace("[test]", "success"); ok(r === "- success -", "r = " + r + " expected '- success -'");

1 0

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

2003

2002

2001

wine-commits September 2008