March 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Allow draw calls without color attachments.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 53f4cc1a9eef9708e8b4d537d745161222242a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f4cc1a9eef9708e8b4d537d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:48 2016 +0100 wined3d: Allow draw calls without color attachments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 50 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e372eaa..31fd22a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2675,7 +2675,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, wined3d_rendertarget_view_get_surface(fb->depth_stencil), - fb->render_targets[0]->resource->draw_binding, + fb->render_targets[0] ? fb->render_targets[0]->resource->draw_binding : 0, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ec49d56..70f053b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -367,11 +367,20 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; - unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum srcBlend, dstBlend; + const struct wined3d_format *rt_format; enum wined3d_blend d3d_blend; + GLenum srcBlend, dstBlend; + unsigned int rt_fmt_flags; + + if (!state->fb->render_targets[0]) + { + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + return; + } + + rt_format = state->fb->render_targets[0]->format; + rt_fmt_flags = state->fb->render_targets[0]->format_flags; /* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific * blending parameters to work. */ @@ -4544,31 +4553,40 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; + unsigned int width, height; + + if (target) + { + if (vp.width > target->width) + vp.width = target->width; + if (vp.height > target->height) + vp.height = target->height; - if (vp.width > target->width) - vp.width = target->width; - if (vp.height > target->height) - vp.height = target->height; + surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); + } + else if (depth_stencil) + { + width = depth_stencil->width; + height = depth_stencil->height; + } + else + { + FIXME("No attachments draw calls not supported.\n"); + return; + } gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); checkGLcall("glDepthRange"); /* Note: GL requires lower left, DirectX supplies upper left. This is * reversed when using offscreen rendering. */ if (context->render_offscreen) - { gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); - } else - { - UINT width, height; - - surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); - gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), - vp.width, vp.height); - } + gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); checkGLcall("glViewport"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48d21d3..feb86d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3431,7 +3431,7 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, { return (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) || state->render_states[WINED3D_RS_SRGBWRITEENABLE]) - && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */

1 0

Jacek Caban : mshtml/tests: Fixed xmlhttprequest test failures.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: f8d47a66371579aef09670281928c03dce977b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d47a66371579aef09670281… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 22 13:10:42 2016 +0100 mshtml/tests: Fixed xmlhttprequest test failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index a16dad1..3153804 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -386,6 +386,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; const char *value; + BOOL skip_all_headers; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -450,6 +451,9 @@ static void test_header(const struct HEADER_TYPE expect[], int num) SysFreeString(key); SysFreeString(text); + if(expect[i].skip_all_headers) + continue; + strcpy(buf, expect[i].key); strcat(buf, ": "); strcat(buf, expect[i].value); @@ -581,10 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Server", "Apache"}, {"Accept-Ranges", "bytes"}, {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Type", "application/xml", TRUE} }; trace("test_sync_xhr\n");

1 0

Józef Kucia : wined3d: Introduce helper function for binding buffers.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 4affb95ebb87645a3127130d16aee9a8c6335c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4affb95ebb87645a3127130d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:47 2016 +0100 wined3d: Introduce helper function for binding buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 53 ++++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3d4ab55..68c9af5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -100,6 +100,17 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) return FALSE; } +/* Context activation is done by the caller. */ +static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) + context_invalidate_state(context, STATE_INDEXBUFFER); + + GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); +} + /* Context activation is done by the caller */ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { @@ -148,9 +159,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine goto fail; } - if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); + buffer_bind(This, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -486,25 +495,23 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) +BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; /* Heap_memory exists if the buffer is double buffered or has no buffer object at all. */ - if (This->resource.heap_memory) - return This->resource.heap_memory; + if (buffer->resource.heap_memory) + return buffer->resource.heap_memory; - if (!wined3d_resource_allocate_sysmem(&This->resource)) + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) ERR("Failed to allocate system memory.\n"); - if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); - GL_EXTCALL(glGetBufferSubData(This->buffer_type_hint, 0, This->resource.size, This->resource.heap_memory)); - This->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer_bind(buffer, context); + GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); + checkGLcall("buffer download"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; - return This->resource.heap_memory; + return buffer->resource.heap_memory; } static void buffer_unload(struct wined3d_resource *resource) @@ -977,9 +984,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -1076,9 +1081,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -1167,19 +1170,13 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } else if (dst_buffer_mem && !src_buffer_mem) { - if (src_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(src_buffer->buffer_type_hint, src_bo_address.buffer_object)); - + buffer_bind(src_buffer, context); GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); checkGLcall("buffer download"); } else if (!dst_buffer_mem && src_buffer_mem) { - if (dst_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - context_invalidate_state(context, STATE_INDEXBUFFER); - GL_EXTCALL(glBindBuffer(dst_buffer->buffer_type_hint, dst_bo_address.buffer_object)); - + buffer_bind(dst_buffer, context); GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); checkGLcall("buffer upload"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d7a2bb..48d21d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2892,7 +2892,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; +BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : iphlpapi/tests: Trace network prefixes in the test for GetAdaptersAddresses.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: e8ceab5344e2ffa88a35727569294e0832f76c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ceab5344e2ffa88a3572756… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 22 14:36:33 2016 +0100 iphlpapi/tests: Trace network prefixes in the test for GetAdaptersAddresses. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 92653ed5..73e4302 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1379,13 +1379,14 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { char temp[128]; + IP_ADAPTER_PREFIX *prefix; ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), @@ -1452,6 +1453,18 @@ static void test_GetAdaptersAddresses(void) sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); trace("ZoneIndices: %s\n", temp); trace("FirstPrefix: %p\n", aa->FirstPrefix); + prefix = aa->FirstPrefix; + while (prefix) + { + trace("\tLength: %u\n", S(U(*prefix)).Length); + trace("\tFlags: 0x%08x\n", S(U(*prefix)).Flags); + trace("\tNext: %p\n", prefix->Next); + trace("\tAddress.lpSockaddr: %p\n", prefix->Address.lpSockaddr); + trace("\tAddress.iSockaddrLength: %d\n", prefix->Address.iSockaddrLength); + trace("\tPrefixLength: %u\n", prefix->PrefixLength); + trace("\n"); + prefix = prefix->Next; + } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed));

