June 2016 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : d3dx9_24: Share the source with d3dx9_36.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 0933770741633a768236fb03294df0093ef51041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0933770741633a768236fb032… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:02:12 2016 +0000 d3dx9_24: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 22 +- dlls/d3dx9_24/d3dx9_24.spec | 632 +++++++++++++++++++++--------------------- dlls/d3dx9_24/d3dx9_24_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 337 insertions(+), 320 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0933770741633a768236f…

1 0

Michael Stefaniuc : amstream: Use SetRect() instead of open coding it.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 0183cd17be37620b0db065e4733b9a2d5cfa4b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0183cd17be37620b0db065e47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 14:14:18 2016 +0200 amstream: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0ba9eb8..188ab88 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1046,11 +1046,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD DDSURFACEDESC desc = { sizeof(desc) }; hr = IDirectDrawSurface_GetSurfaceDesc(object->surface, &desc); if (hr == S_OK) - { - object->rect.left = object->rect.top = 0; - object->rect.right = desc.dwWidth; - object->rect.bottom = desc.dwHeight; - } + SetRect(&object->rect, 0, 0, desc.dwWidth, desc.dwHeight); } *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface;

1 0

Michael Stefaniuc : atl: Simplify RECT assignments.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: e3bd659be9b2868b121857fb2643d775bbf0d8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bd659be9b2868b121857fb2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 14:15:44 2016 +0200 atl: Simplify RECT assignments. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 083dbe0..aeda139 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -827,7 +827,7 @@ static void IOCS_OnSize( IOCS* This, LPCRECT rect ) { SIZEL inPix, inHi; - This->size.left = rect->left; This->size.right = rect->right; This->size.top = rect->top; This->size.bottom = rect->bottom; + This->size = *rect; if ( !This->control ) return; @@ -890,9 +890,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, case WM_SIZE: { RECT r; - r.left = r.top = 0; - r.right = LOWORD( lParam ); - r.bottom = HIWORD( lParam ); + SetRect(&r, 0, 0, LOWORD(lParam), HIWORD(lParam)); IOCS_OnSize( This, &r ); } break;

1 0

Henri Verbeet : wined3d: Don't bother with glGetError() if we have ARB_DEBUG_OUTPUT.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: a1bc5b8c975799ee1d4281cdd83279cc196db79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1bc5b8c975799ee1d4281cdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:43 2016 +0200 wined3d: Don't bother with glGetError() if we have ARB_DEBUG_OUTPUT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 19 +++++++++++++++++++ dlls/wined3d/drawprim.c | 1 + dlls/wined3d/wined3d_private.h | 17 ++++++----------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 04265d0..ae82a82 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1550,6 +1550,25 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc } } +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name) +{ + GLint err; + + if (gl_info->supported[ARB_DEBUG_OUTPUT] || (err = gl_info->gl_ops.gl.p_glGetError()) == GL_NO_ERROR) + { + TRACE("%s call ok %s / %u.\n", name, file, line); + return; + } + + do + { + ERR(">>>>>>> %s (%#x) from %s @ %s / %u.\n", + debug_glerror(err), err, name, file,line); + err = gl_info->gl_ops.gl.p_glGetError(); + } while (err != GL_NO_ERROR); +} + static BOOL context_debug_output_enabled(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_DEBUG_OUTPUT] diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2b58def..5a9e084 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); +WINE_DECLARE_DEBUG_CHANNEL(d3d); #include <stdio.h> #include <math.h> diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04dd160..f6f6bb3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1130,22 +1130,17 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col #define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; + /* Checking of API calls */ /* --------------------- */ #ifndef WINE_NO_DEBUG_MSGS #define checkGLcall(A) \ do { \ - GLint err; \ - if (!__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default)) break; \ - err = gl_info->gl_ops.gl.p_glGetError(); \ - if (err == GL_NO_ERROR) { \ - TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ - \ - } else do { \ - ERR(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ - debug_glerror(err), err, A, __FILE__, __LINE__); \ - err = gl_info->gl_ops.gl.p_glGetError(); \ - } while (err != GL_NO_ERROR); \ + if (__WINE_IS_DEBUG_ON(_ERR, &__wine_dbch_d3d) \ + && !gl_info->supported[ARB_DEBUG_OUTPUT]) \ + wined3d_check_gl_call(gl_info, __FILE__, __LINE__, A); \ } while(0) #else #define checkGLcall(A) do {} while(0)

1 0

Henri Verbeet : wined3d: Include the base vertex index in WINED3D_CS_OP_DRAW.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 9c1fbe509576d7cbaada3af9736888cfa1d02847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1fbe509576d7cbaada3af97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:44 2016 +0200 wined3d: Include the base vertex index in WINED3D_CS_OP_DRAW. Ideally we'd just remove the base vertex index from the wined3d_state structure, but it's included in d3d8 stateblocks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++-------- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 34 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c1fbe509576d7cbaada3…

1 0

