wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetString() helper.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: ea45ed1751860905daa33af5e45d38cbbeadd0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea45ed1751860905daa33af5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:54 2019 +0100 d3dx9: Merge the d3dx_effect_GetString() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 554d43d..a81e330 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1515,23 +1515,6 @@ static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char **string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (string && param && !param->element_count && param->type == D3DXPT_STRING) - { - *string = *(const char **)param->data; - TRACE("Returning %s.\n", debugstr_a(*string)); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3561,10 +3544,20 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); - return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); + if (string && param && !param->element_count && param->type == D3DXPT_STRING) + { + *string = *(const char **)param->data; + TRACE("Returning %s.\n", debugstr_a(*string)); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 7ce336969ca4f7adba33c45f5f746a8f656348cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce336969ca4f7adba33c45f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:53 2019 +0100 d3dx9: Merge the d3dx_effect_GetPixelShader() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 993e613..554d43d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1582,24 +1582,6 @@ static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_pixel_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) - { - if ((*shader = *(struct IDirect3DPixelShader9 **)param->data)) - IDirect3DPixelShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3606,13 +3588,24 @@ static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHAND } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DPixelShader9 **shader) + IDirect3DPixelShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) + { + if ((*shader = *(IDirect3DPixelShader9 **)param->data)) + IDirect3DPixelShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameterDesc() helper.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 262238d46752700c2041cb9548724c66bd017eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=262238d46752700c2041cb95… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:52 2019 +0100 d3dx9: Merge the d3dx_effect_GetParameterDesc() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b12127b..993e613 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -989,33 +989,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!desc || !param) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = param->name; - desc->Semantic = param->semantic; - desc->Class = param->class; - desc->Type = param->type; - desc->Rows = param->rows; - desc->Columns = param->columns; - desc->Elements = param->element_count; - desc->Annotations = is_top_level_parameter(param) - ? top_level_parameter_from_parameter(param)->annotation_count : 0; - desc->StructMembers = param->member_count; - desc->Flags = param->flags; - desc->Bytes = param->bytes; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -2335,10 +2308,30 @@ static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDL D3DXPARAMETER_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); - return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); + if (!desc || !param) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = param->name; + desc->Semantic = param->semantic; + desc->Class = param->class; + desc->Type = param->type; + desc->Rows = param->rows; + desc->Columns = param->columns; + desc->Elements = param->element_count; + desc->Annotations = is_top_level_parameter(param) + ? top_level_parameter_from_parameter(param)->annotation_count : 0; + desc->StructMembers = param->member_count; + desc->Flags = param->flags; + desc->Bytes = param->bytes; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique,

1 0

Józef Kucia : d3dxof: Change "value" size to 512.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 360df6a520a90c2e4991739da3bdcd63619f5c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=360df6a520a90c2e4991739d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 00:11:06 2019 +0100 d3dxof: Change "value" size to 512. is_name() may write up to 512 bytes to the "value". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/d3dxof_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index cf33ed2..ff29261 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -130,7 +130,7 @@ typedef struct { BOOL list_separator; ULONG cur_pos_data; LPBYTE cur_pstrings; - BYTE value[100]; + BYTE value[512]; xobject** pxo_globals; ULONG nb_pxo_globals; xobject* pxo_tab;

1 0

Michael Stefaniuc : gdi32: Remove unused return value of init_system_links ().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: fe7dcc29089f20efd25d02781e5b61c4bdf47414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe7dcc29089f20efd25d0278… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 12 21:19:19 2019 +0100 gdi32: Remove unused return value of init_system_links(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 68d232e..333856e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2568,10 +2568,9 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) /************************************************************* * init_system_links */ -static BOOL init_system_links(void) +static void init_system_links(void) { HKEY hkey; - BOOL ret = FALSE; DWORD type, max_val, max_data, val_len, data_len, index; WCHAR *value, *data; WCHAR *entry, *next; @@ -2717,7 +2716,6 @@ skip_internal: } } list_add_tail(&system_links, &system_font_link->entry); - return ret; } static BOOL ReadFontDir(const char *dirname, BOOL external_fonts)

1 0

