January 2010 - Wine-commits

Hans Leidekker : include: Add some missing prototypes.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 9e769f2faee68ea0a7e9df859828309e04efa1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e769f2faee68ea0a7e9df859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 25 12:26:24 2010 +0100 include: Add some missing prototypes. --- include/msi.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msi.h b/include/msi.h index 2c0a37f..5c2f38c 100644 --- a/include/msi.h +++ b/include/msi.h @@ -597,6 +597,10 @@ UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWSTR, LPDWORD); #define MsiSourceListEnumSources WINELIB_NAME_AW(MsiSourceListEnumSources) +UINT WINAPI MsiSourceListClearSourceA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR); +UINT WINAPI MsiSourceListClearSourceW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR); +#define MsiSourceListClearSource WINELIB_NAME_AW(MsiSourceListClearSource) + UINT WINAPI MsiSourceListClearAllA(LPCSTR, LPCSTR, DWORD); UINT WINAPI MsiSourceListClearAllW(LPCWSTR, LPCWSTR, DWORD); #define MsiSourceListClearAll WINELIB_NAME_AW(MsiSourceListClearAll)

1 0

Piotr Caban : jscript: Fix array.reverse implementation.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 693c6925641f39fc21187ddfa94cd27d6c804a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693c6925641f39fc21187ddfa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 03:49:24 2010 +0100 jscript: Fix array.reverse implementation. --- dlls/jscript/array.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index fd1fe51..1ced39e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -473,11 +473,11 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP l = length-k-1; hres1 = jsdisp_propget_idx(jsthis, k, &v1, ei, sp); - if(FAILED(hres1)) + if(FAILED(hres1) && hres1!=DISP_E_UNKNOWNNAME) return hres1; hres2 = jsdisp_propget_idx(jsthis, l, &v2, ei, sp); - if(FAILED(hres2)) { + if(FAILED(hres2) && hres2!=DISP_E_UNKNOWNNAME) { VariantClear(&v1); return hres2; }

1 0

Piotr Caban : jscript: Fix jsdisp_propget_idx implementation.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 352ae8b480050456be18b4e81a68db7b2c816365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=352ae8b480050456be18b4e81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 03:49:49 2010 +0100 jscript: Fix jsdisp_propget_idx implementation. --- dlls/jscript/array.c | 34 ++++++++++++++++++++-------------- dlls/jscript/dispex.c | 20 ++++++++++++++++---- dlls/jscript/function.c | 6 ++++-- dlls/jscript/jscript.h | 2 +- 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 1ced39e..1268d59 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -166,7 +166,7 @@ static HRESULT concat_array(DispatchEx *array, ArrayInstance *obj, DWORD *len, HRESULT hres; for(i=0; i < obj->length; i++) { - hres = jsdisp_propget_idx(&obj->dispex, i, &var, ei, caller); + hres = jsdisp_get_idx(&obj->dispex, i, &var, ei, caller); if(hres == DISP_E_UNKNOWNNAME) continue; if(FAILED(hres)) @@ -267,8 +267,11 @@ static HRESULT array_join(script_ctx_t *ctx, DispatchEx *array, DWORD length, co return E_OUTOFMEMORY; for(i=0; i < length; i++) { - hres = jsdisp_propget_idx(array, i, &var, ei, caller); - if(FAILED(hres)) + hres = jsdisp_get_idx(array, i, &var, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) { + hres = S_OK; + continue; + } else if(FAILED(hres)) break; if(V_VT(&var) != VT_EMPTY && V_VT(&var) != VT_NULL) @@ -397,7 +400,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARA } length--; - hres = jsdisp_propget_idx(jsthis, length, &val, ei, caller); + hres = jsdisp_get_idx(jsthis, length, &val, ei, caller); if(SUCCEEDED(hres)) { hres = jsdisp_delete_idx(jsthis, length); } else if(hres == DISP_E_UNKNOWNNAME) { @@ -472,11 +475,11 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP for(k=0; k<length/2; k++) { l = length-k-1; - hres1 = jsdisp_propget_idx(jsthis, k, &v1, ei, sp); + hres1 = jsdisp_get_idx(jsthis, k, &v1, ei, sp); if(FAILED(hres1) && hres1!=DISP_E_UNKNOWNNAME) return hres1; - hres2 = jsdisp_propget_idx(jsthis, l, &v2, ei, sp); + hres2 = jsdisp_get_idx(jsthis, l, &v2, ei, sp); if(FAILED(hres2) && hres2!=DISP_E_UNKNOWNNAME) { VariantClear(&v1); return hres2; @@ -540,14 +543,14 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return S_OK; } - hres = jsdisp_propget_idx(jsthis, 0, &ret, ei, caller); + hres = jsdisp_get_idx(jsthis, 0, &ret, ei, caller); if(hres == DISP_E_UNKNOWNNAME) { V_VT(&ret) = VT_EMPTY; hres = S_OK; } for(i=1; SUCCEEDED(hres) && i<length; i++) { - hres = jsdisp_propget_idx(jsthis, i, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i, &v, ei, caller); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i-1); else if(SUCCEEDED(hres)) @@ -622,7 +625,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return hres; for(idx=start; idx<end; idx++) { - hres = jsdisp_propget_idx(jsthis, idx, &v, ei, sp); + hres = jsdisp_get_idx(jsthis, idx, &v, ei, sp); if(hres == DISP_E_UNKNOWNNAME) continue; @@ -755,8 +758,11 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR vtab = heap_alloc_zero(length * sizeof(VARIANT)); if(vtab) { for(i=0; i<length; i++) { - hres = jsdisp_propget_idx(jsthis, i, vtab+i, ei, caller); - if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) { + hres = jsdisp_get_idx(jsthis, i, vtab+i, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) { + V_VT(vtab+i) = VT_EMPTY; + hres = S_OK; + } else if(FAILED(hres)) { WARN("Could not get elem %d: %08x\n", i, hres); break; } @@ -908,7 +914,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP return hres; for(i=0; SUCCEEDED(hres) && i < delete_cnt; i++) { - hres = jsdisp_propget_idx(jsthis, start+i, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, start+i, &v, ei, caller); if(hres == DISP_E_UNKNOWNNAME) hres = S_OK; else if(SUCCEEDED(hres)) @@ -925,7 +931,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP if(add_args < delete_cnt) { for(i = start; SUCCEEDED(hres) && i < length-delete_cnt; i++) { - hres = jsdisp_propget_idx(jsthis, i+delete_cnt, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt, &v, ei, caller); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args); else if(SUCCEEDED(hres)) @@ -936,7 +942,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = jsdisp_delete_idx(jsthis, i-1); }else if(add_args > delete_cnt) { for(i=length-delete_cnt; SUCCEEDED(hres) && i != start; i--) { - hres = jsdisp_propget_idx(jsthis, i+delete_cnt-1, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei, caller); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args-1); else if(SUCCEEDED(hres)) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1b52ba4..492623e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1003,14 +1003,26 @@ HRESULT jsdisp_propget_name(DispatchEx *obj, const WCHAR *name, VARIANT *var, js return prop_get(obj, prop, &dp, var, ei, caller); } -HRESULT jsdisp_propget_idx(DispatchEx *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_get_idx(DispatchEx *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) { - WCHAR buf[12]; + WCHAR name[12]; + DISPPARAMS dp = {NULL, NULL, 0, 0}; + dispex_prop_t *prop; + HRESULT hres; static const WCHAR formatW[] = {'%','d',0}; - sprintfW(buf, formatW, idx); - return jsdisp_propget_name(obj, buf, var, ei, caller); + sprintfW(name, formatW, idx); + + hres = find_prop_name_prot(obj, name, FALSE, &prop); + if(FAILED(hres)) + return hres; + + V_VT(var) = VT_EMPTY; + if(!prop) + return DISP_E_UNKNOWNNAME; + + return prop_get(obj, prop, &dp, var, ei, caller); } HRESULT jsdisp_propget(DispatchEx *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index d25fd0f..c7494cf 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -374,8 +374,10 @@ static HRESULT array_to_args(script_ctx_t *ctx, DispatchEx *arg_array, jsexcept_ return E_OUTOFMEMORY; for(i=0; i<length; i++) { - hres = jsdisp_propget_idx(arg_array, i, argv+i, ei, caller); - if(FAILED(hres)) { + hres = jsdisp_get_idx(arg_array, i, argv+i, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) + V_VT(argv+i) = VT_EMPTY; + else if(FAILED(hres)) { while(i--) VariantClear(argv+i); heap_free(argv); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 95f5028..0068827 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -205,7 +205,7 @@ HRESULT jsdisp_propget(DispatchEx*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider* HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget_name(DispatchEx*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvider*); -HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_get_idx(DispatchEx*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_get_id(DispatchEx*,const WCHAR*,DWORD,DISPID*); HRESULT jsdisp_delete_idx(DispatchEx*,DWORD);

1 0

Dylan Smith : richedit: Prevent uninitialized value from being used.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 530a6c459837a7a77d89c96cfe3439e1e6680920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=530a6c459837a7a77d89c96cf… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jan 25 01:27:24 2010 -0500 richedit: Prevent uninitialized value from being used. NULL may be returned by ITextHost::TxGetDC. Caught by valgrind. --- dlls/riched20/run.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 90ea831..cd282ec 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -550,9 +550,14 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style *s, SIZE *size) { HGDIOBJ hOldFont; - hOldFont = ME_SelectStyleFont(c, s); - GetTextExtentPoint32W(c->hDC, szText, nChars, size); - ME_UnselectStyleFont(c, s, hOldFont); + if (c->hDC) { + hOldFont = ME_SelectStyleFont(c, s); + GetTextExtentPoint32W(c->hDC, szText, nChars, size); + ME_UnselectStyleFont(c, s, hOldFont); + } else { + size->cx = 0; + size->cy = 0; + } } /******************************************************************************

1 0

Dylan Smith : richedit: Initialize fields for windowless richedit controls.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 0539d5e4972771e110d3db1d33611a4799c2b7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0539d5e4972771e110d3db1d3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jan 25 01:27:30 2010 -0500 richedit: Initialize fields for windowless richedit controls. Caught by valgrind. --- dlls/riched20/txtsrv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 4006acd..7ab2af4 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -87,6 +87,8 @@ HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, ITextImpl->pMyHost = pITextHost; ITextImpl->lpVtbl = &textservices_Vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); + ITextImpl->editor->exStyleFlags = 0; + ITextImpl->editor->rcFormat = (RECT){0,0,0,0}; ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter)

1 0

Stefano Guidoni : winemp3: Fix incorrect stream handling.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: f31d240d8d2a6685ac2afa68b5156c83e42aa4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31d240d8d2a6685ac2afa68b… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Mon Jan 25 01:13:46 2010 +0100 winemp3: Fix incorrect stream handling. --- dlls/winemp3.acm/mpegl3.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index fd06c0d..01697a7 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -180,7 +180,8 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); } dpos += size; - } while (ret == MPG123_OK); + if (dpos > *ndst) break; + } while (ret != MPG123_ERR && ret != MPG123_NEED_MORE); *ndst = dpos; }

1 0

Jacek Caban : mshtml: Added semi-stub IHTMLSelectElement:: add implementation.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: a5ef2bc7a5dfd31725d7a5aac19e9eaa7962f6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ef2bc7a5dfd31725d7a5aac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 24 21:38:20 2010 +0100 mshtml: Added semi-stub IHTMLSelectElement::add implementation. --- dlls/mshtml/htmlselect.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index f9b7182..fccc912 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -332,8 +332,26 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem VARIANT before) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p v)\n", This, element); - return E_NOTIMPL; + IHTMLDOMNode *node, *tmp; + HRESULT hres; + + FIXME("(%p)->(%p %s): semi-stub\n", This, element, debugstr_variant(&before)); + + if(V_VT(&before) != VT_EMPTY) { + FIXME("unhandled before %s\n", debugstr_variant(&before)); + return E_NOTIMPL; + } + + hres = IHTMLElement_QueryInterface(element, &IID_IHTMLDOMNode, (void**)&node); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_appendChild(HTMLDOMNODE(&This->element.node), node, &tmp); + IHTMLDOMNode_Release(node); + if(SUCCEEDED(hres) && tmp) + IHTMLDOMNode_Release(tmp); + + return hres; } static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG index)

1 0

Jacek Caban : mshtml: Improved IHTMLWindow::GetIDsOfNames implementation.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: e54062d6c7aa0f39dc71a2b898bd1ee806177b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54062d6c7aa0f39dc71a2b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 24 21:39:01 2010 +0100 mshtml: Improved IHTMLWindow::GetIDsOfNames implementation. --- dlls/mshtml/htmlwindow.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4a2babe..d6a249a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1688,13 +1688,20 @@ static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = DISPEX_THIS(iface); + UINT i; + HRESULT hres; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - /* FIXME: Use script dispatch */ + for(i=0; i < cNames; i++) { + /* We shouldn't use script's IDispatchEx here, so we shouldn't use GetDispID */ + hres = IDispatchEx_GetDispID(DISPATCHEX(This), rgszNames[i], 0, rgDispId+i); + if(FAILED(hres)) + return hres; + } - return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); + return S_OK; } static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,

1 0

Jacek Caban : mshtml: Code clean up.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: cc169bc8ac85f2b17786ed3481e76c066337c3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc169bc8ac85f2b17786ed348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 24 21:39:30 2010 +0100 mshtml: Code clean up. --- dlls/mshtml/tests/htmllocation.c | 147 ++++++++++++++++++-------------------- 1 files changed, 71 insertions(+), 76 deletions(-) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 60a1f20..7de9a94 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -22,10 +22,11 @@ #include <wine/test.h> #include "mshtml.h" +#include "wininet.h" struct location_test { const char *name; - const WCHAR *url; + const char *url; const char *href; const char *protocol; @@ -37,75 +38,68 @@ struct location_test { const char *hash; }; -static const WCHAR http_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','?','s','e','a','r','c','h','#','h','a','s','h',0}; -static const struct location_test http_test = { - "HTTP", - http_url, - "http://www.winehq.org/?search#hash", - "http:", - "www.winehq.org:80", - "www.winehq.org", - "80", - "", - "?search", - "#hash" - }; - -static const WCHAR http_file_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e','?','s','e','a','r','c','h','#','h','a','s','h',0}; -static const struct location_test http_file_test = { - "HTTP with file", - http_file_url, - "http://www.winehq.org/file?search#hash", - "http:", - "www.winehq.org:80", - "www.winehq.org", - "80", - "file", - "?search", - "#hash" - }; - -static const WCHAR ftp_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/',0}; -static const struct location_test ftp_test = { - "FTP", - ftp_url, - "ftp://ftp.winehq.org/", - "ftp:", - "ftp.winehq.org:21", - "ftp.winehq.org", - "21", - "", - NULL, - NULL - }; - -static const WCHAR ftp_file_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e',0}; -static const struct location_test ftp_file_test = { - "FTP with file", - ftp_file_url, - "ftp://ftp.winehq.org/file", - "ftp:", - "ftp.winehq.org:21", - "ftp.winehq.org", - "21", - "file", - NULL, - NULL - }; - -static const WCHAR file_url[] = {'f','i','l','e',':','/','/','C',':','\\','w','i','n','d','o','w','s','\\','w','i','n','.','i','n','i',0}; -static const struct location_test file_test = { - "FILE", - file_url, - "file:///C:/windows/win.ini", - "file:", - NULL, - NULL, - "", - "C:\\windows\\win.ini", - NULL, - NULL - }; +static const struct location_test location_tests[] = { + { + "HTTP", + "http://www.winehq.org?search#hash", + "http://www.winehq.org/?search#hash", + "http:", + "www.winehq.org:80", + "www.winehq.org", + "80", + "", + "?search", + "#hash" + }, + { + "HTTP with file", + "http://www.winehq.org/file?search#hash", + "http://www.winehq.org/file?search#hash", + "http:", + "www.winehq.org:80", + "www.winehq.org", + "80", + "file", + "?search", + "#hash" + }, + { + "FTP", + "ftp://ftp.winehq.org/", + "ftp://ftp.winehq.org/", + "ftp:", + "ftp.winehq.org:21", + "ftp.winehq.org", + "21", + "", + NULL, + NULL + }, + { + "FTP with file", + "ftp://ftp.winehq.org/file", + "ftp://ftp.winehq.org/file", + "ftp:", + "ftp.winehq.org:21", + "ftp.winehq.org", + "21", + "file", + NULL, + NULL + }, + { + "FILE", + "file://C:\\windows\\win.ini", + "file:///C:/windows/win.ini", + "file:", + NULL, + NULL, + "", + "C:\\windows\\win.ini", + NULL, + NULL + } +}; static int str_eq_wa(LPCWSTR strw, const char *stra) { @@ -267,6 +261,7 @@ static void test_hash(IHTMLLocation *loc, const struct location_test *test) static void perform_test(const struct location_test* test) { + WCHAR url[INTERNET_MAX_URL_LENGTH]; HRESULT hres; IBindCtx *bc; IMoniker *url_mon; @@ -280,7 +275,8 @@ static void perform_test(const struct location_test* test) if(FAILED(hres)) return; - hres = CreateURLMoniker(NULL, test->url, &url_mon); + MultiByteToWideChar(CP_ACP, 0, test->url, -1, url, sizeof(url)/sizeof(WCHAR)); + hres = CreateURLMoniker(NULL, url, &url_mon); ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08x\n", test->name, hres); if(FAILED(hres)){ IBindCtx_Release(bc); @@ -356,13 +352,12 @@ static void perform_test(const struct location_test* test) START_TEST(htmllocation) { + int i; + CoInitialize(NULL); - perform_test(&http_test); - perform_test(&http_file_test); - perform_test(&ftp_test); - perform_test(&ftp_file_test); - perform_test(&file_test); + for(i=0; i < sizeof(location_tests)/sizeof(*location_tests); i++) + perform_test(location_tests+i); CoUninitialize(); }

1 0

Vincent Povirk : gdiplus: Prefer the builtin version.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: db3d756c1e4b03b0fb33f2863ab3d2275dcf00c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3d756c1e4b03b0fb33f2863… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Jan 24 15:18:46 2010 -0600 gdiplus: Prefer the builtin version. --- dlls/gdiplus/gdiplus.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 77cbc5c..383f536 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -58,9 +58,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); break;

1 0