Henri Verbeet : wined3d: Resolve "load_base_vertex_index" in wined3d_cs_exec_draw().
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 4afc7470fb630035c911a1bf1d48f66bf16c230c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afc7470fb630035c911a1bf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:45 2016 +0200 wined3d: Resolve "load_base_vertex_index" in wined3d_cs_exec_draw(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +++++++++- dlls/wined3d/device.c | 15 --------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2ab3ca5..bbd5c0d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -311,9 +311,17 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_draw *op = data; - draw_primitive(cs->device, &cs->device->state, op->base_vertex_idx, op->start_idx, + if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] + && state->load_base_vertex_index != op->base_vertex_idx) + { + state->load_base_vertex_index = op->base_vertex_idx; + device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); + } + + draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6678219..b52970f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3497,12 +3497,6 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT { TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - if (device->state.load_base_vertex_index) - { - device->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - wined3d_cs_emit_draw(device->cs, 0, start_vertex, vertex_count, 0, 0, FALSE); return WINED3D_OK; @@ -3519,8 +3513,6 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); if (!device->state.index_buffer) @@ -3533,13 +3525,6 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - if (!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && - device->state.load_base_vertex_index != device->state.base_vertex_index) - { - device->state.load_base_vertex_index = device->state.base_vertex_index; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - wined3d_cs_emit_draw(device->cs, device->state.base_vertex_index, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Send shader resource view destruction through the command stream.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 8a8b57ce3d0cde8c4ff2f1a0ab06f0e975124671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8b57ce3d0cde8c4ff2f1a0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:46 2016 +0200 wined3d: Send shader resource view destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/view.c | 34 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bbd5c0d..46f623a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -52,6 +52,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_COLOR_KEY, WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_RESET_STATE, + WINED3D_CS_OP_DESTROY_OBJECT, }; struct wined3d_cs_present @@ -252,6 +253,13 @@ struct wined3d_cs_reset_state enum wined3d_cs_op opcode; }; +struct wined3d_cs_destroy_object +{ + enum wined3d_cs_op opcode; + void (*callback)(void *object); + void *object; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1029,6 +1037,25 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) cs->ops->submit(cs); } +static void wined3d_cs_exec_destroy_object(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_destroy_object *op = data; + + op->callback(op->object); +} + +void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) +{ + struct wined3d_cs_destroy_object *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DESTROY_OBJECT; + op->callback = callback; + op->object = object; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1057,6 +1084,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, + /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 52e3f1e..329a0bb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -194,6 +194,25 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v return refcount; } +static void wined3d_shader_resource_view_destroy_object(void *object) +{ + struct wined3d_shader_resource_view *view = object; + + if (view->object) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(view->resource->device, NULL); + gl_info = context->gl_info; + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); +} + ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); @@ -202,22 +221,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { - if (view->object) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(view->resource->device, NULL); - gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); - checkGLcall("glDeleteTextures"); - context_release(context); - } + struct wined3d_device *device = view->resource->device; + /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); wined3d_resource_decref(view->resource); - HeapFree(GetProcessHeap(), 0, view); + wined3d_cs_emit_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); } return refcount; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76425e0..43714a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2916,6 +2916,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, + void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Send rendertarget view destruction through the command stream.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 7fe9858988eabf377ab5e2c64d92f973574b1ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe9858988eabf377ab5e2c64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:47 2016 +0200 wined3d: Send rendertarget view destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 329a0bb..e9e62d1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -33,6 +33,11 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v return refcount; } +static void wined3d_rendertarget_view_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); @@ -41,11 +46,13 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v if (!refcount) { + struct wined3d_device *device = view->resource->device; + /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); wined3d_resource_decref(view->resource); - HeapFree(GetProcessHeap(), 0, view); + wined3d_cs_emit_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); } return refcount;

1 0

Iván Matellanes : msvcirt: Add stubs for ostream:: operator<<.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: faf7a2701df30180eef39bd92793af6ee67053a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf7a2701df30180eef39bd92… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 21 10:54:20 2016 +0100 msvcirt: Add stubs for ostream::operator<<. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 181 +++++++++++++++++++++++++++++++++----------- dlls/msvcirt/msvcirt.spec | 76 +++++++++---------- dlls/msvcrt20/msvcrt20.spec | 60 +++++++-------- dlls/msvcrt40/msvcrt40.spec | 60 +++++++-------- 4 files changed, 235 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faf7a2701df30180eef39…

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_domain implementation.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 22eab07811225e19357ab91505187bbf20b3ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eab07811225e19357ab9150… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 15:12:25 2016 +0200 mshtml: Added IHTMLDocument2::put_domain implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 38 ++++++++++++++++++++++++++++++-------- dlls/mshtml/tests/htmldoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eadb90b..352b757 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -795,24 +795,46 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_SetDomain(This->doc_node->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetDomain failed: %08x\n", nsres); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - HRESULT hres; + nsAString nsstr; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->window || !This->window->uri) { - FIXME("No current URI\n"); - return E_FAIL; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetDomain(This->doc_node->nsdoc, &nsstr); + if(NS_SUCCEEDED(nsres) && This->window && This->window->uri) { + const PRUnichar *str; + HRESULT hres; + + nsAString_GetData(&nsstr, &str); + if(!*str) { + TRACE("Gecko returned emptry string, fallback to loaded URL.\n"); + nsAString_Finish(&nsstr); + hres = IUri_GetHost(This->window->uri, p); + return FAILED(hres) ? hres : S_OK; + } } - hres = IUri_GetHost(This->window->uri, p); - return FAILED(hres) ? hres : S_OK; + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5079dc9..90d5b41 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -971,6 +971,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 1014: CHECK_EXPECT2(OnChanged_1014); return S_OK; + case 1029: case 1030: case 3000022: case 3000023: @@ -7681,6 +7682,37 @@ static void test_cookies(IHTMLDocument2 *doc) SysFreeString(str2); } +static void test_doc_domain(IHTMLDocument2 *doc) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("winehq.org"); + hres = IHTMLDocument2_put_domain(doc, str); + ok(hres == S_OK, "put_domain failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("winehq.com"); + hres = IHTMLDocument2_put_domain(doc, str); + ok(hres == E_INVALIDARG, "put_domain failed: %08x, expected E_INVALIDARG\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_HTMLDocument_http(BOOL with_wbapp) { IMoniker *http_mon; @@ -7718,6 +7750,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_GetCurMoniker((IUnknown*)doc, http_mon, NULL, FALSE); test_travellog(doc); test_binding_ui((IUnknown*)doc); + test_doc_domain(doc); nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) {

1 0