Jacek Caban : jscript: Add Array.prototype.map implementation.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 60816b9f8adf1b70c1d1427440c4a9888caf33c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60816b9f8adf1b70c1d14274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:30:57 2019 +0100 jscript: Add Array.prototype.map implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 63 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 45 ++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 28289cb..a7b1f02 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -49,6 +49,7 @@ static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; +static const WCHAR mapW[] = {'m','a','p',0}; static const WCHAR default_separatorW[] = {',',0}; @@ -1044,6 +1045,67 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi return S_OK; } +static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + IDispatch *context_this = NULL, *callback; + jsval_t callback_args[3], mapped_value; + jsdisp_t *jsthis, *array; + DWORD length, k; + HRESULT hres; + + TRACE("\n"); + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) { + FIXME("Could not get length\n"); + return hres; + } + + /* Fixme check IsCallable */ + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_INVALIDARG; + } + callback = get_object(argv[0]); + + if(argc > 1) { + if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + context_this = get_object(argv[1]); + } + + hres = create_array(ctx, length, &array); + if(FAILED(hres)) + return hres; + + for(k = 0; k < length; k++) { + hres = jsdisp_get_idx(jsthis, k, &callback_args[0]); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + break; + + callback_args[1] = jsval_number(k); + callback_args[2] = jsval_obj(jsthis); + hres = disp_call_value(ctx, callback, context_this, DISPATCH_METHOD, 3, callback_args, &mapped_value); + jsval_release(callback_args[0]); + if(FAILED(hres)) + break; + + hres = jsdisp_propput_idx(array, k, mapped_value); + if(FAILED(hres)) + break; + } + + if(SUCCEEDED(hres) && r) + *r = jsval_obj(array); + else + jsdisp_release(array); + return hres; +} + /* ECMA-262 3rd Edition 15.4.4.13 */ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -1146,6 +1208,7 @@ static const builtin_prop_t Array_props[] = { {indexOfW, Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, {joinW, Array_join, PROPF_METHOD|1}, {lengthW, NULL,0, Array_get_length, Array_set_length}, + {mapW, Array_map, PROPF_METHOD|PROPF_ES5|1}, {popW, Array_pop, PROPF_METHOD}, {pushW, Array_push, PROPF_METHOD|1}, {reverseW, Array_reverse, PROPF_METHOD}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 1e8fabd..1cbf13e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -190,6 +190,7 @@ function test_javascript() { test_exposed("forEach", Array.prototype, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); test_exposed("trim", String.prototype, v >= 9); + test_exposed("map", Array.prototype, v >= 9); /* FIXME: IE8 implements weird semi-functional property descriptors. */ if(v != 8) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 69fe0fe..6cfee81 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -130,6 +130,50 @@ function test_isArray() { next_test(); } +function test_array_map() { + var calls, m, arr, ctx; + + /* basic map call with context */ + calls = ""; + arr = [1,2,3]; + ctx = {}; + m = arr.map(function(x, i, a) { + ok(this === ctx, "this != ctx"); + ok(i === x - 1, "i = " + i); + ok(a === arr, "a != arr"); + calls += x + ","; + return x * 2; + }, ctx); + ok(calls === "1,2,3,", "calls = " + calls); + ok(m.join() === "2,4,6", "m = " + m); + + /* non-array object as this argument */ + calls = ""; + arr = { 1: "one", 2: "two", 3: "three", length: 3 }; + m = Array.prototype.map.call(arr, function(x, i) { + calls += i + ":" + x + ","; + return x + "!"; + }); + ok(calls === "1:one,2:two,", "calls = " + calls); + ok(m.join() === ",one!,two!", "m = " + m); + ok(!("0" in m), "0 is in m"); + + /* mutate array in callback */ + calls = ""; + arr = [1,2,3]; + m = Array.prototype.map.call(arr, function(x, i) { + calls += i + ":" + x + ","; + for(var j = i; j < arr.length; j++) + arr[j]++; + arr.push(i * i); + return x - 1; + }); + ok(calls === "0:1,1:3,2:5,", "calls = " + calls); + ok(m.join() === "0,2,4", "m = " + m); + + next_test(); +} + function test_identifier_keywords() { var o = { if: 1, @@ -625,6 +669,7 @@ var tests = [ test_indexOf, test_array_forEach, test_isArray, + test_array_map, test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty,

1 0

Jacek Caban : mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 120bf0eba9c50708b80f6ee7529d5e0e041483fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=120bf0eba9c50708b80f6ee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:38 2019 +0100 mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlwindow.c | 2 -- dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d5e2a70..013fffb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5321,10 +5321,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) This->basedoc.doc_node->basedoc.doc_obj = NULL; htmldoc_release(&This->basedoc.doc_node->basedoc); } - if(This->basedoc.window) { - This->basedoc.window->doc_obj = NULL; + if(This->basedoc.window) IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); - } if(This->advise_holder) IOleAdviseHolder_Release(This->advise_holder); @@ -5498,8 +5496,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->basedoc.window = doc->nscontainer->content_window; IHTMLWindow2_AddRef(&doc->basedoc.window->base.IHTMLWindow2_iface); - doc->basedoc.window->doc_obj = doc; - if(!doc->basedoc.doc_node && doc->basedoc.window->base.inner_window->doc) { doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc; htmldoc_addref(&doc->basedoc.doc_node->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fd18ce0..92b0537 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3567,8 +3567,6 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window->base.outer_window = window; window->base.inner_window = NULL; - - window->doc_obj = browser->doc; window->browser = browser; list_add_head(&browser->outer_windows, &window->browser_entry); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 966da77..f2939da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -475,7 +475,6 @@ struct HTMLOuterWindow { LONG task_magic; - HTMLDocumentObj *doc_obj; nsIDOMWindow *nswindow; mozIDOMWindowProxy *window_proxy; HTMLOuterWindow *parent;

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_uri.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 2a6cb251f9ccd52ec5b9cc0d818b40124265178b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6cb251f9ccd52ec5b9cc0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:26 2019 +0100 mshtml: Access document object via browser object in navigate_uri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 81c9db5..6fe3fc8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2404,7 +2404,10 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->webbrowser) { + if(!window->browser) + return E_UNEXPECTED; + + if(window->browser->doc->webbrowser) { DWORD post_data_len = request_data ? request_data->post_data_len : 0; void *post_data = post_data_len ? request_data->post_data : NULL; const WCHAR *headers = request_data ? request_data->headers : NULL; @@ -2413,13 +2416,13 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis BSTR frame_name = NULL; BOOL cancel = FALSE; - if(window != window->doc_obj->basedoc.window) { + if(!is_main_content_window(window)) { hres = IHTMLWindow2_get_name(&window->base.IHTMLWindow2_iface, &frame_name); if(FAILED(hres)) return hres; } - hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, + hres = IDocObjectService_FireBeforeNavigate2(window->browser->doc->doc_object_service, NULL, display_uri, 0x40, frame_name, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); SysFreeString(frame_name); if(SUCCEEDED(hres) && cancel) { @@ -2428,11 +2431,11 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis } } - if(window == window->doc_obj->basedoc.window) + if(is_main_content_window(window)) return super_navigate(window, uri, flags, headers, post_data, post_data_len); } - if(window->doc_obj && window == window->doc_obj->basedoc.window) { + if(is_main_content_window(window)) { BOOL cancel; hres = hlink_frame_navigate(&window->base.inner_window->doc->basedoc, display_uri, NULL, 0, &cancel); @@ -2478,10 +2481,10 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ if(FAILED(hres)) return hres; - if(window->doc_obj && window->doc_obj->hostui) { + if(window->browser->doc->hostui) { OLECHAR *translated_url = NULL; - hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, display_uri, + hres = IDocHostUIHandler_TranslateUrl(window->browser->doc->hostui, 0, display_uri, &translated_url); if(hres == S_OK && translated_url) { TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url));

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_new_window.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: da055b64569632d16749066496c479d72eee67dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=da055b64569632d167490664… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:15 2019 +0100 mshtml: Access document object via browser object in navigate_new_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 19dda29..81c9db5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2253,8 +2253,11 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - if (window->doc_obj->client) { - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, + if(!window->browser) + return E_UNEXPECTED; + + if (window->browser->doc->client) { + hres = do_query_service((IUnknown*)window->browser->doc->client, &SID_SNewWindowManager, &IID_INewWindowManager, (void**)&new_window_mgr); if (FAILED(hres)) { FIXME("No INewWindowManager\n"); @@ -2272,8 +2275,8 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam } hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url, - NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); - window->doc_obj->has_popup = TRUE; + NULL, FALSE, window->browser->doc->has_popup ? 0 : NWMF_FIRST, 0); + window->browser->doc->has_popup = TRUE; SysFreeString(display_uri); SysFreeString(context_url); INewWindowManager_Release(new_window_mgr);

1 0

Jacek Caban : mshtml: Access document object via browser object in super_navigate.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 26d3e0c5dbb1d2343a86bfd980313e5873635d25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d3e0c5dbb1d2343a86bfd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:08 2019 +0100 mshtml: Access document object via browser object in super_navigate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3792fd8..19dda29 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2139,10 +2139,10 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC if(!uri_nofrag) return E_FAIL; - if(window->doc_obj->client && !(flags & BINDING_REFRESH)) { + if(window->browser->doc->client && !(flags & BINDING_REFRESH)) { IOleCommandTarget *cmdtrg; - hres = IOleClientSite_QueryInterface(window->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IOleClientSite_QueryInterface(window->browser->doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT in, out; BSTR url_str; @@ -2187,7 +2187,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC return hres; } - prepare_for_binding(&window->doc_obj->basedoc, mon, flags); + prepare_for_binding(&window->browser->doc->basedoc, mon, flags); hres = IUri_GetScheme(uri, &scheme); if(SUCCEEDED(hres) && scheme == URL_SCHEME_JAVASCRIPT) { @@ -2203,7 +2203,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Why silently? */ window->readystate = READYSTATE_COMPLETE; if(!(flags & BINDING_FROMHIST)) - call_docview_84(window->doc_obj); + call_docview_84(window->browser->doc); IUri_AddRef(uri); task->window = window; @@ -2228,7 +2228,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Silently and repeated when real loading starts? */ window->readystate = READYSTATE_LOADING; if(!(flags & (BINDING_FROMHIST|BINDING_REFRESH))) - call_docview_84(window->doc_obj); + call_docview_84(window->browser->doc); task->window = window; task->bscallback = bsc;

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 March 2019