1 0

Francois Gouget : mshtml: Make some functions static.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 49ceec53c42f320900d1eda08bad7a40029001e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ceec53c42f320900d1eda08… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:12 2016 +0100 mshtml: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyle.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index abb71a8..0d3d450 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -169,7 +169,7 @@ static void HTMLCommentElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); HTMLElement *new_elem; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aea6a92..65083ab 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -396,7 +396,7 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) +static HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) { nsAString str_name, str_value, str_empty; LPWSTR val = NULL; @@ -461,7 +461,7 @@ static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const } } -HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) +static HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) { const WCHAR *val; WCHAR buf[14]; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index e9de151..fbf2ac0 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -124,9 +124,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,BSTR*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD) DECLSPEC_HIDDEN; -HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msctf/tests: Fix a crash on unsupported interface.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 6834367a167b30e0180b58df6461e28701a9df0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6834367a167b30e0180b58df6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 22 10:55:03 2016 +0300 msctf/tests: Fix a crash on unsupported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 080d7f0..8c9c884 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1427,13 +1427,16 @@ static void test_startSession(void) ok(cid == cid2, "Second activate client ID does not match\n"); hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex); - ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n"); - - hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); - ok(SUCCEEDED(hr), "Failed to Activate\n"); - ok(cid == cid2, "ActivateEx client ID does not match\n"); + if (hr == S_OK) + { + hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); + ok(SUCCEEDED(hr), "Failed to Activate\n"); + ok(cid == cid2, "ActivateEx client ID does not match\n"); - ITfThreadMgrEx_Release(tmex); + ITfThreadMgrEx_Release(tmex); + } + else + win_skip("ITfThreadMgrEx is not supported\n"); hr = ITfThreadMgr_Deactivate(g_tm); ok(SUCCEEDED(hr), "Failed to Deactivate\n");

1 0

Nikolay Sivov : ole32: Fix CreataDataCache() return value when requested riid is not IUnknown, for aggregation case.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: fde61d467abd7c8357c25d17b39b2a5e8e9b871c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde61d467abd7c8357c25d17b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 11:55:57 2016 +0300 ole32: Fix CreataDataCache() return value when requested riid is not IUnknown, for aggregation case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e93e867..21f63d3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2464,7 +2464,7 @@ HRESULT WINAPI CreateDataCache( * IUnknown pointer can be returned to the outside. */ if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) ) - return CLASS_E_NOAGGREGATION; + return E_INVALIDARG; /* * Try to construct a new instance of the class. diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index d58105c..afff6ba 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1598,7 +1598,6 @@ static void test_data_cache(void) /* requested is not IUnknown */ hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk);

1 0

Nikolay Sivov : msctf: Make ITextStoreACPSink a part of context object.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 80c91976a2693d16a113e2701f8e731786951e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c91976a2693d16a113e2701… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 22 10:09:36 2016 +0300 msctf: Make ITextStoreACPSink a part of context object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 264 ++++++++++++++++++++------------------------------- 1 file changed, 102 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80c91976a2693d16a113e…

1 0

Alexandre Julliard : winebuild: Store a C-compatible version of the dll name.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 05399ad711bdbf5038ded66e42f29f00b85e76b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05399ad711bdbf5038ded66e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 15:06:27 2016 +0900 winebuild: Store a C-compatible version of the dll name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 3 ++- tools/winebuild/import.c | 16 +++++++--------- tools/winebuild/main.c | 1 + tools/winebuild/spec16.c | 13 +++++-------- tools/winebuild/utils.c | 30 ++++++++---------------------- 5 files changed, 23 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05399ad711bdbf5038ded…

1 0

Aaryaman Vasishta : d3drm: Move struct d3drm_texture to header for global access.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: b05b96a0e2cf3ea1911b2e866445d774cf876f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05b96a0e2cf3ea1911b2e866… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Mar 21 21:54:45 2016 +0530 d3drm: Move struct d3drm_texture to header for global access. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 91 +++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/d3drm_private.h | 11 +++++- dlls/d3drm/meshbuilder.c | 6 +-- dlls/d3drm/texture.c | 19 ++-------- 4 files changed, 99 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b05b96a0e2cf3ea1911b2…

1 0