December 2014 - Wine-Commits

Nikolay Sivov : dwrite: Support outlines with oblique simulation.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: bbe6655280082fd39d4a90a36719f13b37de9df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe6655280082fd39d4a90a36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 15 13:35:03 2014 +0300 dwrite: Support outlines with oblique simulation. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/freetype.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 07d894c..3558bf8 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -149,7 +149,7 @@ extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2*,UINT16,UINT16,DWRITE_GLYPH_METRICS*) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,struct glyph_outline**) DECLSPEC_HIDDEN; +extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9611050..61d370b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -515,7 +515,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace2 *iface, /* FIXME: cache outlines */ - hr = freetype_get_glyph_outline(iface, emSize, glyphs[g], &outline); + hr = freetype_get_glyph_outline(iface, emSize, glyphs[g], This->simulations, &outline); if (FAILED(hr)) return hr; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index b4d9859..43fa4df 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -339,7 +339,7 @@ static HRESULT get_outline_data(const FT_Outline *outline, struct glyph_outline return S_OK; } -HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 index, struct glyph_outline **ret) +HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 index, USHORT simulations, struct glyph_outline **ret) { FTC_ScalerRec scaler; HRESULT hr = S_OK; @@ -358,10 +358,10 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UIN FT_Outline *outline = &size->face->glyph->outline; FT_Matrix m; - m.xx = 1.0 * 0x10000; - m.xy = 0; + m.xx = 1 << 16; + m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; m.yx = 0; - m.yy = -1.0 * 0x10000; /* flip Y axis */ + m.yy = -(1 << 16); /* flip Y axis */ pFT_Outline_Transform(outline, &m); @@ -400,7 +400,7 @@ BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface) return FALSE; } -HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 index, struct glyph_outline **ret) +HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 index, USHORT simulations, struct glyph_outline **ret) { *ret = NULL; return E_NOTIMPL;

1 0

Austin English : include: Flesh out IEnumWIA_DEV_INFO.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: d3a3595e913c854609c11400e7d50fac14bdb62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a3595e913c854609c11400e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 15 18:12:40 2014 -0600 include: Flesh out IEnumWIA_DEV_INFO. --- include/wia_lh.idl | 30 +++++++++++++++++++++++++++++- include/wia_xp.idl | 30 +++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/include/wia_lh.idl b/include/wia_lh.idl index e13a658..7cadbc6 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -21,6 +21,7 @@ import "oaidl.idl"; import "propidl.idl"; interface IEnumWIA_DEV_INFO; +interface IWiaPropertyStorage; interface IWiaItem; interface IWiaEventCallback; @@ -98,7 +99,34 @@ interface IWiaDevMgr : IUnknown ] interface IEnumWIA_DEV_INFO : IUnknown { - /* fill in */ + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IWiaPropertyStorage **rgelt, + [out] ULONG *pceltFetched + ); + + HRESULT Skip( + [in] ULONG celt + ); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumWIA_DEV_INFO **ppIEnum + ); + + HRESULT GetCount( + [out] ULONG *celt + ); +} + +[ + object, + uuid(98B5E8A0-29CC-491a-AAC0-E6DB4FDCCEB6) +] +interface IWiaPropertyStorage : IUnknown +{ + /* FIXME: fill in */ } [ diff --git a/include/wia_xp.idl b/include/wia_xp.idl index e13a658..7cadbc6 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -21,6 +21,7 @@ import "oaidl.idl"; import "propidl.idl"; interface IEnumWIA_DEV_INFO; +interface IWiaPropertyStorage; interface IWiaItem; interface IWiaEventCallback; @@ -98,7 +99,34 @@ interface IWiaDevMgr : IUnknown ] interface IEnumWIA_DEV_INFO : IUnknown { - /* fill in */ + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IWiaPropertyStorage **rgelt, + [out] ULONG *pceltFetched + ); + + HRESULT Skip( + [in] ULONG celt + ); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumWIA_DEV_INFO **ppIEnum + ); + + HRESULT GetCount( + [out] ULONG *celt + ); +} + +[ + object, + uuid(98B5E8A0-29CC-491a-AAC0-E6DB4FDCCEB6) +] +interface IWiaPropertyStorage : IUnknown +{ + /* FIXME: fill in */ } [

1 0

Jacek Caban : mshtml: Added IHTMLElement4:: focusin semi-stub implementation.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 347842a6a1f3ad332789b00771d220c9ba475ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347842a6a1f3ad332789b0077… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 16 13:10:29 2014 +0100 mshtml: Added IHTMLElement4::focusin semi-stub implementation. --- dlls/mshtml/htmlelem.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f81ccee..d6cb18f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3690,15 +3690,19 @@ static HRESULT WINAPI HTMLElement4_get_onbeforeactivate(IHTMLElement4 *iface, VA static HRESULT WINAPI HTMLElement4_put_onfocusin(IHTMLElement4 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_FOCUSIN, &v); } static HRESULT WINAPI HTMLElement4_get_onfocusin(IHTMLElement4 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_FOCUSIN, p); } static HRESULT WINAPI HTMLElement4_put_onfocusout(IHTMLElement4 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 91e48d9..e1ece61 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -81,6 +81,9 @@ static const WCHAR onerrorW[] = {'o','n','e','r','r','o','r',0}; static const WCHAR focusW[] = {'f','o','c','u','s',0}; static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; +static const WCHAR focusinW[] = {'f','o','c','u','s','i','n',0}; +static const WCHAR onfocusinW[] = {'o','n','f','o','c','u','s','i','n',0}; + static const WCHAR helpW[] = {'h','e','l','p',0}; static const WCHAR onhelpW[] = {'o','n','h','e','l','p',0}; @@ -190,6 +193,8 @@ static const event_info_t event_info[] = { EVENT_BIND_TO_BODY}, {focusW, onfocusW, EVENTT_HTML, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, + {focusinW, onfocusinW, EVENTT_HTML, DISPID_EVMETH_ONFOCUSIN, + EVENT_BUBBLE}, {helpW, onhelpW, EVENTT_KEY, DISPID_EVMETH_ONHELP, EVENT_BUBBLE|EVENT_CANCELABLE}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index bc81171..e312a9c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -29,6 +29,7 @@ typedef enum { EVENTID_DRAGSTART, EVENTID_ERROR, EVENTID_FOCUS, + EVENTID_FOCUSIN, EVENTID_HELP, EVENTID_KEYDOWN, EVENTID_KEYPRESS,

1 0

Michael Stefaniuc : d3d9: Don't assert for shaders with the wrong vtbl.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 51406b471aa81a56dc38e4b266b51e09646987c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51406b471aa81a56dc38e4b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 16 09:57:09 2014 +0100 d3d9: Don't assert for shaders with the wrong vtbl. --- dlls/d3d9/shader.c | 6 ++++-- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 0c2c881..9430afd 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -167,7 +167,8 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d9_vertexshader_vtbl); + if (iface->lpVtbl != &d3d9_vertexshader_vtbl) + WARN("Vertex shader %p with the wrong vtbl %p\n", iface, iface->lpVtbl); return impl_from_IDirect3DVertexShader9(iface); } @@ -317,7 +318,8 @@ struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelSh { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d9_pixelshader_vtbl); + if (iface->lpVtbl != &d3d9_pixelshader_vtbl) + WARN("Pixel shader %p with the wrong vtbl %p\n", iface, iface->lpVtbl); return impl_from_IDirect3DPixelShader9(iface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3206e57..ffd3c11 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5518,6 +5518,7 @@ static void test_get_set_vertex_shader(void) { IDirect3DVertexShader9 *current_shader = NULL; IDirect3DVertexShader9 *shader = NULL; + const IDirect3DVertexShader9Vtbl *shader_vtbl; IDirect3DDevice9 *device; ULONG refcount, i; IDirect3D9 *d3d; @@ -5568,6 +5569,16 @@ static void test_get_set_vertex_shader(void) ok(current_shader == shader, "Got unexpected shader %p, expected %p.\n", current_shader, shader); IDirect3DVertexShader9_Release(current_shader); + /* SetVertexShader() with a bogus shader vtbl */ + shader_vtbl = shader->lpVtbl; + shader->lpVtbl = (IDirect3DVertexShader9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + shader->lpVtbl = NULL; + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + shader->lpVtbl = shader_vtbl; + IDirect3DVertexShader9_Release(shader); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -5640,6 +5651,7 @@ static void test_get_set_pixel_shader(void) { IDirect3DPixelShader9 *current_shader = NULL; IDirect3DPixelShader9 *shader = NULL; + const IDirect3DPixelShader9Vtbl *shader_vtbl; IDirect3DDevice9 *device; ULONG refcount, i; IDirect3D9 *d3d; @@ -5690,6 +5702,16 @@ static void test_get_set_pixel_shader(void) ok(current_shader == shader, "Got unexpected shader %p, expected %p.\n", current_shader, shader); IDirect3DPixelShader9_Release(current_shader); + /* SetPixelShader() with a bogus shader vtbl */ + shader_vtbl = shader->lpVtbl; + shader->lpVtbl = (IDirect3DPixelShader9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + shader->lpVtbl = NULL; + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + shader->lpVtbl = shader_vtbl; + IDirect3DPixelShader9_Release(shader); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Andrew Eikum : mshtml: Support new window targets for FORM elements.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 8df27741242e12060d1984ffa78a057bd7718209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df27741242e12060d1984ffa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 16 09:13:05 2014 -0600 mshtml: Support new window targets for FORM elements. --- dlls/mshtml/binding.h | 4 ++-- dlls/mshtml/hlink.c | 2 +- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlform.c | 27 +++++++++++++++------------ dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 36 +++++++++++++++++++++++++----------- 6 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 073f2fb..e40735c 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -138,9 +138,9 @@ HRESULT set_moniker(HTMLOuterWindow*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOO void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; -HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; +HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,request_data_t*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; -HRESULT submit_form(HTMLOuterWindow*,IUri*,nsIInputStream*) DECLSPEC_HIDDEN; +HRESULT submit_form(HTMLOuterWindow*,const WCHAR*,IUri*,nsIInputStream*) DECLSPEC_HIDDEN; void init_bscallback(BSCallback*,const BSCallbackVtbl*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 4e63498..7ce0423 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -85,7 +85,7 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L FIXME("JumpLocation not supported\n"); if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL); + return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index df95c2b..6650a44 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -65,7 +65,7 @@ static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *targ if(FAILED(hres)) return hres; - hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL); + hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL, NULL); IUri_Release(uri); return hres; } diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index e901dbe..2b2a62f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -389,6 +389,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) IUri *uri; nsresult nsres; HRESULT hres; + BOOL use_new_window; TRACE("(%p)->()\n", This); @@ -404,22 +405,21 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &target_str); - if(NS_SUCCEEDED(nsres)) { - BOOL use_new_window; + if(NS_SUCCEEDED(nsres)) window = get_target_window(this_window, &target_str, &use_new_window); - if(use_new_window) - FIXME("submit to new window is not supported\n"); - } - nsAString_Finish(&target_str); - if(!window) + + if(!window && !use_new_window) { + nsAString_Finish(&target_str); return S_OK; + } /* * FIXME: We currently don't use our submit implementation for sub-windows because * load_nsuri can't support post data. We should fix it. */ - if(!window->doc_obj || window->doc_obj->basedoc.window != window) { + if(window && (!window->doc_obj || window->doc_obj->basedoc.window != window)) { nsres = nsIDOMHTMLFormElement_Submit(This->nsform); + nsAString_Finish(&target_str); IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(NS_FAILED(nsres)) { ERR("Submit failed: %08x\n", nsres); @@ -442,13 +442,16 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) } nsAString_Finish(&action_uri_str); if(SUCCEEDED(hres)) { - window->readystate_locked++; - hres = submit_form(window, uri, post_stream); - window->readystate_locked--; + const PRUnichar *target; + + nsAString_GetData(&target_str, &target); + hres = submit_form(window, target, uri, post_stream); IUri_Release(uri); } - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + nsAString_Finish(&target_str); + if(window) + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(post_stream) nsIInputStream_Release(post_stream); return hres; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6c6c328..82bb374 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -967,7 +967,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, if(FAILED(hres)) return hres; - hres = navigate_new_window(window, uri, name, pomWindowResult); + hres = navigate_new_window(window, uri, name, NULL, pomWindowResult); IUri_Release(uri); return hres; } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 85e47aa..2ac12ea 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2107,7 +2107,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC return hres; } -HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, IHTMLWindow2 **ret) +HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, request_data_t *request_data, IHTMLWindow2 **ret) { IWebBrowser2 *web_browser; IHTMLWindow2 *new_window; @@ -2115,7 +2115,12 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - hres = create_channelbsc(NULL, NULL, NULL, 0, FALSE, &bsc); + if(request_data) + hres = create_channelbsc(NULL, request_data->headers, + request_data->post_data, request_data->post_data_len, FALSE, + &bsc); + else + hres = create_channelbsc(NULL, NULL, NULL, 0, FALSE, &bsc); if(FAILED(hres)) return hres; @@ -2322,23 +2327,32 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ return S_OK; } -HRESULT submit_form(HTMLOuterWindow *window, IUri *submit_uri, nsIInputStream *post_stream) +HRESULT submit_form(HTMLOuterWindow *window, const WCHAR *target, IUri *submit_uri, nsIInputStream *post_stream) { request_data_t request_data = {NULL}; - BSTR display_uri; - IUri *uri; HRESULT hres; hres = read_post_data_stream(post_stream, TRUE, NULL, &request_data); if(FAILED(hres)) return hres; - hres = translate_uri(window, submit_uri, &display_uri, &uri); - if(SUCCEEDED(hres)) { - hres = navigate_uri(window, uri, display_uri, &request_data, BINDING_NAVIGATED|BINDING_SUBMIT); - IUri_Release(uri); - SysFreeString(display_uri); - } + if(window) { + IUri *uri; + BSTR display_uri; + + window->readystate_locked++; + + hres = translate_uri(window, submit_uri, &display_uri, &uri); + if(SUCCEEDED(hres)) { + hres = navigate_uri(window, uri, display_uri, &request_data, BINDING_NAVIGATED|BINDING_SUBMIT); + IUri_Release(uri); + SysFreeString(display_uri); + } + + window->readystate_locked--; + }else + hres = navigate_new_window(window, submit_uri, target, &request_data, NULL); + release_request_data(&request_data); return hres; }

