wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 1a938ceb879f0d6d30a94362c7908680ec421cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a938ceb879f0d6d30a94362c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Apr 4 22:30:33 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/lt.po b/po/lt.po index a5ded30..06d414f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-03-01 22:44+0300\n" +"PO-Revision-Date: 2016-04-04 22:30+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11643,6 +11643,7 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Sebastian Lackner : ntoskrnl.exe: Add missing linebreak to FIXME in KeDelayExecutionThread.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 6c8f398e485b83a0794d530e25f2fcc1027f7997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8f398e485b83a0794d530e2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 4 21:01:34 2016 +0200 ntoskrnl.exe: Add missing linebreak to FIXME in KeDelayExecutionThread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c416b0e..0e87b82 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2494,6 +2494,6 @@ NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) */ NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertable, PLARGE_INTEGER interval) { - FIXME("%u %u %p", waitmode, alertable, interval); + FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); return STATUS_NOT_IMPLEMENTED; }

1 0

Henri Verbeet : wined3d: Return a wined3d_texture_sub_resource structure from wined3d_texture_get_sub_resource ().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 639dd9b9e319504d985ff7cbeb332d9d3d50be01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639dd9b9e319504d985ff7cbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:43:02 2016 +0200 wined3d: Return a wined3d_texture_sub_resource structure from wined3d_texture_get_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 20 ++++++----- dlls/wined3d/texture.c | 82 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 55 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=639dd9b9e319504d985ff…

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in surface_load_ds_location().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 4f3648705ed1914ee34951c7c07bdd49fb314f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3648705ed1914ee34951c7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:43:01 2016 +0200 wined3d: Avoid surface_from_resource() in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2b8db06..16d03e8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2861,7 +2861,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)), + wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, NULL, WINED3D_LOCATION_DRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { @@ -2907,7 +2907,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win TRACE("Copying depth texture to onscreen depth buffer.\n"); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)), + wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, NULL, WINED3D_LOCATION_DRAWABLE); surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gdi_present().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: e6e89dbc65b709d5ed1778e493d19d0e3392cdf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e89dbc65b709d5ed1778e49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:43:00 2016 +0200 wined3d: Avoid surface_from_resource() in swapchain_gdi_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index de8e3fc..b6e2e63 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -700,8 +700,8 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, { struct wined3d_surface *front, *back; - front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); - back = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + front = swapchain->front_buffer->sub_resources[0].u.surface; + back = swapchain->back_buffers[0]->sub_resources[0].u.surface; /* Flip the DC. */ {

1 0

Henri Verbeet : wined3d: Also update the swap interval when not recreating the context in wined3d_device_reset ().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 6b8fb1c22ea26f9fafda76133850af10ac3c7256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8fb1c22ea26f9fafda76133… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:42:59 2016 +0200 wined3d: Also update the swap interval when not recreating the context in wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 31 ------------------------------ dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/swapchain.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 50 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 33b5664..670bf6f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1582,7 +1582,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, HGLRC ctx, share_ctx; int pixel_format; unsigned int s; - int swap_interval; DWORD state; HDC hdc = 0; BOOL hdc_is_private = FALSE; @@ -1838,36 +1837,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - switch (swapchain->desc.swap_interval) - { - case WINED3DPRESENT_INTERVAL_IMMEDIATE: - swap_interval = 0; - break; - case WINED3DPRESENT_INTERVAL_DEFAULT: - case WINED3DPRESENT_INTERVAL_ONE: - swap_interval = 1; - break; - case WINED3DPRESENT_INTERVAL_TWO: - swap_interval = 2; - break; - case WINED3DPRESENT_INTERVAL_THREE: - swap_interval = 3; - break; - case WINED3DPRESENT_INTERVAL_FOUR: - swap_interval = 4; - break; - default: - FIXME("Unknown swap interval %#x.\n", swapchain->desc.swap_interval); - swap_interval = 1; - } - - if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) - { - if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) - ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", - swap_interval, ret, GetLastError()); - } - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); TRACE("Setting up the screen\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 62e5129..a0265f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4899,8 +4899,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } - if (reset_state && device->d3d_initialized) - hr = create_primary_opengl_context(device, swapchain); + if (device->d3d_initialized) + { + if (reset_state) + hr = create_primary_opengl_context(device, swapchain); + swapchain_update_swap_interval(swapchain); + } /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ba8f66c..de8e3fc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -993,6 +993,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); } context_release(swapchain->context[0]); + swapchain_update_swap_interval(swapchain); } if (swapchain->desc.backbuffer_count > 0) @@ -1221,6 +1222,48 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) } } +void swapchain_update_swap_interval(struct wined3d_swapchain *swapchain) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + int swap_interval; + + context = context_acquire(swapchain->device, swapchain->front_buffer->sub_resources[0].u.surface); + gl_info = context->gl_info; + + switch (swapchain->desc.swap_interval) + { + case WINED3DPRESENT_INTERVAL_IMMEDIATE: + swap_interval = 0; + break; + case WINED3DPRESENT_INTERVAL_DEFAULT: + case WINED3DPRESENT_INTERVAL_ONE: + swap_interval = 1; + break; + case WINED3DPRESENT_INTERVAL_TWO: + swap_interval = 2; + break; + case WINED3DPRESENT_INTERVAL_THREE: + swap_interval = 3; + break; + case WINED3DPRESENT_INTERVAL_FOUR: + swap_interval = 4; + break; + default: + FIXME("Unhandled present interval %#x.\n", swapchain->desc.swap_interval); + swap_interval = 1; + } + + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) + { + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", + swap_interval, context, GetLastError()); + } + + context_release(context); +} + void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { struct wined3d_device *device = swapchain->device; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c84a44d..5a23366 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3066,6 +3066,7 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void swapchain_update_swap_interval(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; /***************************************************************************** * Utility function prototypes

1 0

Henri Verbeet : wined3d: Try harder to create a converted surface in surface_convert_format().
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 425e84dac5c87f6b1e7d89b363017a045e4c0626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425e84dac5c87f6b1e7d89b36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:42:58 2016 +0200 wined3d: Try harder to create a converted surface in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 64 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a7dfbf5..2b8db06 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1704,27 +1704,31 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo } static struct wined3d_texture *surface_convert_format(struct wined3d_texture *src_texture, - unsigned int sub_resource_idx, enum wined3d_format_id format) + unsigned int sub_resource_idx, const struct wined3d_format *dst_format) { - struct wined3d_map_desc src_map, dst_map; - const struct d3dfmt_converter_desc *conv; + const struct wined3d_format *src_format = src_texture->resource.format; + struct wined3d_device *device = src_texture->resource.device; + const struct d3dfmt_converter_desc *conv = NULL; struct wined3d_texture *dst_texture; struct wined3d_resource_desc desc; + struct wined3d_map_desc src_map; - if (!(conv = find_converter(src_texture->resource.format->id, format))) + if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized + || !is_identity_fixup(src_format->color_fixup) || src_format->convert + || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert)) { FIXME("Cannot find a conversion function from format %s to %s.\n", - debug_d3dformat(src_texture->resource.format->id), debug_d3dformat(format)); + debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); return NULL; } /* FIXME: Multisampled conversion? */ wined3d_resource_get_desc(src_texture->sub_resources[sub_resource_idx].resource, &desc); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - desc.format = format; + desc.format = dst_format->id; desc.usage = 0; desc.pool = WINED3D_POOL_SCRATCH; - if (FAILED(wined3d_texture_create(src_texture->resource.device, &desc, 1, + if (FAILED(wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_DISCARD, NULL, NULL, &wined3d_null_parent_ops, &dst_texture))) { @@ -1733,8 +1737,6 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } memset(&src_map, 0, sizeof(src_map)); - memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(wined3d_resource_map(&src_texture->resource, sub_resource_idx, &src_map, NULL, WINED3D_MAP_READONLY))) { @@ -1742,17 +1744,45 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_decref(dst_texture); return NULL; } - if (FAILED(wined3d_resource_map(&dst_texture->resource, 0, &dst_map, NULL, 0))) + if (conv) { - ERR("Failed to map the destination texture.\n"); - wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); - wined3d_texture_decref(dst_texture); - return NULL; + struct wined3d_map_desc dst_map; + + memset(&dst_map, 0, sizeof(dst_map)); + if (FAILED(wined3d_resource_map(&dst_texture->resource, 0, &dst_map, NULL, 0))) + { + ERR("Failed to map the destination texture.\n"); + wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); + wined3d_texture_decref(dst_texture); + return NULL; + } + + conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, desc.width, desc.height); + + wined3d_resource_unmap(&dst_texture->resource, 0); } + else + { + struct wined3d_bo_address data = {0, src_map.data}; + RECT src_rect = {0, 0, desc.width, desc.height}; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + POINT dst_point = {0, 0}; + + TRACE("Using upload conversion.\n"); + context = context_acquire(device, NULL); + gl_info = context->gl_info; - conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, desc.width, desc.height); + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_surface_upload_data(dst_texture->sub_resources[0].u.surface, gl_info, src_format, + &src_rect, src_map.row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&data)); - wined3d_resource_unmap(&dst_texture->resource, 0); + context_release(context); + + wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); + } wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); return dst_texture; @@ -3664,7 +3694,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { if (dst_texture->resource.format->id != src_texture->resource.format->id) { - if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format->id))) + if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { /* The conv function writes a FIXME */ WARN("Cannot convert source surface format to dest format.\n");

1 0

Jacek Caban : mshtml: Event tests code clean up.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 529a7ed55fa63b48afb27f7f454696c880a3039b URL: http://source.winehq.org/git/wine.git/?a=commit;h=529a7ed55fa63b48afb27f7f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 18:02:04 2016 +0200 mshtml: Event tests code clean up. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 51 ++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index c3aa352..ad0547e 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -295,6 +295,7 @@ static IHTMLElement *_get_elem_id(unsigned line, IHTMLDocument2 *doc, const char SysFreeString(str); IHTMLDocument3_Release(doc3); ok_(__FILE__,line) (hres == S_OK, "getElementById failed: %08x\n", hres); + ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); return elem; } @@ -2206,48 +2207,36 @@ static void test_timeout(IHTMLDocument2 *doc) IHTMLWindow3_Release(win3); } -static IHTMLElement* find_element_by_id(IHTMLDocument2 *doc, const char *id) +static IHTMLWindow2 *get_iframe_window(IHTMLIFrameElement *iframe) { + IHTMLWindow2 *window; + IHTMLFrameBase2 *base; HRESULT hres; - IHTMLDocument3 *doc3; - IHTMLElement *result; - BSTR idW = a2bstr(id); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); + ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); - hres = IHTMLDocument3_getElementById(doc3, idW, &result); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); - ok(result != NULL, "result == NULL\n"); - SysFreeString(idW); + hres = IHTMLFrameBase2_get_contentWindow(base, &window); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(window != NULL, "window == NULL\n"); - IHTMLDocument3_Release(doc3); - return result; + if(base) IHTMLFrameBase2_Release(base); + return window; } -static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) +static IHTMLDocument2 *get_iframe_doc(IHTMLIFrameElement *iframe) { - HRESULT hres; - IHTMLFrameBase2 *base; IHTMLDocument2 *result = NULL; + IHTMLWindow2 *window; + HRESULT hres; - hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); - ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); - if(hres == S_OK) { - IHTMLWindow2 *window; + window = get_iframe_window(iframe); - hres = IHTMLFrameBase2_get_contentWindow(base, &window); - ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); - ok(window != NULL, "window == NULL\n"); - if(window) { - hres = IHTMLWindow2_get_document(window, &result); - ok(hres == S_OK, "get_document failed: %08x\n", hres); - ok(result != NULL, "result == NULL\n"); - IHTMLWindow2_Release(window); - } - } - if(base) IHTMLFrameBase2_Release(base); + hres = IHTMLWindow2_get_document(window, &result); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + IHTMLWindow2_Release(window); return result; } @@ -2263,7 +2252,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) trace("iframe tests...\n"); - element = find_element_by_id(doc, "ifr"); + element = get_elem_id(doc, "ifr"); iframe = get_iframe_iface((IUnknown*)element); IHTMLElement_Release(element);

1 0

Jacek Caban : mshtml: Added IHTMLWindow6:: postMessage semi-stub implementation.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 6fd383e8dfd7d2253f26a7a6462fd06e10c0c1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd383e8dfd7d2253f26a7a64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 18:01:57 2016 +0200 mshtml: Added IHTMLWindow6::postMessage semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 12 ++++++++++-- dlls/mshtml/tests/jstest.html | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ec333bc..9092b47 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2134,8 +2134,16 @@ static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *ifac static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); - return E_NOTIMPL; + + FIXME("(%p)->(%s %s) semi-stub\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); + + if(!This->inner_window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->doc->node, NULL, NULL); + return S_OK; } static HRESULT WINAPI HTMLWindow6_toStaticHTML(IHTMLWindow6 *iface, BSTR bstrHTML, BSTR *pbstrStaticHTML) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 2a5a447..00dd35d 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -362,6 +362,15 @@ function test_xhr() { ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); } +function test_sendMessage() { + var onmessage_called = false; + window.onmessage = function() { + onmessage_called = true; + } + window.postMessage("test", "*"); + ok(onmessage_called, "onmessage not called"); +} + var globalVar = false; function runTests() { @@ -388,6 +397,7 @@ function runTests() { test_language_attribute(); test_text_node(); test_xhr(); + test_sendMessage(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml: Added IHTMLWindow6:: onmessage property implementation.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: feed9d47504a11bd4b29286a12da21d0496a566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=feed9d47504a11bd4b29286a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 18:01:46 2016 +0200 mshtml: Added IHTMLWindow6::onmessage property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index afacf71..2226278 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -102,6 +102,9 @@ static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; +static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; +static const WCHAR onmessageW[] = {'o','n','m','e','s','s','a','g','e',0}; + static const WCHAR mousedownW[] = {'m','o','u','s','e','d','o','w','n',0}; static const WCHAR onmousedownW[] = {'o','n','m','o','u','s','e','d','o','w','n',0}; @@ -210,6 +213,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_BODY}, + {messageW, onmessageW, EVENTT_NONE, DISPID_EVMETH_ONMESSAGE, + EVENT_FORWARDBODY /* FIXME: remove when we get the target right */ }, {mousedownW, onmousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {mousemoveW, onmousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 05c2b84..f723ef6 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -36,6 +36,7 @@ typedef enum { EVENTID_KEYPRESS, EVENTID_KEYUP, EVENTID_LOAD, + EVENTID_MESSAGE, EVENTID_MOUSEDOWN, EVENTID_MOUSEMOVE, EVENTID_MOUSEOUT, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f203405..ec333bc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2148,15 +2148,19 @@ static HRESULT WINAPI HTMLWindow6_toStaticHTML(IHTMLWindow6 *iface, BSTR bstrHTM static HRESULT WINAPI HTMLWindow6_put_onmessage(IHTMLWindow6 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_MESSAGE, &v); } static HRESULT WINAPI HTMLWindow6_get_onmessage(IHTMLWindow6 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_MESSAGE, p); } static HRESULT WINAPI HTMLWindow6_msWriteProfilerMark(IHTMLWindow6 *iface, BSTR bstrProfilerMark)

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
75
Older →

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 April 2016