1 0

Nikolay Sivov : dwrite: Font collection pointer is never null when creating text format.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: f4e30056454fff1c585564f6b3ec5123100b64e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e30056454fff1c585564f6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 16 17:48:15 2014 +0300 dwrite: Font collection pointer is never null when creating text format. --- dlls/dwrite/layout.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6d8145d..4c65732 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1972,14 +1972,8 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimming.delimiter = 0; This->format.trimming.delimiterCount = 0; This->format.trimmingsign = NULL; - - if (collection) - { - This->format.collection = collection; - IDWriteFontCollection_AddRef(collection); - } - else - ERR("Collection should always be set\n"); + This->format.collection = collection; + IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat*)&This->IDWriteTextFormat1_iface;

1 0

Jacek Caban : mshtml: Handle VT_ERROR in IHTMLSelectElement::add.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: e41f435c47d35bc5d5f42e66443080f65055c13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41f435c47d35bc5d5f42e664… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 16 13:10:36 2014 +0100 mshtml: Handle VT_ERROR in IHTMLSelectElement::add. --- dlls/mshtml/htmlselect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3cdf496..5d5967e 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -382,6 +382,7 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem switch(V_VT(&before)) { case VT_EMPTY: + case VT_ERROR: nsres = nsIWritableVariant_SetAsEmpty(nsvariant); break; case VT_I2:

1 0

Sebastian Lackner : mfplat: Implement stubs for MFStartup and MFShutdown.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 46d06eb431c21b64c8c7f2de3742c736efa1ead1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d06eb431c21b64c8c7f2de3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 12 00:56:54 2014 +0100 mfplat: Implement stubs for MFStartup and MFShutdown. --- dlls/mfplat/main.c | 23 +++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a72f634..5608644 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -22,6 +22,11 @@ #include "windef.h" #include "winbase.h" +#include "mferror.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +41,21 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * MFStartup (mfplat.@) + */ +HRESULT WINAPI MFStartup(ULONG version, DWORD flags) +{ + FIXME("(%u, %u): stub\n", version, flags); + return MF_E_BAD_STARTUP_VERSION; +} + +/*********************************************************************** + * MFShutdown (mfplat.@) + */ +HRESULT WINAPI MFShutdown(void) +{ + FIXME("(): stub\n"); + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 98a7147..7100dfd 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -131,8 +131,8 @@ @ stub MFSerializeMediaTypeToStream @ stub MFSerializePresentationDescriptor @ stub MFSetSockaddrAny -@ stub MFShutdown -@ stub MFStartup +@ stdcall MFShutdown() +@ stdcall MFStartup(long long) @ stub MFStreamDescriptorProtectMediaType @ stub MFTEnum @ stub MFTEnumEx

1 0

Sebastian Lackner : include: Add mferror.h header.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: d64bb04764e16a82bc4d0fc14be5313e467f0570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64bb04764e16a82bc4d0fc14… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 12 00:56:28 2014 +0100 include: Add mferror.h header. --- include/Makefile.in | 1 + include/mferror.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c9f683a..b05fa29 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -396,6 +396,7 @@ SRCDIR_INCLUDES = \ mciavi.h \ mcx.h \ mediaerr.h \ + mferror.h \ midles.h \ minmax.h \ mmddk.h \ diff --git a/include/mferror.h b/include/mferror.h new file mode 100644 index 0000000..1f5ae98 --- /dev/null +++ b/include/mferror.h @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2014 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MFERROR_H +#define __WINE_MFERROR_H + +#define MF_E_PLATFORM_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b0) +#define MF_E_BUFFERTOOSMALL _HRESULT_TYPEDEF_(0xc00d36b1) +#define MF_E_INVALIDREQUEST _HRESULT_TYPEDEF_(0xc00d36b2) +#define MF_E_INVALIDSTREAMNUMBER _HRESULT_TYPEDEF_(0xc00d36b3) +#define MF_E_INVALIDMEDIATYPE _HRESULT_TYPEDEF_(0xc00d36b4) +#define MF_E_NOTACCEPTING _HRESULT_TYPEDEF_(0xc00d36b5) +#define MF_E_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b6) +#define MF_E_UNSUPPORTED_REPRESENTATION _HRESULT_TYPEDEF_(0xc00d36b7) +#define MF_E_NO_MORE_TYPES _HRESULT_TYPEDEF_(0xc00d36b9) +#define MF_E_UNSUPPORTED_SERVICE _HRESULT_TYPEDEF_(0xc00d36ba) +#define MF_E_UNEXPECTED _HRESULT_TYPEDEF_(0xc00d36bb) +#define MF_E_INVALIDNAME _HRESULT_TYPEDEF_(0xc00d36bc) +#define MF_E_INVALIDTYPE _HRESULT_TYPEDEF_(0xc00d36bd) +#define MF_E_INVALID_FILE_FORMAT _HRESULT_TYPEDEF_(0xc00d36be) +#define MF_E_INVALIDINDEX _HRESULT_TYPEDEF_(0xc00d36bf) +#define MF_E_INVALID_TIMESTAMP _HRESULT_TYPEDEF_(0xc00d36c0) +#define MF_E_UNSUPPORTED_SCHEME _HRESULT_TYPEDEF_(0xc00d36c3) +#define MF_E_UNSUPPORTED_BYTESTREAM_TYPE _HRESULT_TYPEDEF_(0xc00d36c4) +#define MF_E_UNSUPPORTED_TIME_FORMAT _HRESULT_TYPEDEF_(0xc00d36c5) +#define MF_E_NO_SAMPLE_TIMESTAMP _HRESULT_TYPEDEF_(0xc00d36c8) +#define MF_E_NO_SAMPLE_DURATION _HRESULT_TYPEDEF_(0xc00d36c9) +#define MF_E_INVALID_STREAM_DATA _HRESULT_TYPEDEF_(0xc00d36cb) +#define MF_E_RT_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d36cf) +#define MF_E_UNSUPPORTED_RATE _HRESULT_TYPEDEF_(0xc00d36d0) +#define MF_E_THINNING_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d36d1) +#define MF_E_REVERSE_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d36d2) +#define MF_E_UNSUPPORTED_RATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d36d3) +#define MF_E_RATE_CHANGE_PREEMPTED _HRESULT_TYPEDEF_(0xc00d36d4) +#define MF_E_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d36d5) +#define MF_E_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d36d6) +#define MF_E_NO_CLOCK _HRESULT_TYPEDEF_(0xc00d36d7) +#define MF_S_MULTIPLE_BEGIN _HRESULT_TYPEDEF_(0x000d36d8) +#define MF_E_MULTIPLE_BEGIN _HRESULT_TYPEDEF_(0xc00d36d9) +#define MF_E_MULTIPLE_SUBSCRIBERS _HRESULT_TYPEDEF_(0xc00d36da) +#define MF_E_TIMER_ORPHANED _HRESULT_TYPEDEF_(0xc00d36db) +#define MF_E_STATE_TRANSITION_PENDING _HRESULT_TYPEDEF_(0xc00d36dc) +#define MF_E_UNSUPPORTED_STATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d36dd) +#define MF_E_UNRECOVERABLE_ERROR_OCCURRED _HRESULT_TYPEDEF_(0xc00d36de) +#define MF_E_SAMPLE_HAS_TOO_MANY_BUFFERS _HRESULT_TYPEDEF_(0xc00d36df) +#define MF_E_SAMPLE_NOT_WRITABLE _HRESULT_TYPEDEF_(0xc00d36e0) +#define MF_E_INVALID_KEY _HRESULT_TYPEDEF_(0xc00d36e2) +#define MF_E_BAD_STARTUP_VERSION _HRESULT_TYPEDEF_(0xc00d36e3) +#define MF_E_UNSUPPORTED_CAPTION _HRESULT_TYPEDEF_(0xc00d36e4) +#define MF_E_INVALID_POSITION _HRESULT_TYPEDEF_(0xc00d36e5) +#define MF_E_ATTRIBUTENOTFOUND _HRESULT_TYPEDEF_(0xc00d36e6) +#define MF_E_PROPERTY_TYPE_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d36e7) + +#define MF_E_TOPO_INVALID_OPTIONAL_NODE _HRESULT_TYPEDEF_(0xc00d520e) +#define MF_E_TOPO_CANNOT_FIND_DECRYPTOR _HRESULT_TYPEDEF_(0xc00d5211) +#define MF_E_TOPO_CODEC_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d5212) +#define MF_E_TOPO_CANNOT_CONNECT _HRESULT_TYPEDEF_(0xc00d5213) +#define MF_E_TOPO_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d5214) +#define MF_E_TOPO_INVALID_TIME_ATTRIBUTES _HRESULT_TYPEDEF_(0xc00d5215) +#define MF_E_TOPO_LOOPS_IN_TOPOLOGY _HRESULT_TYPEDEF_(0xC00d5216) +#define MF_E_TOPO_MISSING_PRESENTATION_DESCRIPTOR _HRESULT_TYPEDEF_(0xc00d5217) +#define MF_E_TOPO_MISSING_STREAM_DESCRIPTOR _HRESULT_TYPEDEF_(0xc00d5218) +#define MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED _HRESULT_TYPEDEF_(0xc00d5219) +#define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) +#define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) + +#endif /* __WINE_MFERROR_H */

1 0

Sebastian Lackner : psapi: Implement semi-stub for K32EnumProcessModulesEx.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: cacc9ae888b005efa5a04f5a1559b9a9d21598eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacc9ae888b005efa5a04f5a1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 23:00:53 2014 +0100 psapi: Implement semi-stub for K32EnumProcessModulesEx. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/module.c | 14 ++++++++++++++ dlls/psapi/psapi.spec | 1 + include/psapi.h | 1 + 4 files changed, 17 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 886eb42..c79b5d7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -803,6 +803,7 @@ @ stdcall K32EnumPageFilesA(ptr ptr) @ stdcall K32EnumPageFilesW(ptr ptr) @ stdcall K32EnumProcessModules(long ptr long ptr) +@ stdcall K32EnumProcessModulesEx(long ptr long ptr long) @ stdcall K32EnumProcesses(ptr long ptr) @ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) @ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index ca4cf41..2a87e66 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1247,6 +1247,20 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, } /*********************************************************************** + * K32EnumProcessModulesEx (KERNEL32.@) + * + * NOTES + * Returned list is in load order. + */ +BOOL WINAPI K32EnumProcessModulesEx(HANDLE process, HMODULE *lphModule, + DWORD cb, DWORD *needed, DWORD filter) +{ + FIXME("(%p, %p, %d, %p, %d) semi-stub\n", + process, lphModule, cb, needed, filter); + return K32EnumProcessModules(process, lphModule, cb, needed); +} + +/*********************************************************************** * K32GetModuleBaseNameW (KERNEL32.@) */ DWORD WINAPI K32GetModuleBaseNameW(HANDLE process, HMODULE module, diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 45a1325..d6116f8 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -3,6 +3,7 @@ @ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA @ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW @ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules +@ stdcall EnumProcessModulesEx(long ptr long ptr long) kernel32.K32EnumProcessModulesEx @ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA @ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW diff --git a/include/psapi.h b/include/psapi.h index f031724..fbdd903 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -81,6 +81,7 @@ extern "C" { BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*); BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD); +BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD); DWORD WINAPI GetModuleBaseNameA(HANDLE, HMODULE, LPSTR, DWORD); DWORD WINAPI GetModuleBaseNameW(HANDLE, HMODULE, LPWSTR, DWORD); #define GetModuleBaseName WINELIB_NAME_AW(GetModuleBaseName)

1 0